Bump towards r5 (fixes duplicate context for hiawatha)

Package-Manager: portage-2.2.8-r1/cvs/Linux x86_64 Manifest-Sign-Key: 0x2EDD52403B68AF47
author: Sven Vermeulen <swift@gentoo.org> 2014-08-09 19:38:11 +0000
committer: Sven Vermeulen <swift@gentoo.org> 2014-08-09 19:38:11 +0000
commit: e9436eb0b43ada1b03a415122dc3d2082e2db696 (patch)
tree: af2839ab40c812eed8e02542c8dc3dbdb2308019
parent: Drop insecure versions wrt bug #504088 (diff)
download: historical-e9436eb0b43ada1b03a415122dc3d2082e2db696.tar.gz
historical-e9436eb0b43ada1b03a415122dc3d2082e2db696.tar.bz2
historical-e9436eb0b43ada1b03a415122dc3d2082e2db696.zip
739 files changed, 9271 insertions, 3692 deletions
diff --git a/sec-policy/selinux-abrt/ChangeLog b/sec-policy/selinux-abrt/ChangeLog
index 34213dfe68da..3f8420e1324e 100644
--- a/sec-policy/selinux-abrt/ChangeLog
+++ b/sec-policy/selinux-abrt/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sec-policy/selinux-abrt
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-abrt/ChangeLog,v 1.18 2014/08/08 18:49:34 swift Exp $
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-abrt/ChangeLog,v 1.19 2014/08/09 19:34:20 swift Exp $
+
+*selinux-abrt-2.20140311-r5 (09 Aug 2014)
+
+  09 Aug 2014; Sven Vermeulen <swift@gentoo.org>
+  +selinux-abrt-2.20140311-r5.ebuild:
+  Bump towards r5 (fixes duplicate context for hiawatha)
 
   08 Aug 2014; Sven Vermeulen <swift@gentoo.org> selinux-abrt-9999.ebuild:
   Make 9999 ebuilds EAPI=5 and transform to make master for version bumps
diff --git a/sec-policy/selinux-abrt/Manifest b/sec-policy/selinux-abrt/Manifest
index a50f436f4164..9927143af7c0 100644
--- a/sec-policy/selinux-abrt/Manifest
+++ b/sec-policy/selinux-abrt/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-abrt-2.20140311-r1.ebuild 379 SHA256 5682b1bb8f798c40f3af0382b835fad12bd12f52f6d8d1691022e111bc5e0b45 SHA512 5a459d2d6d142e4364ca3db1a6fba608200a5c00736bfb06de0191a70f8a1c5fd455c272f92e2daffa543b87f50338df1c44f33dc699ce9acf1078f1b935238f WHIRLPOOL 1dd258a9927e9aefc4c96fbc8d7f63aa10ced807e72cccea463ee6dc2509260c295cacba3299e1b2a3a85f63a77e28d5d2639f41783de63c5af80a1ab6e99dca
 EBUILD selinux-abrt-2.20140311-r2.ebuild 379 SHA256 eda7c7562d9e591b0bdf23bfd1d496f80e2a286bf02cb8165e07abe8946881ae SHA512 667cea3e956227c1941fd2c1717be703087ec07c0a72d66f5f0322d24271cb3dec3b7ba7bfee5987c8a57d455f11172605a0482184b1bfe492ecfb2fda8ac763 WHIRLPOOL c536ba88821dd602a3421f537279933ab38a7c01a610d6e2d776f929567af5d372a235f565964ce64a1c5c11ba9e369af622938f4f5a923eb813e47884af1519
 EBUILD selinux-abrt-2.20140311-r3.ebuild 379 SHA256 dc9bac6c769f322cbd02ee173911d0d463038351bfd98deb8064b9623f47a4ee SHA512 5e380a5f36e0855a06de23ef1ec5375991915c7bba460447bd6f585f1a56c60d0d07803bcbee0791d26cfbcee72c8d1c9e7cde2e03f2f52c3373c26eb9f10590 WHIRLPOOL b7be3f36528cb8a570bfb2056d6d27c3e907feed8941d6155651a6f8a9ab88366f4a936badc176ce676f2c34b1f2dda279671377119f4a1c0475dda85d890d46
 EBUILD selinux-abrt-2.20140311-r4.ebuild 381 SHA256 f7409c4f94e91f346e301c7d3734638df51bfe9d1b379f05201a01a6bf79fcf8 SHA512 669be58cc7f67b5487fe716043397a5b3ad7ce483e9ed9db731ec4833c13733a99d560b102ef18e5b352930a5a78a4756983864c75920504dbd0ceb8027837df WHIRLPOOL f2f7b9bf4dda54ef9f318f1af211e327a88c27c19e6cf46d99869e00fcd416d1d3e04c1dba47c5b54a01b4b5eecead34d52140a62fde808f1663f80b19957f91
+EBUILD selinux-abrt-2.20140311-r5.ebuild 357 SHA256 77c6b74bd8ebafd49a71804eeb4d3951b9fbd026e070a33e324c66c722c2156b SHA512 8997e037ca5f8432a267ac124626076c1c11f668947d2d35363988d9d1bc9fc71e35ece013899bda77260b017c00b9d2bf663af65fc1e5b193a9296355353018 WHIRLPOOL 3f028630383db763dd95e996e651c0118019e3ca1633a97958be124b945b53f4e4ed943b51c1368b2237171034377979692ce895d3dbb8764d9928a7277199e7
 EBUILD selinux-abrt-9999.ebuild 337 SHA256 e0bf0bd779699f25b9ec488688169d579e728a3e28b33053086c7df7e21418a2 SHA512 75b1b2794534670cf4b8ab9684f3e069f02b05fccbf1a4018688ae0bd267d83c8aed18e545048601ec9a7d7b6b9fab071237cdfa23046515e718e43d8d1d0b97 WHIRLPOOL 2329c27e7fc088c7402ab239a929fb517105eaa1826870a9d53bf9f2e2352cadf68c1585dec383d619a28c273f0c5dffaae05b83f2e84992ec499121211adc56
-MISC ChangeLog 3130 SHA256 b3e3d2b5db9ac166bcad2e0b6b08cdf2cd001f027ba20ac4b9fd5d7307a56677 SHA512 30e2111cde1b5f7690dc13c8c5a78fb003e2e18448003d7d901ec630adb1072f51d3899c7909a4872eedc39143972a1945a364a5ea045760645ef28963a96262 WHIRLPOOL b1fa69a251c06002428efed93cb6d54c4b84c51fb756dd120aa6c1171090c665be9c9883e6d954702d339130155494ca955e6c6a66ab893131385b2592f857b4
+MISC ChangeLog 3318 SHA256 6a251c5a9e351d86bc4c931554afb0ce8f10a0b1cea6b694eeebafb8d714e5e4 SHA512 2fb73ff888c4f0ef026fe36c645b337dc8c4d9e4119ce88fc10f2bf46c06d2adece43d35aa22d201adf717872568eeaf57d754ecf7b99d6f5b22b911d7e2ff9a WHIRLPOOL a78b47ed3abef759f6738b0dacddd957ae1abddc91016a7146181bda9e6d6cbd09104fa4ad90ea21fa738fb2610633dc7e754c9abbea2f32d3bb8317d42ad84f
 MISC metadata.xml 228 SHA256 792ce2556132914d66dbcc9cba36d0784d66e08ccb7ba6bb887c03abeb98c396 SHA512 c2b7bd8a92094f91932f9e2d634991be4a595f047a3c646dc2ad7bc1970694cba3d8ab40c086d38c7e0337a5d72bc1a372844cb4a2d3d17977d646917cc2332c WHIRLPOOL 00aea615d971fc9365e8df2f222df0ef443357e906b47fe4e8e01e64834908701bc34366f059597f6ddfaf6dad3c8005f5d1db9c35eff6a27b6219a7beb8030d
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0
 
-iQIcBAEBCAAGBQJT5RxUAAoJEC7dUkA7aK9HeEUQAIrvBPaSFIqCW8Q7pmVb+C+y
-akxU3Mdx5JtoY1PW04YadJ9mC29Sb6X2fZBeNS7GRHSpGOUjCQCSctrlV+Fe/smj
-Tv8HPdf8v7mgJUhOGECkmrnwh+kJpeYuTlWeyfv+6f6l211TvffLKNCf8QGnaL+x
-f8vYWX9pndmmqDaoV0GKyDDeyXBSLbQ2oCJ48+OB1uihzQI8kHzrsCKUTtjws7H7
-dlD4J76JgtdDnP7Oxt3Oi0l/APeKcDK0G4oaPzTrDV8p/iuvUWKKfQoIWD0LfDmV
-KQuF7aSEYWajky3at+Jg+chus13nqmnePXbWnF1bbBOkqWj7s2Nxkwnh4/zGor2r
-8zOkpuITRI+2sJ/Nput/G3U5Z4R5a+oVgsGn+bALWgUZdTiQjzEAryU/DrKqcUz9
-X+6y6splaRV29Fg5QyFYA7a5s4w7A1YJ1iPNIOdVlkU4jMoDntCCiQ2Okgu9VPFO
-TVbZQRs2WJRaaXawTuMeOPCXNYaAce2Ab6jixEcTeWEiQyXsBgadAigqFT2MyC/j
-AjVoEXWmh6fxhVf9si8dI3BXD8Cx4DBLOa8XjN760LMaVKidA1nD5VAt0LpMYDVC
-VIEH5wly7wlnMHQswR19aip4hmdGAigp7gLwC40Kyyx2QFxjRtgp0rAXWYIUz1cZ
-D+M8o8k3J/iIcj7ReMe/
-=tS90
+iQIcBAEBCAAGBQJT5ngmAAoJEC7dUkA7aK9Hfg0QAInOisl+gHZq5TMjdQcvbX9w
+VwfvyMTDD8RuOi2+BVayjC1CyatroLb92Xhd6iQJ3zlG9zifRfPp9dctp9E7MUIV
+UhvMSgd6HROpgI+2d72dQYhRZgXZf9hVgLjH4diyXxoINViXnTL8j3eVYkC7qk/S
+PpxzV6SU7l7BESgmqEzV1drVSDzcZ0VlKy2xTECiQ+QG2rrF0pjf4f84zQlJdC0H
+vLRc/hz1Ca7KhtL3LGbxO79kXtsio0fdJ6aP20GodRSoF9ikbgxm/kqn5Y6X1s93
+eF7OayNwBE/g28/PjGZ0pW0KYjCyOQstf9tNgNvU09lG8s8weTbnYQ8Fq41KJzgS
+2vR/oNlEk9EBfzK7FTo0/yVE5mVdntGDg3lS3GthOpSqgIMWjQtWdf6hxkeZdz9P
+0wIe9CRk52JYWm5hX3CqWuqoUw2/yvKRq+0vhMeQFRkkGLnrLxqDUqyuixRTCVxE
+46M2GIGco5gRowsXY5ZwCYmmrT2lGElTkoknT/o5+YyPo7l01Mjua1JddT6ZL6Nk
+4Cat5cBXORLiITUxFRwu0jhJJV3mxvbOT4IrHliEAspamEJEiKqM8Tf9NgQmkq3O
+yOixazQfR1N6r4UK6KkTpnxtdFyZoXtej7dtBYRKQGSTZRmlFZMNnkmZ53mhxiZx
+2Jx8wpIwYA/B07YXwW53
+=m6cc
 -----END PGP SIGNATURE-----
diff --git a/sec-policy/selinux-abrt/selinux-abrt-2.20140311-r5.ebuild b/sec-policy/selinux-abrt/selinux-abrt-2.20140311-r5.ebuild
new file mode 100644
index 000000000000..c70b24dea423
--- /dev/null
+++ b/sec-policy/selinux-abrt/selinux-abrt-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-abrt/selinux-abrt-2.20140311-r5.ebuild,v 1.1 2014/08/09 19:34:20 swift Exp $
+EAPI="5"
+
+IUSE=""
+MODS="abrt"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for abrt"
+
+KEYWORDS="~amd64 ~x86"
diff --git a/sec-policy/selinux-accountsd/ChangeLog b/sec-policy/selinux-accountsd/ChangeLog
index 3c98515475db..493ce011f31c 100644
--- a/sec-policy/selinux-accountsd/ChangeLog
+++ b/sec-policy/selinux-accountsd/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sec-policy/selinux-accountsd
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-accountsd/ChangeLog,v 1.9 2014/08/08 18:50:03 swift Exp $
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-accountsd/ChangeLog,v 1.10 2014/08/09 19:34:38 swift Exp $
+
+*selinux-accountsd-2.20140311-r5 (09 Aug 2014)
+
+  09 Aug 2014; Sven Vermeulen <swift@gentoo.org>
+  +selinux-accountsd-2.20140311-r5.ebuild:
+  Bump towards r5 (fixes duplicate context for hiawatha)
 
   08 Aug 2014; Sven Vermeulen <swift@gentoo.org> selinux-accountsd-9999.ebuild:
   Make 9999 ebuilds EAPI=5 and transform to make master for version bumps
diff --git a/sec-policy/selinux-accountsd/Manifest b/sec-policy/selinux-accountsd/Manifest
index f2108cb36955..e5aa586a4242 100644
--- a/sec-policy/selinux-accountsd/Manifest
+++ b/sec-policy/selinux-accountsd/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-accountsd-2.20140311-r1.ebuild 399 SHA256 3f7f2d300eafa432d43cd7bbeb66cf426bffab1efb1f20c9511e292c01b57a7f SHA512 22b6e54aa25e1878594c57794475ea2a3e2225eed2b0892e8e96c4fb4f67d1f610f51547082ec6ef4b22ee0726a628148413e179e30915176ecdbcf6891e476a WHIRLPOOL 2e41a378b559c996072cb317bf63f24a0599aae57b5efe61477c57aba89287f413d497e7d3dc2404cbe4efa5c05adcc214390084068a1f123f831cabd071fcc4
 EBUILD selinux-accountsd-2.20140311-r2.ebuild 399 SHA256 d487a1cec7030a296b476abedc276fcf002d89f87b7ee9acf3010cf65e83f868 SHA512 fad2a9a6064b39dfe485c747e8e2a4253857e3c79d19b23c003c594e2cd44d5199f6b7682a3b2c290a5ad8232fb136dca7365927790a07208dc2326d378cd8fa WHIRLPOOL fcce9d2c7c6a6af4d5b70ae53014b68bb2f3ed1943038d1b3869d55fae7998cb11fab1b2b972281f43b1d7138a5ef4072887301a80eaa69da0b241eeb4d70ea8
 EBUILD selinux-accountsd-2.20140311-r3.ebuild 399 SHA256 fb87be2f1704028884923f24e6ccf2a4bb95de7e64dbfd649927034e15ab7e1d SHA512 8de1db12b1afab5485db59787352be036f624e51e72a45356a8dc6058b02d2fbf49aeb72225953ccce808787310eacd23da39fc40908559fff518d46a1a7b481 WHIRLPOOL 9101a26706a0123eeaea28181614ba604a3b15ed6994bad138f68163f4e1663ee68eadefadeccf0ac1cd32946a38cf93747dd16998ad28e147bc3cfa2102b803
 EBUILD selinux-accountsd-2.20140311-r4.ebuild 401 SHA256 017ddc04b86106ba3667841ba2b811407b1704b2d34f03922a5d562f418ae145 SHA512 ab6bd9c83dc2ea4dcacb5ea09dff157a1016b9b0b4178e6c77eb0bfd8f005a03201257173d1558087777017d021bb918489c01aba0c137befc6ba154982d4b5a WHIRLPOOL 2613c3ad5f5a4008a8576a694fa029d873f67915bb4afe583d36d45a66f3b85f3db03684e03e56dc5738ef230dd33d675dc1fbd011d7d50ecf87f49fd317fa77
+EBUILD selinux-accountsd-2.20140311-r5.ebuild 377 SHA256 d0d24ef43f45b32ac00896dfe30caae8b441639fd7bab7770f279b07e8652df7 SHA512 e6412eab8d4498ed7716f1eb0cf2a92358c0726a1472938bcc484ee35194af862e2d4c0df9fb8e67c6f065b1afb819d0de1b38ebd88f19964ea9a3b9b4a30c79 WHIRLPOOL bb5ba198fb474f6a84caa934de5e298f6ace7141ddf1a45e27b16eaa04dabf40ac56cbf5a3c9b166dd4a4649708838f99d10fe66729c06e93a53953a7579a4eb
 EBUILD selinux-accountsd-9999.ebuild 357 SHA256 81dc174a44647624b45e245826ad18aa199f52cf77f7b9c946d3be7084d3d33d SHA512 15093441daeef83f664c18a3e735d5d172eda202df08b06b12a3aaceb6852e757ea51968783d0dbcdff60f0ffea7978ffe38e807c947ed8297928894d48b108e WHIRLPOOL 8d0d0a9a38d49593d495dcdfc181da0ea415868994364c0f94f92ac01c2eb802984505d786c5b526d1a48d49527cdf9670d0bdb2178518f15080d3d8c50cba96
-MISC ChangeLog 1791 SHA256 8928af2e109efda90295eafbe0998c6572d4b416d3465bb434f6940c83ce4109 SHA512 c3a174aac928322f41b9051c384bd5b69daf425d192ec1cfa97d2f4fbbba68a758846b8a3dea2970f8d4eb2cb017ce4ae27bf1152bf45db1f78aff7bd907c2e0 WHIRLPOOL de351a93e1042fb5784e3fd4494cfbcbfca52cc76dc8ae04ff3443f7e05c63dfd4d313a4ebecbc4bdaa35a6b28649f756cebba2c1f102cafb7e47836234ae5a9
+MISC ChangeLog 1990 SHA256 cefe655b5af032b4dd09092b87d86a04ccd42ed4d96f3b33fe5d0e8fa06242e5 SHA512 bc19067bef8018df34aedfe8e467a9ed038d3fd4d45c5816a18b4a5025014c4b2a9405fce2f68a7d75d60b02e686aae0acbd8551d95341bd4d709d4e5499415b WHIRLPOOL 86090b92277078e987eeff392a6f8bc5c90584d06494fd94d734a3df6b081e8e8cfe74f1c79754c0d9a9cd26d43a37da70c0cad2f422635de5466d5a6d7e5381
 MISC metadata.xml 233 SHA256 7290f6bdd42642efb75c0553deda7dc342f7e230b92585944ad3e21ea31d32d5 SHA512 addb373b4e156420eb96f4d8c5c3b46ca6f6a403464af2297064db0d6cb33fff84531555ce3b5fa4e4e5eb4f7e39ab766cbe91bc89e7f72dac5eb557105daeb1 WHIRLPOOL 37d946c3da3ebb112b51bc4edf99bd20c076571ab24153735f34c7e4ae367fd2c8fe312df0cfc9afad1911cedf2b72e153416ea97b2079084fdc29bc252e3797
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0
 
-iQIcBAEBCAAGBQJT5RxVAAoJEC7dUkA7aK9HWF8QAKLgYO1oWvIGQNVwNv4FkhiB
-9r+bOmSPt2136ThUSP+9ZS0GHULBaaCk53c1L5tgW13yn0rMODKKoRgbiG9AoYMK
-s6HzyIyL3qdIApt/1b4E8L7oSOuY3O/pii0ke2tW8j6hHkDUVih8AQ1RL8Y6s1Oi
-tANxGDh+s9yMmwBOwSjkmKnuQsjePbxSmcMYgSq0+ow0XVb9ZH55CfajKYowHhet
-7CJdI+xL+0Ytuk5kUpL2ypFWp9gvR0YsF5v1pfkY3zMrbPMKnFj7mo2+9ryIykhX
-epgdbjanezBOHg+4eIbfk8Bxeo+fNm9VhAz+Nqe2pZQ+vKPe50VzQBs46nLAGsLH
-QYOUiv74LwOsbOVcWv5rLiC1hNQLS++agjO6DM1YZyRxHTW0cyws05ai5Xe8vJIN
-aSivf7AXVvtRXr96dXoWoYEPw13dgjA9EebK5S/9UCpaW23LBFUXhSdoJZ/l6dx1
-Lw0L9eR64vZXFWGEPHWcXUpviK3Dp0cPwXO8aKmkSWt86Ox1lZuiA4Iyq9SEUUdQ
-iCrGUhMp5iZvktIc7895ILbozJEv9D/yw/aA7C6dPwWS8X4ENbrzZCSBS7zAUx0W
-xJY5dy4/fShmyYNUt4SDZL9KVfLfVg38FWIx28r6MFB9fSmB78dciQHU9n+htYBo
-v+1+bKEHZJ4O8IiKubB/
-=1EE2
+iQIcBAEBCAAGBQJT5ngmAAoJEC7dUkA7aK9HjRIP/j2Nes2oBt2FJg2WbC2A1ZGn
+lfcfsq9CqNg50j9ZuTGKzNT6t5G5WRYJvS70AUbgEeeyaDy1oGkHO/l1RzRMx3Cl
+GkzA8dlT8L8fDXMKafBmwTKMVghxzXTnAiF3XztRS+55sx18Q4GUtpR7Gw67c0k8
+wpwFcCjjkEOu/yBEm4klpkLDdn+qvfbIcjZoVdE3NLY6WyPKiWuhtNSuF5+4SG81
+NS6vkk4Hl1ch4IwbaJTxpkxZ/Ze84ec8OsR25kEOSHUUtpcryezKKvoHwyCghxAE
+yipIrUmcOZpQO9+5z9rcAlhd/d6yrTiBFfL8OrjU9p+NIFVOTyrLuBc7VaYIZ5hQ
+8CuJjFPJLBWd/UtohVVxDUEDRGujlOFMHq/gExFAMLlhaKwwQYXAK3Da5MQlZ501
+SAbMY3ImNunQ/ymIwekqcYz+/ncp0V9KE6UuQ/3D+sSRgIntxpdbksIfvaGPWH8W
+f3MQT4H/jGa8kaMJPA2PcWfMWfpfsi2/2dSZwmCuX5mst2quru4bsv0TXl9GDoUP
+hxB8o5PkplRHhXqP+i7NkhJXDw2MXUrF2s3I+4pZxR/TqmTXcksCl1TKuLYQVULt
+JrrYnoQiTTxznTBzdmwatAkeV78mON1EQvFLb0TMSwQw/GVTtnkUkeJeHcFCzdXn
+i449Z9MzdqpDFg6p/181
+=A9qW
 -----END PGP SIGNATURE-----
diff --git a/sec-policy/selinux-accountsd/selinux-accountsd-2.20140311-r5.ebuild b/sec-policy/selinux-accountsd/selinux-accountsd-2.20140311-r5.ebuild
new file mode 100644
index 000000000000..5cc6f976b3be
--- /dev/null
+++ b/sec-policy/selinux-accountsd/selinux-accountsd-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-accountsd/selinux-accountsd-2.20140311-r5.ebuild,v 1.1 2014/08/09 19:34:38 swift Exp $
+EAPI="5"
+
+IUSE=""
+MODS="accountsd"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for accountsd"
+
+KEYWORDS="~amd64 ~x86"
diff --git a/sec-policy/selinux-acct/ChangeLog b/sec-policy/selinux-acct/ChangeLog
index 59219790e263..16b23cd4a879 100644
--- a/sec-policy/selinux-acct/ChangeLog
+++ b/sec-policy/selinux-acct/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sec-policy/selinux-acct
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-acct/ChangeLog,v 1.42 2014/08/08 18:49:38 swift Exp $
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-acct/ChangeLog,v 1.43 2014/08/09 19:34:10 swift Exp $
+
+*selinux-acct-2.20140311-r5 (09 Aug 2014)
+
+  09 Aug 2014; Sven Vermeulen <swift@gentoo.org>
+  +selinux-acct-2.20140311-r5.ebuild:
+  Bump towards r5 (fixes duplicate context for hiawatha)
 
   08 Aug 2014; Sven Vermeulen <swift@gentoo.org> selinux-acct-9999.ebuild:
   Make 9999 ebuilds EAPI=5 and transform to make master for version bumps
diff --git a/sec-policy/selinux-acct/Manifest b/sec-policy/selinux-acct/Manifest
index 18e54e29a979..e0e2624eaff4 100644
--- a/sec-policy/selinux-acct/Manifest
+++ b/sec-policy/selinux-acct/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-acct-2.20140311-r1.ebuild 379 SHA256 423cf7f1055404daac7bb520454e134c2377212ea5a34a365f8bd3c5bfc13830 SHA512 5744b0db6882e603a26f8e37f46f93eb8dd9d84fef9fb3b1fd60220c68172ae103b28add303eb7fd5fdd922d08f9046250dc24905a91f2c2abb0ccc136982dda WHIRLPOOL 7dd80d32acc03ff2cb5c7edeb8c9ffd59bed13d959a99c0db2b13fd79d00b7c93ccaa3cf49b648f030c7fcf321c91191fcea80dc6c71c58ee3bf33456e1b8c54
 EBUILD selinux-acct-2.20140311-r2.ebuild 379 SHA256 4cf7a054ec79e032d0ff74b891a061f497aa485b7fd1c19ffb329ee1f5b2ebe6 SHA512 b9ea752236f36614ca760d7d58fb4a5bbfca3c6438e4fdcee45acf1cf9dd5c8aded4a3d948f0f6b2aa8db2f7a83575c89e11fbae0375f1daf3287c28e9c68703 WHIRLPOOL 0067375370c44feed7110a25ac8a2147a87212725b7b4bea2565d6616d31c13b18f4684a477b5093ee6d19145e6a9264fd01cc2a09ae1b24496eda769e008c90
 EBUILD selinux-acct-2.20140311-r3.ebuild 379 SHA256 19671acc1e7f01dd1041b722f2da14ee7abb020d52d3afb4db323242c01b99fe SHA512 89145b54808bbd305733a25e046c6b1ee9c10ca5be9c1fc0962c4816486673360d5fa2b043a1afd95ec53e2b8b3448fbe444cfa11fcba7c241dae4d7f164c7a4 WHIRLPOOL 9dc6fa49c0c65c2149fcb25566d3808f97131c1d91558ac40db46460fbcb11becc11bdbc1312549c070175ce6ff57f2912adadf1a584d64b76aba93fbdba76ad
 EBUILD selinux-acct-2.20140311-r4.ebuild 381 SHA256 7209bb97593405601e2d61bd23f785307ddde9e7f46ad70ad1d55e65d2183077 SHA512 dfbb791d72f9dff83e69c44b7285abf94f111ceb76b2b12a951652373446f9c59b52a4bd8520f63a0e26b57d54f466fa847d382a7c16f8bfcb63c1b19d5db522 WHIRLPOOL c254b1d2a06f18ca0e86f174b68b7574412908977cdf26c345de3f8275e91db3890a680c2f677fc7f5f25a0dbaa4f4c890269eba5ee5e1fb38cc69a8ea8be795
+EBUILD selinux-acct-2.20140311-r5.ebuild 357 SHA256 b3a33a1cf6b3f5d4426288cd26e0b94f54b16ec434031f55cc54954bbdce6583 SHA512 dc92feb5798fba183e72b031707ab8185b545461831d4be6a9196cfd2f5cc7168ea667613447f7be016d497d6e24f59bde600f625b065753c995101b94b7490d WHIRLPOOL d64e0a1b44f9cd698fab98dfcd94794e14ec670af70e521b37b22d6864b36f17edc5f90390dc9a91290b7e21b7ede3e5211dc2e34d6c5a761dd3891e31933c7a
 EBUILD selinux-acct-9999.ebuild 337 SHA256 9e02987a3036e062ca1b4c12f48305131f4c8988f945af5fcc3d97d8fa415c42 SHA512 49c22b89a51694ac0f3049470c65ec05d8a28bfd60322ec61c3ede53429c8b668c4eedd147b50e157176a59c64b51103721a511b8e34fd725fb2adf6753612f3 WHIRLPOOL 2cf015037eaf9c1ba80b7368365a1e093f8a7587fa6179579349e80a3fa56a3cb70d7e5f650926e414d9a97ed02e9ec754a0230b28e98bdbca19886b6c1934f0
-MISC ChangeLog 6463 SHA256 4e6957f6c11b4353dee20a482adb96894438e1821dc49859e9211c046505f9c4 SHA512 88f88d1b5b96b4b14eb52a9b92c49b2df93d0993eec292e0593aec4f5cc64e4d99cc347e8b0631793df9506c126e4af0470f8ac84e528eb88976ecf84bb5bc35 WHIRLPOOL d96fe12ad6020f494d622567d24323d27c7316224309200c97d5350b5259c431cc5f86ea6447c4f5988d278bb24333bbfa2dc06212cc08f4d27729a4b8d15377
+MISC ChangeLog 6651 SHA256 0f6d2bba0b305dda172e094b0e07000c5532ca98b7bde7b28fd6701dff0f6a87 SHA512 5a72b84ea5e7f68704a353bad46b685f810058e0c9bdd0b7f672ef1affb4fe743f6107442a2b962c0137a685a0d2b94dfcd9cff7de476a3db27287062246e364 WHIRLPOOL cddd0832e118c76adb7cb89b9c29ba710784feae0cae098b3c81d1e3f2aa5f344655187c000b33cee3cef70a22a31b17a24b68041da77fe7a33b335ad32d51c4
 MISC metadata.xml 228 SHA256 1dd234639f283e4cf2dc39303ac6a84a206c4f2363590aea78e70b0e65a037f1 SHA512 f24a58213f74f139d75965e699e8e617f4d565e7a098bbca12950e4fcbb3ddbd355637bc3c3ce42b7edf8d066bf5b541fcda2ee2f6f376190f87febc35b4d644 WHIRLPOOL 016876d8713a0c2949afed106a1992dbabc5479875f765a2f48e95bb412531a193b4b873cb33805496a3d7be41cd9597db459a01dc06456cf4292a79302885c2
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0
 
-iQIcBAEBCAAGBQJT5RxVAAoJEC7dUkA7aK9HpRoQAIwNNU9yMLMYBQacb42rACZY
-x8w8t23pHwXzsKh4dEe6o05BVn4p7c9zYGCbqjKVuveY+uR1SxQvf+RCjh6EPSYe
-tjCTTl/R3xza8/xskrTfXrpzrSU3Vj21WSQ/0gm3zgbqpRCTFc4K71o607sAYc4f
-TnPZstFekEmiE+zouwYj4VABIQoaVh+k1ESEVuhGFcXqHB3+lanqZM9Yz5HikBmC
-pcaMLfk3WixMtflmxs8tY2NxOsFyMHTpivqOJM8gZir0TXNsnIhC2yrKZ3S2hN7I
-o+0Vr8jmWDFQU+rDZ/GKQ11GkVcnL/qvewJLUYRwbXfpcAhNzGJPiS3zkyqHO14p
-D63iL1oDHpqCTIVZCuI31RO8W4wg68XjUpQHC24v+zUSMpOFTY+78AhW6XLubXtD
-F/vlVtr6Q6G7rjNba9rOoB+9HNLa1vtzL0jWw3oqhG1gAWdJ9wGGDjmZP22Xm+ws
-Mn4usRObmwIy+v/n8MkgHTTDo/RTc7J5KRikAd5X98mGmSluP/JtI3FVoLGVD5MQ
-KZ3Fux0MD9O/MOaUkoX7ZM13LdZWvTewdO/yU+jElnitr12wtdkAED6unXhFhpVR
-g90uzT3zc6ICqbpivCjoT6ELVTteLG7cQAGznxILfVgTmAur9fQK/rLsmad1wPML
-tf9tLcGzEn2noRRxwz4Z
-=ZapR
+iQIcBAEBCAAGBQJT5ngnAAoJEC7dUkA7aK9HWuQP/iz+cAFcVIK7g/GFnfccvrTg
+t7RC7iXba0Km9Km7zJFcyG/Rw0P2VnyPVR+SuhC40GjL/nsTchkgDgPzgHeyaUtD
+zxtEbRQ1/MNyb255ZfKDM/yXcMvxyB2Yqr5ilxM+uFs7/uCULPYKlq7b2Q+RtUdj
+lRBJ6nde/x2Skh2/2XT80MqcnzZQ8p9hPMBXRz4p+d/2NVXDuVJoqaCFtkHdHKf4
+lrIeTZSWX7okNfST8UyJci9nEt+VSjyiYfNIW7cfdLMryqB8gLGPbpoyY/fK5R26
+2sHHk4oUom+x2x+sZHg+fhMnBx3Uh5UWL44HZAPJRr/5G8dCqk+4NFwzlu+f4scM
+3fNLQg4KHzCifuXmOgkouCD2me+mp58XW2OUcqZlLquQt9udtOb0q9292/pYcTEw
+u3qWF49pwfXmoqP7A+cpqOc2ojQvsfgE/LSRqdz/RZJmCOU0yfz+4UuMCLW9nidg
+EaKyPL/4YCL8MzEHV7dZ2fbVlfSQ/QE3aLfePmqsx/znZugJnbm5GDZnLE+ZCi5a
+lK2PTgAijIE6Hdbx/GBjlPkXIoqIl4ywtX8C+MHeEcBbLZmzBVw2qXzsPQ+uQZF5
+7UgMClWBzs2MMQwPYh/K5Fdd3oHp1N0DqyOZm1BHHw/Rc7Dy1vhJ92fRAGSLKWdR
+/OkiIjO+Yq3lwSWWfLqW
+=5YNw
 -----END PGP SIGNATURE-----
diff --git a/sec-policy/selinux-acct/selinux-acct-2.20140311-r5.ebuild b/sec-policy/selinux-acct/selinux-acct-2.20140311-r5.ebuild
new file mode 100644
index 000000000000..a3b676b8160b
--- /dev/null
+++ b/sec-policy/selinux-acct/selinux-acct-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-acct/selinux-acct-2.20140311-r5.ebuild,v 1.1 2014/08/09 19:34:10 swift Exp $
+EAPI="5"
+
+IUSE=""
+MODS="acct"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for acct"
+
+KEYWORDS="~amd64 ~x86"
diff --git a/sec-policy/selinux-ada/ChangeLog b/sec-policy/selinux-ada/ChangeLog
index 3dd78fe839b3..b639d6d396f9 100644
--- a/sec-policy/selinux-ada/ChangeLog
+++ b/sec-policy/selinux-ada/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sec-policy/selinux-ada
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-ada/ChangeLog,v 1.42 2014/08/08 18:49:56 swift Exp $
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-ada/ChangeLog,v 1.43 2014/08/09 19:34:07 swift Exp $
+
+*selinux-ada-2.20140311-r5 (09 Aug 2014)
+
+  09 Aug 2014; Sven Vermeulen <swift@gentoo.org>
+  +selinux-ada-2.20140311-r5.ebuild:
+  Bump towards r5 (fixes duplicate context for hiawatha)
 
   08 Aug 2014; Sven Vermeulen <swift@gentoo.org> selinux-ada-9999.ebuild:
   Make 9999 ebuilds EAPI=5 and transform to make master for version bumps
diff --git a/sec-policy/selinux-ada/Manifest b/sec-policy/selinux-ada/Manifest
index a3262aee21ae..47ad89e9fca6 100644
--- a/sec-policy/selinux-ada/Manifest
+++ b/sec-policy/selinux-ada/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-ada-2.20140311-r1.ebuild 375 SHA256 13e87474e4342f90bcfa9ee55a19017c4c37e550875bec530f706e97e659b7f0 SHA512 b4fec11cce147bf2046ca6757a7ccb80f576ec0ee196e9f7c00d0f511a7a673be9717c0ce5fd584f6da16df3c990a612f59a5f7bb3d0c167ec7eeb85a49ae262 WHIRLPOOL 69c20b2a0a224c768775d0937c08254ad863b259e18ea606bfd98c81f3315207dfcf10546c56ec04ad06d55bff6703e8f064a297fd765369fd3a59132366b3ea
 EBUILD selinux-ada-2.20140311-r2.ebuild 375 SHA256 50335783c3869e69a6efcc116a96e1030674107cd8d5b77153e1f90f0b0d9af3 SHA512 ad255f1d9923a6bf39f2dbb74d70310a97b57b1a61df9f4f4442f1fa8ee2a8d4ddd83e29957167eb3d9d9a131596644e4c6368bbc6ce4c09e0ba15efd2b75aaf WHIRLPOOL f05dcdb151f82202589238b0b19d6a407dc0b099f4909a8c969c73b4e9ae0aa686f9d01f1cca3b83bc62b5b11e24a552450c1eec4474a53d0073dc3287095aa2
 EBUILD selinux-ada-2.20140311-r3.ebuild 375 SHA256 dd1c2a418d9823f5fa025893bc1d384c96754921f0949d94123c5df88ac91861 SHA512 a6b2e44c994731249793d875e53948bcaea4fc6735f845d5e8a719cc548bf2f8ace3b06c794fe9e0b7f9c28b6ef9bf4e81e31cd4a6f570aec39bc222908b81c3 WHIRLPOOL cbae44b9e1908bbe21c3d01fb2ea8f0c3aad0bfe4e311903c14a836bdc16b16dd6352aae12bfca7554bed4ae34d1ba6b43d67ca3746b936c12da09ef0c049ce3
 EBUILD selinux-ada-2.20140311-r4.ebuild 377 SHA256 60e234afc4c8444326c9a1e67235c9b4d02e8e705f2bdfea4bc654adc4cf4d88 SHA512 32e89651e54b91513a80a1699b8024c1bf4911f1065a5a188700a1f76819e5bf761aa812a9d51fb06551f4dc674406157fb6e8df2b48989d05ccde3f7e7b2f36 WHIRLPOOL f6e77286f62688781a79b9128296e283f2af9cb224f28629d1415f221b30d3e826ed33e8e3415d3658dc0ff3e02a0250c7242e780b7c4486e434783551256b08
+EBUILD selinux-ada-2.20140311-r5.ebuild 353 SHA256 2a1ca954b59203fc174158f86f46e6f6a0ed9fc5d323db9933dc02d43876db71 SHA512 88c06fcaf35f6b4843295ad1ac85195b0185106dde0a3e332fed0794b172636c1f651149db8b5c4cc5d6048b3865109d76f60ae2b3f87aedf163283ef12527e8 WHIRLPOOL 833bb10440ac68069f03f5e9212bd54693245493cdb7352360d802e6fd80ca5b95794b66a5caf541ed6c781d9ef346ad484b4822386c687eb6b923ccb482c522
 EBUILD selinux-ada-9999.ebuild 333 SHA256 e244fddcc90e26eae2a45742eef2822a5efddcb33bc415fd8be2c4137875bfa3 SHA512 41038ee3213b556bada34fa43f06120dcdff58c699b3d696b6a396e3114b0dbe80102b17a2d872f442e1738d623a0d61f8d241cb61b21b221c2351a652b629b5 WHIRLPOOL a9d5b759238a8d8d555a2a0bafa5b5f3e27250b6e160b31ab971321bbadccbf9acd180aada18092a34ec89c9162a7cda9b81c80d4323300b97119706b41cd640
-MISC ChangeLog 6282 SHA256 56d2a5ebaa6f182f5afaf0b8ea92623b0bb7f4ef242849a476f6714682c4a6a2 SHA512 5c7ee74975f31a25dc000745e088454213319a540e721747fc0ce4c25ec46b0d5860fd7cc7b520202feb8c1a9fc24e893d1174b98e12352b3ef48bbfbf878a0d WHIRLPOOL d6b05c5a4676e151339281b65037e1bfc898915295adcfdbdfb4b92d8fb8ceacb9656e695dda70dcf78e1f844026dbf861fc11b8302a64281ef645a3fbcf9a13
+MISC ChangeLog 6468 SHA256 1b11a96a3f9ba52c50f8cb63a71b1c6b4d090535ddf53be3f7e3178377094192 SHA512 5f90279b1f0949e7a698c44009024645af969fdacf78c836ebdcef1c895983bd434e90348a93a4d3dea37d5435666b9b599b2f1da7ad7a2d86cf60e4f989aabd WHIRLPOOL 33ef7987d61dd1d4f7a31d870cda4ef3186cee79522a1b05cf952735d605a475fe5332930921f9d1a957dfbadb05d3ecf25f4d653ef0fca3c07dd8ee90a47ce2
 MISC metadata.xml 227 SHA256 d01c5b97ce4f0e8d2f6a515bcbbdd854730675bbdee7ba0d75c9762b4d01ac4e SHA512 ae3c59e286bc7f4f8289012b74985932eed43f46b4ee3bbd8d72cdbcc78fda648d7e1015a18b5f96d1af4a59a11f9ec590a933830de3e0afe8ff03e3c2e816a4 WHIRLPOOL 4a1c29c1071cf81fbbb667dc7cc79305c456c71e20e4e27e449fa32f1871bbb10f7e156d04c0f1e8237ac2ae4ea725af047e6b3b03d2f51974d4f3d40fd42aff
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0
 
-iQIcBAEBCAAGBQJT5RxWAAoJEC7dUkA7aK9HV+AQAIJM96YKQKpH0Ps4fNA4IjET
-Wy/O6b6fdpFxdE4sMViryxVfKjgjRKK04D0LTVAFOO+MzXjuICeaWz3v3fuT1Mto
-MLTY+91E5FznUo+QQsRlOaZLJYC60LxqjwuyP9bXBd10uTndYrPmP7S0t3RvNqKG
-JgLVCgbwrp/0E4ZuCuMcZv6ysu9gJT6CnJcbef668nOWMIsjW4VFZ7Zi1rD4EhiD
-PzhO93IihsUhFXG3ngA4SKtodE7lk2HQN7CEWVYYu2r1wr2vGT93YUVb3tDHieIo
-ZUzMNhCaw/ZKgxAQr9pcpDtjuuJO9AV+AnfRBFvK3MjGOELn/1/Q1yI3TV8OTg7L
-TYW7ovLzt1HBi6BXANhMia+tR1VyL2QhtoAagIsen6V7xQyPzyOddKBChufbbzC2
-06g/bxBLP4vucsdgN+h0/WTUqdQ5t9NLHrTLl5Wz2WHI5l2imQkWNi99olsD6L1l
-27H6kOCmZmxJmjuOXaf7eb9GYAqlO5W61kZ1//AsOHYKhhZKuiQCINQs4rwm9abl
-/GNxk3AjCh1JkdwqyH/OZFpqgYF512xsZXVfGT5lsTo2tofe0oeJD8yWGTzOuxVV
-ycsjVSUCq9CZ6fWrV37kk7WXidr/AyibsMDsqXLyEOc1H6EXNLawB+MacO/h3y3O
-Q7UR3jVyqYKMZfmzyMmX
-=38vr
+iQIcBAEBCAAGBQJT5ngnAAoJEC7dUkA7aK9HKMQP/jdZOfdKEVm68O0JhA0NJfha
+/UZTAOTTSC/u6y/9VsG/dQ+6PXDB2UWjuWazCxtRH3xYXzVHl6EBOGbbvlTafjTz
+QlypvXJrCfw4Yh95GEYfBHqbU4NhUBWOuL/CrTSPvEjPtTHE9QvkGHd3+pM2AYJO
+DU1qBJycYvhiyooTQdWpX/A+2NNzF5/X3kbLd7vPBoWtozqmrglX/nXUArOxDDOA
+S4kg1D6IlJgAU+DnK8LF+vZ1wF8agYrjyG5yUsPfqiGoR4lTNGoOLIKyTZcXzcmB
+okmQM9Zjp/5ZCiXklOvdfevQSXgnWJqbolru+/FyuF89zh3L5oWtKJIGO/53R/IH
+9j+OFa6oI4wFEXOuC3O5tuM3FWj7+Tkk7XN7yz4HHB5DXJvuSSEmty7JisRU1GPC
+LZvcHpCbh1D9pvUuII43BZi6j9P5mHzTtZ3AVJzvMtFZoGacqO4bfSFt+qSFGm74
+GkEJgl/tyVM2D9AxYz2oEENAK+LdwrYliSSsjELc3GnjgDi1qhRZNmSgiW31c5Vr
+dMeB9Mh75mijtu6DdFkYVxJYuEgvhAqvNixNRFoUWOOkqOnOwXRjxRJoOkrPkeay
+R3sKoRxiXJ0tRKBxOUamsDJy2GabOwcPcJBcVa+IcjUcQ1GzIYu/UYILNDNqlsrn
+gIxb2SNgp0z1e1cWedor
+=ys+T
 -----END PGP SIGNATURE-----
diff --git a/sec-policy/selinux-ada/selinux-ada-2.20140311-r5.ebuild b/sec-policy/selinux-ada/selinux-ada-2.20140311-r5.ebuild
new file mode 100644
index 000000000000..ab497ea8bdbb
--- /dev/null
+++ b/sec-policy/selinux-ada/selinux-ada-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-ada/selinux-ada-2.20140311-r5.ebuild,v 1.1 2014/08/09 19:34:07 swift Exp $
+EAPI="5"
+
+IUSE=""
+MODS="ada"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for ada"
+
+KEYWORDS="~amd64 ~x86"
diff --git a/sec-policy/selinux-afs/ChangeLog b/sec-policy/selinux-afs/ChangeLog
index 54bd4509ed18..99927411b72a 100644
--- a/sec-policy/selinux-afs/ChangeLog
+++ b/sec-policy/selinux-afs/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sec-policy/selinux-afs
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-afs/ChangeLog,v 1.42 2014/08/08 18:49:19 swift Exp $
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-afs/ChangeLog,v 1.43 2014/08/09 19:34:45 swift Exp $
+
+*selinux-afs-2.20140311-r5 (09 Aug 2014)
+
+  09 Aug 2014; Sven Vermeulen <swift@gentoo.org>
+  +selinux-afs-2.20140311-r5.ebuild:
+  Bump towards r5 (fixes duplicate context for hiawatha)
 
   08 Aug 2014; Sven Vermeulen <swift@gentoo.org> selinux-afs-9999.ebuild:
   Make 9999 ebuilds EAPI=5 and transform to make master for version bumps
diff --git a/sec-policy/selinux-afs/Manifest b/sec-policy/selinux-afs/Manifest
index 3795bd772a69..0da5988f4672 100644
--- a/sec-policy/selinux-afs/Manifest
+++ b/sec-policy/selinux-afs/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-afs-2.20140311-r1.ebuild 375 SHA256 ce4f546c5e666ccf06d81c5b2f9bc298f214cdffbd810c1fbe54ada8ab65bec1 SHA512 966c61b38abfd9fb4517947aed2c2da717611b99cd0217fac3ff234e173b4a364d019c0f1047063a63fa39aa33cc8859c4394152d1f91c0c4ea671d01144b524 WHIRLPOOL 2e498481393789f2f11409a0d757b89022b835dbda8834da61a8d0fcc2016b8ccd3d0df849a57b20a9350378c8292cdf3e1141cff4e99c0bbd9b3c98d3e8e02f
 EBUILD selinux-afs-2.20140311-r2.ebuild 375 SHA256 3eda1492a279b50288957628de0e63d9b4a9d5fbc95a8905feb1f395d44d115c SHA512 fce8f8acd27efa0e8de7537d3a7cdc8315e21032066486c338dd4291e2c6a44013bba21982bd1c5a77e3f7a14da75a97b60c4ed47fa71d4030335ae2bfaa5495 WHIRLPOOL 7da2755ab9f2a1abf4d9d0e70d9d9c711d38677770bd008c2a8424b8d252f4736b01fe3a73a14daf2f9fe29a25d2d9ccbf08e9491d4d42a5cb9cfe6bd82ba493
 EBUILD selinux-afs-2.20140311-r3.ebuild 375 SHA256 25b3cb423cff68f88ab532db6d9dcf9e85c27a6f7e3d8258cf7d9d0b508be618 SHA512 1d5dca7472f268aea1de3e45111ca36885886386e99c4c9c129e330e5f78875f6c400e8edcfb52ede4e6bcd7c5a8a02332508c5b68f9a6dc90bf31f7b393defc WHIRLPOOL 589631d886c1890a65c3f1466b407eba54aa03e7b8f0a80a6c1e965b7db554a4b8708759f2a0321df9fdd7411bf6539e0b7bbdabf70f8b009631904a5d79fc45
 EBUILD selinux-afs-2.20140311-r4.ebuild 377 SHA256 9f1fb1cab815f32652438229ec818000ab98339fccc3b22cb46d3c69dbd82a1f SHA512 15734658dfb15939153a19ce9164fb38d247c848446bbe5828609fdac1fe68aceb7c0542c3093f3d831879aa681caaa1a7bb0e12e3506a6697f283092a2f3444 WHIRLPOOL fa5c1f07007e486b43626bb9c04146a93b7bd82f4e866b47fb639788a1a75c8facecea8dfff7ed249d75ce07e89268fd40a386f29bc2cd7456b6cb31c5eb0129
+EBUILD selinux-afs-2.20140311-r5.ebuild 353 SHA256 ac188127ed732812e477f279e6c5b0b8ff0deb7f2f417ddfd767cb9f283416dd SHA512 2330b5501d093a51490762f6110349076978aebd1e81949e0f31173e1b39a2d621589c2315300237d741b1ef680033ef1fc3af99930515d0dfce9f4a59706214 WHIRLPOOL ea5bfa951cc18db69261ef7f666fe7690a2ebfc399c9bbb8494d018e1dd021d91c862c7a8e4c8761ac4b1af21ba8ebbf2271a4c7471e60d61b7ade67bcc76f4c
 EBUILD selinux-afs-9999.ebuild 333 SHA256 50a58b2b1d71d434f9e31c97c03188071bc948d5087ad9422548dd4287f7a69f SHA512 78a681e27f9487dc317ce704f49957c89e63943048d06da9d6bf09385bb9c1ef7618228d8c23dd632521d2720e0406543e22f6c07b8d38865e9a0c8eff4adad2 WHIRLPOOL f8a81d742bc227e9e83ab248e7e2580bc5ecda472c7ad25f75e552103415d3090bfed51bf80c2ea6caae5f4ec0874732cf3c7c34163e576fdb2bb4ae77699fe0
-MISC ChangeLog 6282 SHA256 fc69bf15957769c79956005b84ca67763c2e0af23387073adb2f09cc2bc9b263 SHA512 8edfe397d316c92813ff6ed590ec1af2c86b82f56f9c3059850c86cc05371c0917e648a3258e90b786f47da6343c02f4674211f6cc48a3bf52d3e2ec98acdb74 WHIRLPOOL 50dc7b2da14eaa984a3b6b854b6597b61c7bcbb79b9ecf9b0b8825fdaaf4f53cafe81adbae4a221fd18d6be2d87d5ad3101db6d2b4e0217497b56d1d9aa51803
+MISC ChangeLog 6468 SHA256 c488cccbe9cd9b485015271148dca048fdad06850efabd04a938ab9f8938c37a SHA512 48558b28f8e868559e70fa0bf86cbbec769067bf18fb8f8d7104c25a2b3973344db07a9e63d324444345fb041ece4f8c1aa4038310448b7f3bfd0f519d9b3b1d WHIRLPOOL a9fa1e50f2d4347b2c787a92f16966845808e9d283827f9a969e59e71cf3531901be9798d91fe51dcc27a9fa0cef9b55f3034f007e690bfa81f7a29169303b6b
 MISC metadata.xml 227 SHA256 ac9247c73af98ac6959263995fb795b3f507dcac6b615269233b04a27e5d0f07 SHA512 ba6f1204b8c7734d25e4b3f21b20538615b174843b1849525442e462ef985bc6decfdd2d2d5a6e139ca0ff44d26443f761888db7ae69c28544eb5b8b4b5528f1 WHIRLPOOL 2afdb56f8c4c60032e0bc9abac8495c0a5ed15db7665743fe28761a38c090138be342e9186d8561e8f0707c61b154ddbd874514baace51f90d200c1255464f0b
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0
 
-iQIcBAEBCAAGBQJT5RxWAAoJEC7dUkA7aK9HLbgP/34AL1sSPtDg0ZGY6+RHEmqd
-cW2gnZg7QphjLKJIS49hXPAjPJkkFpGMoFi2FTSRhVCKDzrprJh9iztLG11mG7V1
-FucxD3vGqsl6IQ0kBkJk1AGaCA4kPV6biMMULm0v6khNQkV2gt0Wt5fDuzmmB87a
-0EJ8J+5EPtjSFFQzXAoSEV0pqadn2RmzG9NBGu79xkhwLt8WH+IrCSLFbPwHt4Ed
-cKt3RLEZwX1H0e/atpFVFsgLmWBUEnJ5bUajEDEtotfGylipbDbYwTYErFQAK9dQ
-xS/HKh8hlrzHaGMcrhbK/82RHBLU4ecJq3ilP5d5FbrYGZNRP2piG8zUWlqCnFfJ
-lNtiEt2qLCiJiiWBu2zksrmu1tT8LLHIrcZPCyP73Q6OuzeaXFPeNRgN3D1JUW0Z
-D/upEPFdxtaUADoyHmHwSAzrCC0YDHObYoWYZAxpT2PwNxLCSq+yXR57l3MITfl8
-3Q3rOvpMX1X3/vC/x6t06qasaM/q+0ci4xeFsxweyWFd55HOfh8qKS8fziEnL/qa
-TlIGFaZP2G5u1nVZ8lDrJ8/Ln+HyXfHZT880SBlE6WzHxpEq+ooWcDecidBd/Fbt
-ipbFvaN/GhlMPVL9TzrIts904nPNGjshBmqV0zcncjuXgnrqZnhuOxwKO70XPi6c
-ZUAAjR8wJafFidt8EE2L
-=djN2
+iQIcBAEBCAAGBQJT5ngnAAoJEC7dUkA7aK9HAewP/Rt5sIfwpWsiH4Th2PxZ9KAQ
+FRB7q7ZOBvsODo6sEd6MMnJFRokMuNUUTeryziEBu/4lJMsMdhSeTY/vfMiMtM7R
+74g288ZmMEns5ENizgF19UdFf9Zvg2mrX6Y9G6Luqrq0AaZ+mjIVhGldEMu3vroF
+1QJhyw1Syy9xssoPYZOMHxVMnmfOlGUsqeuMf0HsHIpW33YAK6WaW4HRe5iQrr4h
+Ugx6OhPWKjq0FfNsR1I4iyns1YaW9/fRdomTefLErdhTnqjlCxa3KeilnKRymIv8
+8GL0uZbdK3Pv1XW15FyEqt/LznD6dCYuJKsJ4ANeF1Ok7c4hyCYxfKlN0QwZBpC+
+74lH9p4O7AFjMdMyAXBF342neCMHcsMoj6WfibNLOrUUa7HusKY8SN3HT72m/uJ4
+09EDhg+p7DUVCVWEWZO44n13UdBlxPbBgHlqYIH14MYIWbTPQc3OTsi8sYohneSe
+0Qg8EIDarL7fFAYF1EEatOk6MbalFpPy+KaQfAgXO2IQSYws5ogZjA4BhhcC4Z0a
+gjkUV37WmEUV1XGQiQ4R8RBhQldQcaCwkwT6wifUw+z2JekGcpYDsql/oDr2g0b1
+iKSxCsa2CMVb2y0r7Lt7Idvb8DOfnFh0/4S75+HOzxGWNR819OCRwCX1Wu/amvIo
+Usm961dKr4BSR2bbLEAu
+=2s7W
 -----END PGP SIGNATURE-----
diff --git a/sec-policy/selinux-afs/selinux-afs-2.20140311-r5.ebuild b/sec-policy/selinux-afs/selinux-afs-2.20140311-r5.ebuild
new file mode 100644
index 000000000000..7c357524c2d7
--- /dev/null
+++ b/sec-policy/selinux-afs/selinux-afs-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-afs/selinux-afs-2.20140311-r5.ebuild,v 1.1 2014/08/09 19:34:45 swift Exp $
+EAPI="5"
+
+IUSE=""
+MODS="afs"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for afs"
+
+KEYWORDS="~amd64 ~x86"
diff --git a/sec-policy/selinux-aide/ChangeLog b/sec-policy/selinux-aide/ChangeLog
index fc1f2d175996..8d5b73a8edd9 100644
--- a/sec-policy/selinux-aide/ChangeLog
+++ b/sec-policy/selinux-aide/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sec-policy/selinux-aide
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-aide/ChangeLog,v 1.42 2014/08/08 18:49:26 swift Exp $
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-aide/ChangeLog,v 1.43 2014/08/09 19:34:26 swift Exp $
+
+*selinux-aide-2.20140311-r5 (09 Aug 2014)
+
+  09 Aug 2014; Sven Vermeulen <swift@gentoo.org>
+  +selinux-aide-2.20140311-r5.ebuild:
+  Bump towards r5 (fixes duplicate context for hiawatha)
 
   08 Aug 2014; Sven Vermeulen <swift@gentoo.org> selinux-aide-9999.ebuild:
   Make 9999 ebuilds EAPI=5 and transform to make master for version bumps
diff --git a/sec-policy/selinux-aide/Manifest b/sec-policy/selinux-aide/Manifest
index ebe49d6d617e..4002a7dff35d 100644
--- a/sec-policy/selinux-aide/Manifest
+++ b/sec-policy/selinux-aide/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-aide-2.20140311-r1.ebuild 379 SHA256 beb9c45e6a2c5888290e862ef5e4ea4360a103d23b2bab2cd82b456e19e947bd SHA512 61c62563251755a2d48e80353087e7502c478ce164a31a9c38ee7f41adee34fee1df8e82cb660ec7c1a8733d1e3ccc1a65244c46e68f45303c91f15e3e00ce8a WHIRLPOOL fb92eed22d3fe7bdd1949804d8a37168d20123ab738b0750349e9a52dce9d22aa60826790f572cb9621d40549b96bf0fbb0f34b06d2e2dcadf7ff7bf273ed1ec
 EBUILD selinux-aide-2.20140311-r2.ebuild 379 SHA256 2167a86c373b94944eecb2cee5f2e1c1be5eb2cf33af15067da2778db0a5f672 SHA512 5b05d1453a042b3d723ef8727270c610d7b43ba8930dcd7704f920dfbd2239195626e79df65e0b223edbf5f2b4730add5d03a9b8bd1244f27cdf4a05b0220fb5 WHIRLPOOL c4c51c34d4a58b95e8c7c29130798b6ce9b9d4576d0e54578d06d76688cc16c6f4b1451e872697a2102e6c48a2e08709712015e1da7c8ce9a252d68021de227b
 EBUILD selinux-aide-2.20140311-r3.ebuild 379 SHA256 d02505592240ae090031f563e8fa86a78852a93041e58f123fc557f80fd77dc0 SHA512 43ebd643da7c8e17ca81f93ade49f850195b94d5dad1c50ccae2a7bc4e88b43b12790d6fe00c0947fbc74172da9cf49dc99b5c8f2608dd47364563cd1bbb4e4a WHIRLPOOL 1ddf8786ee3c02675270b70ddf1d0d17cd7e1a17c65f0cc0c66ef1e67cef8f257778b52d72d13ef6bec4dad2a0eca903cd4224e3c4ccc6d3c583a597cc27a740
 EBUILD selinux-aide-2.20140311-r4.ebuild 381 SHA256 b4fab3e3ad657c80f786ef7b7593814102444cdae9ed4ebc1e5bfdc332011229 SHA512 c210f4b933cf428066580db5903f3fc235adff3db42236b2e7fb15488fc8122700a7fde2e6177e934bef8ca0bcc455327bd29fea1f1761ba4ac7c69b1ba90625 WHIRLPOOL ea500e68e1d26adf9dc25cee8811573fb02b4a6857bd90f664b6c06e87d1a6b003cf033b4ca7c81da829b40df279cd842eb5a00160db4bebc82a1a1c8ac5fd9b
+EBUILD selinux-aide-2.20140311-r5.ebuild 357 SHA256 ebcc801b8193d5473f162fb0056ba9359e8aee3e8097a1f5aacd80ac3cb18b8c SHA512 bd6a65577b1e52bd2862a85b3fe1bcac5a629918d3906742f6e350af03b297d709f13f33ba7714bbd044fe3899082f1030d4ca5b9db707d8db914aa0f38e0197 WHIRLPOOL 960aa1eeddbc0642b07d7fb21ee3eea82c3fcf1d93b6dbc7ede8f970e80c81e8ea2bfd39a41e02ff7420a84512093fe2e69a9e9947d9e818ecf29a39cd199f90
 EBUILD selinux-aide-9999.ebuild 337 SHA256 51ad2182e0cc90aca0f402a42736a6d9527c148b98ff3d883fcb5f6d00220cb4 SHA512 5a1d91061c369a9765b74be81f5bace84a5b550e0b9f7f9a9c0752e04ca742e2b6905e049d0f6bd4e017c29d180d80956500414be78246dbecbb7d1a8c49d0ff WHIRLPOOL 88727d7a47eb6f5da64c534618d153e59b439e7339eb6cfd5f1e86af43f88a4edc8d570752d762984117a6ae431c72fe3c54570a3eeebade3f74de61c735d9c6
-MISC ChangeLog 6357 SHA256 f003aebc6ccf5c5ee546f7d494da9f806c78fa1216654fc10678656e0876d9dd SHA512 3f0ea01b3b9d0fac0468979c6f51595b44ea5b1716efd39747a42bcfb3e47f6ec958c9b915c0240f0b37ebee4ea375f12b6bfc4002feb31f20728aa0b3b44c31 WHIRLPOOL e0a162fea5ba53eed4d926b3324f8c5f00ee00736b7dde8f68529c56d92b02fd91648fe81103606fbc89e0dfac98deb240fcde998c19e2d438d92aaf21b18df3
+MISC ChangeLog 6545 SHA256 4803cea609b3b456fde6c921f2c83e999587f8ee8aaec06e478485dc9f9bb8b9 SHA512 d33a3d9b02f74bd75bd82fe54dcdad06313883afda769e9841ba17cb8834f7601bd88556cfd1c96c52917dd670b9ca4dcbf925ae184d7f26f5c4cd89c0571aed WHIRLPOOL 3ae8756e8819521825a5592e2c01a30cd1154ad994062aab450a1dbeb472cd8e916e65fefa3759023fb7cfd90868ee042806a0ec2d4525d611783187241a0150
 MISC metadata.xml 228 SHA256 6bcd7983c9ad44be9a34d4eeaec6dc70f8a94d549e8401ba3fa0bccea44f9b5f SHA512 fa4feb22ab2cedab01727298865fd4b3460620affffcdf2f75c33c554382c816ffc71a2c443a500a043eb56fa0c93659e348b38f3d5bf8dac9a34f6f0c643792 WHIRLPOOL d566d94d9028996028e3d84bfb1578feb66800dd2f347f49d376c452b3f7ae1b0d780950b362e08534c12d05ec84ed1ef8ba81fbedef684e1be1cf73cf19bd4f
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0
 
-iQIcBAEBCAAGBQJT5RxWAAoJEC7dUkA7aK9Hs7MQAIgefQbsNAmOEyh3YZPQKvkK
-yq0NbabC0GMQmEkJuG8VBFj6aZhTrT5vMy/BYmmleBpsdveuSqC18ElWByod+LVg
-givyjQ+p955iXrJg29AxfpoBoUF2cF+LCfrm1Sozc1emg9caP2XboJsJIO5PQAd2
-1zE5clX1LokoopkOInxLex54CQisIM9i2emI2gPN1iznofGrM5xlteaimt9JheAd
-T33kph891eOBWd1hN12/a3FCtWnRdWqJmeJhDuvMSPlnvgN5FAuKmJFjTAyi6N4n
-ss/T20W3LsRMTasNNTolaKv8EybIrbVnYD61zQr8oXoMH+l58zUGSI4NQLY6HxnD
-6X9iH8CKkHKBCQtX6H5lXlsK3NauMDROlB13ypRz/96LC3ycZg4/FHJ2BzAbOq2/
-haL8UlYQQ1R+i1fAjyVq4mpFmzBraEfKkZHh64hpGrWheXveN0mObCZdsMqnlh/I
-9pQ1yZHprtFVHitk9cJWFy0idbK63D2H6idw699qKeslc9axkSUqIUOvIUW9FJvl
-Iz+zPoXb5lQdbBb8CANp9woLiIIG/4k0ZZ2pZF3PiuGy3x+NZEYKxm+YSlRohB4t
-Z98TGShtDQwSq2Bfs6iRGGnG6MmKMDplwgV1UWlji/i9JaCv5djxeNIo/z0DHAPZ
-jl0t4YGhaCa06zEZqwP4
-=tZQb
+iQIcBAEBCAAGBQJT5ngoAAoJEC7dUkA7aK9HfsYQAJcxjKXEQWGixt6uDKZ/mHIW
+jps4Z4jcYxLx9/snEnwl5i0R3cZix3P8PbHiVo95a/aXWnXhVYgkxT4O+zPY1YLn
+eHGVeNYYovbiaXvwGTBGNWI6pCmhRPpXv0wzyKNglqI854j3uVOzv0Vh1WJcsvFJ
+Ad2DbXg//mlnZFM2Zepw65Q9aG/y1CRT+Ndkz4rpT6FIAj6mWavbXdQpXoqtBv+z
+g92v/zJPdYwECpRlJy4sAhrFnzjR46RWAQDCdZHRuMd7yZgHB7+iliPACrti1Nf9
+srArviLAplgSCwxWh09TmmQZYF9rcJkTRS7fZeObZrVap5OPL82Lj6LKvNHxlPfE
+DlR/3xlEOrJSx6tohybNeRl5HiEw/6ps4ESomE2Kzi9XPsYuvQBmaSXQLECnr0We
+xnJ7HBjR/Ezqfmanui6Dw5xfB7QKUCpWqUuttf8DlKkEdOkDTcT3vkh/bmZRLsBf
+pcb+CG+NQ0p08qddlMg3LkdekwaJz3X24tYH85uuy0qtOt8umiBi8HgnEYEW0peN
+ZFNyc7mpfTcEYbjH6QelvFA2KtufdXPRx4sN/sXvw8k14p6kugoDakyWAmzf396y
+T61q3GyhjIYeNhoZXZhi3c8y9nRfzQ8KRC07NET3lIDfgXTW2iF2rN2yDZVxBeMF
+nsnLv2GGRTZ0DQUAxRbc
+=67hB
 -----END PGP SIGNATURE-----
diff --git a/sec-policy/selinux-aide/selinux-aide-2.20140311-r5.ebuild b/sec-policy/selinux-aide/selinux-aide-2.20140311-r5.ebuild
new file mode 100644
index 000000000000..c26634996b80
--- /dev/null
+++ b/sec-policy/selinux-aide/selinux-aide-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-aide/selinux-aide-2.20140311-r5.ebuild,v 1.1 2014/08/09 19:34:26 swift Exp $
+EAPI="5"
+
+IUSE=""
+MODS="aide"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for aide"
+
+KEYWORDS="~amd64 ~x86"
diff --git a/sec-policy/selinux-alsa/ChangeLog b/sec-policy/selinux-alsa/ChangeLog
index 7f3b180243ca..185c27151b72 100644
--- a/sec-policy/selinux-alsa/ChangeLog
+++ b/sec-policy/selinux-alsa/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sec-policy/selinux-alsa
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-alsa/ChangeLog,v 1.44 2014/08/08 18:49:41 swift Exp $
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-alsa/ChangeLog,v 1.45 2014/08/09 19:34:05 swift Exp $
+
+*selinux-alsa-2.20140311-r5 (09 Aug 2014)
+
+  09 Aug 2014; Sven Vermeulen <swift@gentoo.org>
+  +selinux-alsa-2.20140311-r5.ebuild:
+  Bump towards r5 (fixes duplicate context for hiawatha)
 
   08 Aug 2014; Sven Vermeulen <swift@gentoo.org> selinux-alsa-9999.ebuild:
   Make 9999 ebuilds EAPI=5 and transform to make master for version bumps
diff --git a/sec-policy/selinux-alsa/Manifest b/sec-policy/selinux-alsa/Manifest
index 1b934adba844..2f10f3486e4d 100644
--- a/sec-policy/selinux-alsa/Manifest
+++ b/sec-policy/selinux-alsa/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-alsa-2.20140311-r1.ebuild 379 SHA256 b433a8c24dd5057a4f0808e3ff688935d7e9a78676985a5fc6a14022fa0cc7cf SHA512 05735a7fd355de2f8b7aff3b471422ee7fa62706f5afaee21a517c8cb5a95fa9c555a7aab28fe12887e74f5fc15065b4b2b8155f50eed35e7b0433054410aacf WHIRLPOOL b74e2a3a3b29d53d3809648f8a54d77804cf4182e7a3f9fa510cb587ce67d334b0cfee51e418ccd44b49fb3925a6e61b78d74f238dcf93f9bcf45a207b9d42f1
 EBUILD selinux-alsa-2.20140311-r2.ebuild 379 SHA256 7ca0d061848bfc4fb31f020cb378f262117af0e295404b1493fb55bf46604c99 SHA512 cfad5fb4acbd117bd8b8b88813d8ebf3b832bfdb9f6713e4568ff0f82288c32c45e7bbc26c80f2b344c3b22598121ac313b8ef40522efb614010c5993ad2884d WHIRLPOOL 751e712d2132b1a362b335e3bbe52d55b317faf9a0ce9f1c7d4482cfac715db1dd0d1df75e048c87f8282992bf3d4fa1afec07c6878083e13d453bbe1c121e67
 EBUILD selinux-alsa-2.20140311-r3.ebuild 379 SHA256 21f4efd94db330d7b33db7002064c2b4a9de81aaa5267b86baa726edfc7175ef SHA512 86937a5232c32530152413a57e1de7fe7ca99d3dfde50cd66dc25421585bc08b310fd5e7cd87f350b5842beb8a547bde2f15b5ed3f311872fde96a1152a424b7 WHIRLPOOL 969eb46de7502de0399009bd8da73da0a66665267395b408893885d76b2367829fbfe48cd47cabe0be7f763662972688dc0fabc0c9f8da9512725d14d9b7000f
 EBUILD selinux-alsa-2.20140311-r4.ebuild 381 SHA256 0d3562d7c2d3dfcca47e589bcd03bee542a87f60ecc20ed0c309cf875f4f2fe4 SHA512 93d6f0925204c960ef1891b3637b98931e05ec158826e73bbdf81e33cc9a327ecb90f0e6268a788b77a3799e051c81cab9e5795de877ee71daacf42aeeead9fb WHIRLPOOL 0156ec825d613dbdf6ba9553fd08ab5a334d09a0142bcc4dd08741cf9facc724a5b4f9fe8eec0ee2dcad18375c3ef0917f159326587dc44eddf2bc99fba025d4
+EBUILD selinux-alsa-2.20140311-r5.ebuild 357 SHA256 4163636186fde466d8699ab9f3f05dec08fd4628dbd3252b741190517035cf56 SHA512 c107d16736463e3dcf872b82a6238d285b94a138e401835a923e00fd06f8515d5a7bde778d64d62c6333ce11c456cf31e61fa31efe9b5072ea963a170fffcdf8 WHIRLPOOL 2062799d715cdfb769159ac3d6349a8a9005ba93bf83bcc0eca47ec5ae4161a71410d3f8697f305130c890ec303d1b6ace7f19cf1c02a232977f12d02f5d8e75
 EBUILD selinux-alsa-9999.ebuild 337 SHA256 181c2d61fc6d7aa003069fc2bf86ae2895d93009a931226a90412e5acffb39fc SHA512 5a13cbd8c265ab2aad1c43ed41b0c1b43eb7d011c5e3e30858cd2ea859c3eaee0f2c0cdd9b72f711b00ae68cce0540f39bb66a3b001810f2f744a8cfdd2a5f89 WHIRLPOOL 2eee0a0363197bad6c4e6cbdfa8918b0bc06ac5974ecec1ecce8495718f77265860982a238f3368856d75e011b46664cb57188809a4618f03c94a56a72098841
-MISC ChangeLog 6798 SHA256 10462f8178ed81b49c4269c70be6280b4f8eb0e9ef5dfb349e3b85d3c9e571ba SHA512 8c7f5387502acbbb890354ad8ba63004f26831f046754a3c2547066cf769d372400c56baab1ca12333c12214773bba7c36ce7f1910dcde18741538b2286a9542 WHIRLPOOL 7d9726491bd981570d1d2fc217a92d9d0942670cdcb6dd26090776c0fa1918917cc409aad86082dc783c3442a65c36aa7bbbc422cb650db842153713bfd6c106
+MISC ChangeLog 6986 SHA256 23d142c51b86a4d09e89c4ce10eb24c40a9466eb4bac0ec0711fdf6e295d692e SHA512 ef5b5a479ab47e0b09acbc544f4d9d3fb8237d9a711856676b7e988369cb10ef698546a08bc41181415635cb363308bf2a17a5269ff29e5f1036d05c1826ec84 WHIRLPOOL 06195060590324b22c5d5c958a5cf9459df54092c9f5e11ea7fd8faf14550b0e5f524f0759ef7ff56d483d0abc639cdfb50de6ae7aa73f85ff3e3742eff5ac87
 MISC metadata.xml 228 SHA256 4b1a15375728ee121f8e0c7221819bb33ba3978243784c0106187251bf169981 SHA512 4e456621c24e15c65244463b3cdfcf35484039bf84f70c69c7c315db60f11631c68edeb0fe94f652d0ad1c57b406e87be8b8dbd4c54633d3a5470a1d794c53f9 WHIRLPOOL ca1d07ed1238c042237096b868b9b29faddfda9744cf26cc9f2c9f7f83fdb6013eb3a0147248de56b904f87ec705ffedd705d212038b51351c77b274efbdcfcd
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0
 
-iQIcBAEBCAAGBQJT5RxXAAoJEC7dUkA7aK9HdCMP/2Ld8fxhzgyFutFsB6Sawr+B
-ha9qJLrW5Ia1VFUfQiToxZKylWKitfltOxeHP/C2YZawU9o4raT9/x25139qrjpM
-Y5W4WOWUWC6GfThFqjbVuBubapXdjcG5eaJSy3hAljA5W2+8g3BrOIaJwNb8z+cW
-rpQpNTNJWZyIkmb0WUTKsomHj6vd4gZVLa8GENiRGNgt8VkhHvBUY8CYFw8PdhYz
-fskZCWm4OAVL0628t2BhvvO/XfxTvVi/JpXqH3xtU0UmA13bAAI+DJp+OE59oewp
-CRWJdPrH1nNOA3w0nvQCK8rRijna25WtZK7ctgdvJJrFNgGjrrClZgQ/twEC07NL
-jTa+1lrj7a54e3tqn3Nyzq0SIlJnE0dxcFT93mYiRqFaP8SCQhJoUd0uCpiEBHNK
-PPmonyoxLPAD6MIwcF9mFdgrLYK3RlyYH6m0TgAug4+GTNcUham/nZ9fWyKyDWFH
-2197EBNWOfcxN7sh7Qu8zSwuvV1QTggBNCfvkrm73jqyPqttQAOPBAt8HugMMbUb
-gx3AfiudEri/RplgoLwUHPRODLt8BPrnpuf2/8950Y09yFl3WPBYfRPClVFBKj53
-y/xepyAFNREKEkKBWRd+BMcm4vq6Kn6MFkiJDMdjuyParrR4oHlsWwnjajH12bew
-un6PDyLZhqskfAVpykyS
-=98vS
+iQIcBAEBCAAGBQJT5ngoAAoJEC7dUkA7aK9HyD0P/0T/psZL8QKmUkfiqVFXVwgw
+//QVLVfScjANwkIwKNbWCfDY5XY7eFURS40GQB+Hi/DylF1o/MZcB2yYXIQMvxT5
+/2uQW+5I3AHu6lfyPwCuEnOTa+LrAQqDPSSAqMCsiWF119Js8wI1B5QDn6EUxJfh
+0YPQrqcgDH8O7coT5xjMgNklPc2FKfc938w4BV6rx152kvBZFrbK0f/cMMk3jRq0
+/flzKyfSUERVbu9trLMa1IIA025JZnK+N+suCqhw+NLXzClxEPK//PFrhdWM2gcN
+GtutADQpacZ6oKISKnJmtQ698DVDNPqIdLYrPI5vcbRi3msXBSCTmRmjZTsyj3KV
+mVquRYp+YIzWbs4Jg6TqE2LYAFqZ2VMjAgyUy9XZsY6MSIVI6UZf8IJ6am3XGq2r
+LwA5I5Hwx7RMNeUZ2JroeoFkBma7BcDZNebEsTwjvSwV0KD/fZ0gyUGhiC/p/YJc
+B2O+ZgMhcXX0eBDLHTdEX5VqFBBmzYO1s7bEso+OdVts27m/0GYjrP4KHnScIC7N
+sYhqq7MxrQzOG9cIFgkrEb+lS1alNad6iwww4TXdQuDrM4uQDfT7C/etLGWnpjJl
+4TPvXeYpQCFkGeCtjiYstWQO+w9ZdoarN2wosx2A+l79kNtVNnfaM+ccWJ+84dui
+zftPyskiF/+e9qHyYoDM
+=1vah
 -----END PGP SIGNATURE-----
diff --git a/sec-policy/selinux-alsa/selinux-alsa-2.20140311-r5.ebuild b/sec-policy/selinux-alsa/selinux-alsa-2.20140311-r5.ebuild
new file mode 100644
index 000000000000..c2c871f528d8
--- /dev/null
+++ b/sec-policy/selinux-alsa/selinux-alsa-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-alsa/selinux-alsa-2.20140311-r5.ebuild,v 1.1 2014/08/09 19:34:05 swift Exp $
+EAPI="5"
+
+IUSE=""
+MODS="alsa"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for alsa"
+
+KEYWORDS="~amd64 ~x86"
diff --git a/sec-policy/selinux-amanda/ChangeLog b/sec-policy/selinux-amanda/ChangeLog
index 2238e9880c4b..e40bc7135ac4 100644
--- a/sec-policy/selinux-amanda/ChangeLog
+++ b/sec-policy/selinux-amanda/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sec-policy/selinux-amanda
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-amanda/ChangeLog,v 1.44 2014/08/08 18:49:35 swift Exp $
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-amanda/ChangeLog,v 1.45 2014/08/09 19:34:29 swift Exp $
+
+*selinux-amanda-2.20140311-r5 (09 Aug 2014)
+
+  09 Aug 2014; Sven Vermeulen <swift@gentoo.org>
+  +selinux-amanda-2.20140311-r5.ebuild:
+  Bump towards r5 (fixes duplicate context for hiawatha)
 
   08 Aug 2014; Sven Vermeulen <swift@gentoo.org> selinux-amanda-9999.ebuild:
   Make 9999 ebuilds EAPI=5 and transform to make master for version bumps
diff --git a/sec-policy/selinux-amanda/Manifest b/sec-policy/selinux-amanda/Manifest
index a5118704a3d7..06381e54ef4c 100644
--- a/sec-policy/selinux-amanda/Manifest
+++ b/sec-policy/selinux-amanda/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-amanda-2.20140311-r1.ebuild 453 SHA256 69f8ff4f59df1670353fe23e9de66fda173b2ac181d4d723f5b79ac9e19c428c SHA512 453c29825963cef05b2cb4ea82bf8a4e6793fd894638e9f02a3c2781219ce5543b738368b7702eb3bc3ed0b82870cb0127a8d11de535f0b723ede68c6bb31174 WHIRLPOOL 45d56510a4e6ebf62570a9325da0a50b8f5381277b3b2a5541c7c80fdb2b0bf68878eabd97365ae8c93c92db365f4f086e5a1f9421c990a3361b85f5f39c22bd
 EBUILD selinux-amanda-2.20140311-r2.ebuild 453 SHA256 273c1e352b71b4790e0280beb25039065fa2ca470e337ed4e165c2ef3ba1c78d SHA512 ca31649cd87ab5d213db132da52cb4bfd3bac63cf3fd3e943fe73ec59310c5dc6618bbf832e5a735ddd094145a7ed108065116596122b3b609e5eb48cd494de9 WHIRLPOOL 6c552db56f18d21d2533db32bab7b4311d05b9b5eae9ba45981b81f48c70324929e48bcd96be8e8a777301ad33e6e797e7c411aa4f3c176971a94dee78dc2058
 EBUILD selinux-amanda-2.20140311-r3.ebuild 453 SHA256 8cc7e52dba2741f55d1483a84c7e51d17be9817197170f67b33778b23966892d SHA512 14bf2924cd2b8e68987741fe0c8c5065501656da84b0043cf96b151ff9ca554d28c4516350ef95f05a33b5fa74f9f57fef82c34c0a1c4df809ae3bcd5152b8b9 WHIRLPOOL 82096438d7bb5558a339fe6f0a69209ca43fba8cd40e71dd2b236f0c53b1a0b079a4bffe259a510c18bc5cf2cb3a5a3250e1447476ed9e8a145380cd424696dd
 EBUILD selinux-amanda-2.20140311-r4.ebuild 455 SHA256 9a4efeb14c22c8d4a301dddba6f11426880cf48267a84f6f1b8da5b580094fd8 SHA512 b27e6e08b093448beaf73d3bc312aa32bf75e848ca70829c2cb33cdf129ac07decd335032b77868d6931febfbd5423c6ca027bb8006ce33fe0c55469def0a1e5 WHIRLPOOL ffa2dfe72f4c77f7393e3ff06e229cd2428d6af0da35f235a8d2411d94f47951c89ba8a35445f57c3b49cf0eba62760d986fb2ad9d7f697f69a3eca6930ddfa6
+EBUILD selinux-amanda-2.20140311-r5.ebuild 431 SHA256 d2b71c1e18432d645d3c1fa78c848b43140665d95b3b1b1d3e7ea2e4155b8c23 SHA512 84a49b0c835dffc206af06c596054c68f134e9657ce2b198d45d9ebea5dbff8eb1f5f778ed39e2fe21cec28715da9e318c345b7e34f799c0ebd33fc9a45e101c WHIRLPOOL 954f9e9aaa49a869dcbdac6f347132c64cecaf4d3a8f28a903f70470f9d300b942d560063f695048713eea57f36032c79affa5cbc1ec0934dec9c33bc06a8789
 EBUILD selinux-amanda-9999.ebuild 411 SHA256 37e052df99032f5e001d633e64a8b81c5aae011bda0f902cff28529ffa61f786 SHA512 5b5de229300b7acf48b123dfbb2479261d5fe0245f71514dcd4e8b0223e931047ce2e56b92e69a15b128c100fad9bc03e71c869bf284509267ead3cb59e942df WHIRLPOOL a700f160602d00bc1fb746ac179c903ebeeed43403ea4615be82cb9cd3572d22fe7df161fd16ae9c8141684922941096b4eb8618f3f99b711b6b733e6eff9950
-MISC ChangeLog 6839 SHA256 1d9f4c3ceb1cac7e8d1680c1d11be9c0d64cb104cfe54a741336b4d7211881bc SHA512 cb1eb951ba1c26443de00124c339f971a2f3cd1236bfb3d06abfd327d4f83e45bb5669eb5afa764632378cc87cb004a3125ece93909dd0cce56a5e37102640a6 WHIRLPOOL 4840f320b5151b468627c02e8dc3eb08d0c1fbfddc84c8638a4a144a9daa996da98c550acfc3ab90c3f02cbb090faecd406cf2c2a3893dbc3cc2fca1724cdbe5
+MISC ChangeLog 7031 SHA256 02e171d55b65170bbb122f07ff5886ecdf59a0b0187c8b80bcbefc1758e73e11 SHA512 a2def6577ef07ffff3b85a860ae5b839ecaada4b48c70e5dd032f88a1adb70eb0ebff425888d8404a3c7b775275e061fede57aa04a4758ba2f14c3e413b3169f WHIRLPOOL 9a08b8a9998c6c0e5d31a49ad2f22211dca8983e30f426c473365e3eacb7fcfbfd016797ff53932e70f6acfbbf1aa84bbf982265d491e193902974d9f3bfe13f
 MISC metadata.xml 230 SHA256 de9480ccb18800b666ae74f2912a023838051c252457062835d660577b936b59 SHA512 1a8a4c8bef8100ad4f084587135088603b1d5e36862ccf22c3abdfc243806b9de12b400cb74b387936bda378122f3c292cc7ac3168d7a55be6734bb3777cb33f WHIRLPOOL a031fe0df4cf60044ab9e5f27b2bad02acc92e8726715873717ec7e7c7cf9bf97dc4f5b47ad56816af349cc8a92eee1db752c1bdbf81a6ceb71467f7a6325fa6
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0
 
-iQIcBAEBCAAGBQJT5RxXAAoJEC7dUkA7aK9HVf0P/is0Yt7f78/piubdwGi3UClR
-o/3e6zYYXKBu+tzVybvn7uLBXQkpz7cEgGF31P2TERep/ip9E1yzM14pu7EsJKfD
-BKtjIi7zBnVyY5RnyzU4sfr/1NuDZzRwXL9FGM1c1ZEmyOAAYPSbdM71perfprze
-s5i7NJJ0tfYyC/vQDU562jRb48GLu1CcF+XS2LZR6Hpu79Jh9nVon2wggfqiLO9L
-TLUNPnSQ023+e7VmXOjcyiREQD6+v6OGkTWuy/UtNwRlGNeUWFf9foZVkepPwpBl
-xRiTmwbvw2ylg+Wwf2C7+Ui5J/sYXkLJA26RfXXOPyddddtf3MDYWpFOKIOxinuq
-xWAzYJcwrPGcVjf+tbydcSOzDRHg+7hxYvkT94ldxmRaixIyviFNm4E5NVo15ZFx
-X50aRuqSf1rXJ4LQqp+x3nxeRUEv6de46Sc2VPGBzdVYrxJ+Si357nTVoP3I4YG/
-urgy2aB1jTGR7XsKWsAbFw2hDeEcgtbGkd5DqEw5jtW2GMnSrQvqcuggl9TrCAVw
-Vllthp908XpYgpqW+563RkiUZvyt6c7cCUYdDYmWGM2IQ13govO6OlgH9c2Ug0jB
-Yez2E8wtSRdutVf6U5rJdJwa1RD4y3fxnMtLBroB1Q7Ky2J0mMUxLb+uHXmbCuDD
-c0G7Xs6qK3AYA/Vjj3Eu
-=6ED3
+iQIcBAEBCAAGBQJT5ngpAAoJEC7dUkA7aK9H40EP/jqTVao5G99Z4Mk6NIzq8Frb
+C63qJ8EJ0hHPNMvkncRT0Y8U4n5Lci8R3/W/PAhTUTOAO9esaGQyac/2eMKm+ob3
+wIKM4aPPmSYjvib9WJHOi10lwS3eceb7eeUQKB4KBqKta8VY3s+n831a9byuIFK7
+VunIzXYzJPmdGB+ExtW6RMfkDWAEWkp5FLBFaY7AXGHCfU/5BNMRFh19YekhbrYH
+hlB24wMXJRHhVynwxp+ZJcSsrgvChZ6mqtFECIAQ8nPgm4s5DEq+BlABguYlmaGW
+/HfWqlPWcOAkBFaSLX4Lu3VIwdzyWELqsgAxiReNtP3OveiB/pha029j664RZg8l
+XChJtB948MB6c0IS12LdCU/6AFmsRhpCrtWAoD94u2EXr8SdkgcLtGZ0KRvC7U4A
+CPukg9aD3UYgk4moHBZHXktSnXTKkc6VbdJmRDoYJNQ6NkRscHKEWE1YUoPvjkGd
+Y0oGjHY1w4++qomsR1KuP3Fqve8kybRi3iuVSn7lLG0atrN9yMnE7QM2U3WyP8Yl
+UPy5rFlOIlbVmB5f+S3XGV8TqQ3CNnfKTowRtLr6oiCM9oAk6ccoThhRfrTQASD2
+xAfWRXazhq70zB976f8nXZMX+sWkT+Z1865omdV/dZTNd8PMVoUHwrKzH/HQfY5C
+Iok8Z08ZqZQYGiKv7n10
+=SXAa
 -----END PGP SIGNATURE-----
diff --git a/sec-policy/selinux-amanda/selinux-amanda-2.20140311-r5.ebuild b/sec-policy/selinux-amanda/selinux-amanda-2.20140311-r5.ebuild
new file mode 100644
index 000000000000..fbb49b789724
--- /dev/null
+++ b/sec-policy/selinux-amanda/selinux-amanda-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-amanda/selinux-amanda-2.20140311-r5.ebuild,v 1.1 2014/08/09 19:34:29 swift Exp $
+EAPI="5"
+
+IUSE=""
+MODS="amanda"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for amanda"
+
+KEYWORDS="~amd64 ~x86"
+DEPEND="${DEPEND}
+	sec-policy/selinux-inetd
+"
+RDEPEND="${DEPEND}"
diff --git a/sec-policy/selinux-amavis/ChangeLog b/sec-policy/selinux-amavis/ChangeLog
index ae218f542898..dfbf92a999e1 100644
--- a/sec-policy/selinux-amavis/ChangeLog
+++ b/sec-policy/selinux-amavis/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sec-policy/selinux-amavis
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-amavis/ChangeLog,v 1.45 2014/08/08 18:49:50 swift Exp $
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-amavis/ChangeLog,v 1.46 2014/08/09 19:34:40 swift Exp $
+
+*selinux-amavis-2.20140311-r5 (09 Aug 2014)
+
+  09 Aug 2014; Sven Vermeulen <swift@gentoo.org>
+  +selinux-amavis-2.20140311-r5.ebuild:
+  Bump towards r5 (fixes duplicate context for hiawatha)
 
   08 Aug 2014; Sven Vermeulen <swift@gentoo.org> selinux-amavis-9999.ebuild:
   Make 9999 ebuilds EAPI=5 and transform to make master for version bumps
diff --git a/sec-policy/selinux-amavis/Manifest b/sec-policy/selinux-amavis/Manifest
index 3be2800d7cdc..368b4ef19d1d 100644
--- a/sec-policy/selinux-amavis/Manifest
+++ b/sec-policy/selinux-amavis/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-amavis-2.20140311-r1.ebuild 387 SHA256 e27403aceff15336c52fc403bf9d5295788fdca4633d6d28814aae125076df0b SHA512 cf485b5b147c92e099aeeaebd319d60d004d9db4fd63ab6cac7c05b35839ff5d22e79ba1ccdcecff2b249c62a2f324e267356e89e1804815f1ebe2e5c050bb1a WHIRLPOOL a8c0c18cdc52ee1ac61bbfeb454da45f71f21c93b0f908012d34cfca8938f16447d5da9ee2c55747602b65c22599d41d82e51a35068f57daf8947729d794b482
 EBUILD selinux-amavis-2.20140311-r2.ebuild 387 SHA256 d7881cb994299c71b79b8220caeeec27ff7db33b8ffe9edd1724d7a69732cfa9 SHA512 55189e2d22650e4d0aaba69462bcbc21e4aa6407a7d8bce4d995615c37cf9a9301634d613722c0fe477e37fd79be76ccd92be090aff0e883c66fa075ff543f82 WHIRLPOOL 2eaa764508d54088b654118f39f5d716c9e75607b9b5adb2c664110a046becd123ea6eb2995227e1577b08272aaff98ee4e0fc9841266520d4987680e709fff0
 EBUILD selinux-amavis-2.20140311-r3.ebuild 387 SHA256 294f9d9df925f55e9e83dd84177cc118a678d83a76cc7160c2c4c80ee0adbf79 SHA512 a1272cc6186822b7f17cdc7e9efd1ab5d23a4ecd2a1641d61a694607574bde5ffdd66a2e7533573fcd67ca09542be73b9130458ad59a4a700a8d0adb6717f91f WHIRLPOOL f5b213952086f352343c7c74183fa648f12bf9b4dd7db08a0a67e693d3c40e59b23701d580eaa469c9e05d8166ca2d7075274d6da4bebfd34bae8d002b34f883
 EBUILD selinux-amavis-2.20140311-r4.ebuild 389 SHA256 b9fe273c8c174871747ab6d24a6322eaa1d1975766b35f8d2c172a21e76c92fa SHA512 75bce549bfc7eabf0c39908e54e6b6d3f00d122097a4989b27ebdae13f710ea952541711084c8736215a8b4e43b5db9d41cb6b21e9d0d974a7cbf9bc31949e00 WHIRLPOOL 2f24869a24e4853edb9094fb2da75428014d1f17a58b0d3d46434f221ec021fd058903ac0d2600496c7a7716ac304aafb41c71097eca9aa89526b0e326df8406
+EBUILD selinux-amavis-2.20140311-r5.ebuild 365 SHA256 c784a71b59212c9fe874456e3e789a2f4b334f973d155537ecd006dc7b8730aa SHA512 7adf5f311f432bd1c23e66d3de75d0bcb9a757350d54e69bf85e7cd5d84aeb65913ac236356cebfd6f587665e90f3101f680a4e156463cd10e40d6ea7cbab68c WHIRLPOOL 809fe05f504e867c6304754cb65185c32b484a00d49833420e87c52ec15f554d274703ba011b34dec4beec34c8a60a9bb6ac2d3f15acc01aa9f4b5877563c14f
 EBUILD selinux-amavis-9999.ebuild 345 SHA256 9a7550337913f88f7dbe57f22d082ba76f8e807b38795468867de256337f1a26 SHA512 50d8d6975d88610fcc4da3381edf7fbd32ca09b8343385cbfe38cf3af3aef931eaca7785d0e80f396e1e8388045d110ad4063aab2e2c99eb9ffceba03fcfd80d WHIRLPOOL 6efff8c1fcf4491c21a62570c811c8e77d775098cd7ded45d76120381e4a875bf2e1cb7b43d04bb37ab9cdc418e750758e423501af6fe6a45f2b86521978d5c4
-MISC ChangeLog 7323 SHA256 6c6d094f8acce0090e410f427a57aa7eb638e1961ae2eeecf7b289832e75dd26 SHA512 2ac73a0f90f5e0eca6cc9270baf75b1bad367574d942823a7d3843707e51aa0ab4b3d14dc6d85edf555bc3fdef78bd2fed51a3dd96b7cb69db537f2781fd431a WHIRLPOOL 1625e8ead6a4ff4a307bbea4442f6ab958df0f10927231614b6251aa3dd620678d9599859e96ba3cf7923a0daf59817520a84c309b6575c37fd8e516dc2f39f4
+MISC ChangeLog 7515 SHA256 e0d9ba400a93c1f77ae5b89182724a88141d6c812517056c598be26a3ad82a7c SHA512 c834fe0cf177f786958fdef8a1ce353c48131ae854d559f640267bfb3df0c3c1ac271687a3deec8d99fea5a1ffd3e2283b7d8cb770e67a0e62ce2b5bbc0af544 WHIRLPOOL f3f7a579ff16beb779cc3bc96305f0d81eaea4d42e6b92a9d0e7f6d11a5e39e3dd90708e64e17065a6bbc4fc4a7522e9bc2ed21d8894c776a030014dd22c7450
 MISC metadata.xml 230 SHA256 4c1a15dca371d48ec48019edecd6644c75ed5fe35667f679be5d303b9dc46143 SHA512 f633b0a45f1edcfee891d8e8e2d887b34f474be2c4cd8e51fffc356548d6d4f604b1600c064ac1fbfc630cab41a4019395aba7818f63fd44bdfe9c5743de3cc2 WHIRLPOOL a12f9e6f6f19a689af367ef10a422b5a769e9fe8953f34979ef74da6fcd327fcb93acd845526d842e63cfc297fccf724939931495735304ef8cfe9f3bde24f34
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0
 
-iQIcBAEBCAAGBQJT5RxXAAoJEC7dUkA7aK9Ha1oP/0ryWSws0S1iEHiQTA5XK73+
-URTkp/UjXagDSnFWR8FNN1uznsuPSdPteMHyJ89+Vu5aAKRtki6NnK6lSlCV09qG
-tOdr6cnsGbqyGm8mXSy0xbiuCPASO2xqcfcodpDuJACmFGq7/Zd71rJfipI3bgml
-0HeJ8W8RQNV0ClUeP1YF+CeEyNRWh2v90oF9RQBGE0hDYmeh53g6F6T8VnZovsIK
-UAhpeqlEXYqV/t3CBGGE/U3ActLSun2J1CDNav6Ct/0d+IzwyXxFQs32kjQX0OrK
-geHSWGH66dg1dOrpedqBGTLTjBXtbnb30RP9gpWc5y3AqzWNEyjJGcuJLMbaBSSM
-xsTN/4nlGOx1p/0VZnd44o00BsVhcnc3h7f0Uu3nf7GnUoRncx1MM7XBT+JacamZ
-550NTE592VXMlZR4oWUY6Gx9JKZPMTlxfjg7z3fJvf2OyNlSrQtZA6sK/XLSJG9Q
-4LwYkrlRwaQN/0hMNOZ7QErUw6S+htGdRYsro7u1C7FKdvWmSW3b9krPhSYVJQq7
-YLzqLZChIuXW3U04VBVJwHutVlTBUkqb/oz/WQ2hNQKlEZeAmSGndILS+kI3x6Eg
-R6rNJrYUxLMvmo60wSUbrE+cEf3FiaVwhyE3HeT6CX4Bw6xyyC9XV1YReSxtRw9S
-Nby0PdQBHn3/bDM/u2bf
-=5jrN
+iQIcBAEBCAAGBQJT5ngpAAoJEC7dUkA7aK9HsxMP/1N9i0Jy5a2WQNGCKYV6GJ5v
+p6YkjhLtZ7elXLj9Cn4eTR36TMWklFyjoMDtqU+/hHZZDrcBLl3TOqqonQHOSZCj
+HXmLFxl4A1RpXMVBxlatbjlqPg81BaG2QecO7Pa48fvU2YWLzpLIv4M4jmTjfsKr
+ZdKOWIk9504aDzZp/H4Pk3OHzlH4C5NanKi0aCi34mDJO0ycjlvquxM+wmTzr6oJ
+WyzWUYd8+yBdz8VnUaOFTTTOu+3KSTW48tfdD8w6vdjuc9axdGVWEbcxOOlGYH4d
+cxSBUUIFzpVDQcsnSKYy1OUdO9UDlv7Y93Cpww4itsyrQxm9eazhPuwVR5eUMh0w
+HzoXgho69XEs9ORBTaI/7Rusfz4kYaI9CWvB4tKW0lYRojXnlj8bSulvHTPMTbH9
+OejqCSmXwyVsb8BI9JSn2nXNUThec+gSjJcI/i6q8KokIK3y/G64aHpZpFg7C+Tk
+Xqn16DUR++rF2M4hNdOj+F/N36phFHXm2Lc/GEG3JrhmTgaUJEJIE8rRQy3U209q
+BNhMzgKDuckalUqNbYJph+bmAFrr2YvdQA4QuchgzdVa+zPDC/srSJPsGZQ6Z0hx
+BD2pGk6KLR4q/ZPLMMLEju8Pwg9z3TCTmDVuoFn2WI5j/oW1uJW4gvuyn4n6jzSA
+kpF9hXEN+row9D7yzp4Z
+=Gwe2
 -----END PGP SIGNATURE-----
diff --git a/sec-policy/selinux-amavis/selinux-amavis-2.20140311-r5.ebuild b/sec-policy/selinux-amavis/selinux-amavis-2.20140311-r5.ebuild
new file mode 100644
index 000000000000..ebb1dd054378
--- /dev/null
+++ b/sec-policy/selinux-amavis/selinux-amavis-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-amavis/selinux-amavis-2.20140311-r5.ebuild,v 1.1 2014/08/09 19:34:40 swift Exp $
+EAPI="5"
+
+IUSE=""
+MODS="amavis"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for amavis"
+
+KEYWORDS="~amd64 ~x86"
diff --git a/sec-policy/selinux-apache/ChangeLog b/sec-policy/selinux-apache/ChangeLog
index 8bc2acaad99e..9fbb608264e2 100644
--- a/sec-policy/selinux-apache/ChangeLog
+++ b/sec-policy/selinux-apache/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sec-policy/selinux-apache
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-apache/ChangeLog,v 1.71 2014/08/08 18:49:28 swift Exp $
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-apache/ChangeLog,v 1.72 2014/08/09 19:34:30 swift Exp $
+
+*selinux-apache-2.20140311-r5 (09 Aug 2014)
+
+  09 Aug 2014; Sven Vermeulen <swift@gentoo.org>
+  +selinux-apache-2.20140311-r5.ebuild:
+  Bump towards r5 (fixes duplicate context for hiawatha)
 
   08 Aug 2014; Sven Vermeulen <swift@gentoo.org> selinux-apache-9999.ebuild:
   Make 9999 ebuilds EAPI=5 and transform to make master for version bumps
diff --git a/sec-policy/selinux-apache/Manifest b/sec-policy/selinux-apache/Manifest
index 001827ecbf06..37453dddaaeb 100644
--- a/sec-policy/selinux-apache/Manifest
+++ b/sec-policy/selinux-apache/Manifest
@@ -6,28 +6,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-apache-2.20140311-r1.ebuild 456 SHA256 5e4354a099f0fb6dba6526c835cce3711a46e23bb5817f80856733363223182a SHA512 7b3c15ffd43e98c5f87bac71b5ee17c480083085d38da1699a6042cc4af76ff75e399106915f7497a671f44475fa4c2be423452e8677cbae56ac55d641852da2 WHIRLPOOL 2e8eab4f8426edcc509bfc2e649209a19d8ea92e8105d61800a9ccf8a0e73bb5997a073d1c7a79b81078c68677e57a398da4627ab32747aaac9e7b20fc1ddf0a
 EBUILD selinux-apache-2.20140311-r2.ebuild 456 SHA256 4f672829ba6aea7995a383e28e1b2d0a41b391653eeafd93b48087a663d552cb SHA512 e1da55d68673fba981d53a069f6552d2800226eac390c9ea644312dfd3fc322857fce6c7258911c1ef8190ebdaefb964be8362a36df7511e12343fd65126c58e WHIRLPOOL f269276d68020f50f3336618a5ae228932d38ccd137b9f97f9db0c665afc0c6de78b33eafe466a55513a11a0479d80ad5b8c524c9f5163d018b22fd8288b3fc4
 EBUILD selinux-apache-2.20140311-r3.ebuild 456 SHA256 24903051012c8917e6014cfc97b04a2619af425ab713b3cb43b41825cf1dec99 SHA512 e15fc0b7b61efe17ffea9038c76f5d712670a5000c494f69cbc68ceb99bce75247377be8d8f49267e2bd526f25f1dc519b777c2bc8fff5b1eadebebfd9270216 WHIRLPOOL 5758ab8efe0f555c4018e62dd6f96b9547dba904fa95c9e8057c78e5e206641c6042148fef3555dd46a5f8e818018886b6d7209e0dba0fab2ad70013aa147963
 EBUILD selinux-apache-2.20140311-r4.ebuild 458 SHA256 97c3981ea4c7ec5bc4c6c306f5143eeddd235af3fce7b9233609ec9181ac242d SHA512 8e499e2a2dc38b0a9131c20c88e2f8b4695faf07f7048603572ed88f64d50c780b40a36ca91f66f2589a6ffa63a7588330e8e527cec11004258ade8ec29203bc WHIRLPOOL d6198ef2af785b240632627b13d1e3b2ced295161eec0d028fc9e1da63c6aef23b46ddc38b332f4afc459a6e07fbfc1f9d49620bdcb7bf226eaa455e4778b74a
+EBUILD selinux-apache-2.20140311-r5.ebuild 434 SHA256 0749739c91c9c3ee6838aebc2f81e740dd430c74969fb3aeeb4d3037a561d031 SHA512 06868ed054e28f1d11941727634ebd3c6d8271fbeaf4552cfa3dc8ab62ae702ec3f55cdb0ccd0915a6f102f2698478e3ace75b14af6756a45ac8e1862e644153 WHIRLPOOL 5506bd9ea0339e0b8be22779a510edebe50021956b26faedfd0d4c19652b3dfcf32c3b2c4eaea24abdb820e5474487d2c4627b94d44cef9b62cba8d576ca41fe
 EBUILD selinux-apache-9999.ebuild 414 SHA256 7e863d9c277b787d70e9b55d4d0f97118a6958b1e5c43bea8f897968947eaebc SHA512 2da8ff0f0df774fdc67c6fd9e3f3796174a6ffe59b46d38dea3c3b899091d1ea2e42da9921957376391db3f9683c03557c96c1c5a6cb540ab885427467a5b004 WHIRLPOOL 4839172012659e4b12faa3dfc7cdaad78481af1739dee79d891086cc26b912fe17f942125c0cb7f0bbdd2fdba6bdab0a68d340df39ce740b445a0d9bd18eff2b
-MISC ChangeLog 10947 SHA256 91a20e187787adf0f6cb1c48b30e16620eaefe395f00591d275d366fc2246763 SHA512 f3a13b9dae77d6536a7819701190f483a3f8f6bf8fa7a5e28cb5584dad20d7261bed3e14403ea210ffb26c4b610141c1de797bfa0142a6091861d31feb69a198 WHIRLPOOL bd936bc7318de245152f20b1b24cb8b69ee9c415251f32a5b6c2065b8eef3003e5aabdcf2c4669246915e663f81d9dadebf16a4af34af271d77a76c25de2a7be
+MISC ChangeLog 11139 SHA256 07f94366e9931e08317fca609ed33dc67b174edcbbcdd3fa8f87dedb505e2d65 SHA512 219d2d329ce6b1b71f184736b36f0910344e24354b5d4b135a8b7acddcfbf26d23e2189ecea4a8b2f1d4107e525935c4dffc3b3497848403888aea37514b7495 WHIRLPOOL d590f92f9d3626a0d47826d51183a5a6bae8391436a5a1af5cfc70cfc1f31b0d8f051e168404222594bc992806b604092157aa4a3b65a407b954a80033fe93da
 MISC metadata.xml 230 SHA256 39c5a0f1a72cffb8f3e242acf702f2d8d1714382952233044a555b96f5f5b6b2 SHA512 a575afb0b0e4fc0a4988422aff63b469905e1ee74686625270646178db79ebc33ea80542f0bc1daa2e7ff20b77107b03fab792e753b07ed837389f2f5d4e4a0e WHIRLPOOL f1716d5e98172ee05b9bb711933d93a1a624513930be340c20d520b1f507620330e9c1031f04c30f13886d4223be4c2a02b06cc65822794884a11103d66715e7
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0
 
-iQIcBAEBCAAGBQJT5RxYAAoJEC7dUkA7aK9HPF0QAKSLndiGQSsOh4veLHwRzs9G
-Hq9ExjgqHtt3QXMyWM6lMsKGYwnBEb5nEnTnWBG+2LkLU3+fpBbKlZ0eLF1yAoMP
-6rQwDVhRZYr0/4hEMbsw9R18fYVbrm+n5CkWdEnXK/BDCApHFk/b2BN/ITektQry
-yAPtcj65KvFZsGjSFRzaw8tHOj391ninpvkZNiKux2JECCz4uhXg6bZ5S90hFjyt
-FBEQdHZP0WtkX+dgdbEE8yEc83OnY++xAi4Ydhfxdh8f0FIKi8oUjnXuCTx8QHeu
-OwgHNEUCkrAoNqzYWC9wc7Bpf5cPW89PEmbemcWB+KUKQrnsiq+0pL+i1SwfGA6P
-LF0R0/Jr7V1HaddGyJ4IuCKN7RrpGVbQrNBmT9+d/naQt/XiYSRd8e7GkJV8Adnc
-wVQbWOAPt5aKiGROht/W+7uK5AXXxPpwMyhmuNoguNU97Rb1xm2GF0G24LvpBINw
-a4f8addhqXUdMmG7ceo8N7OIZd1/rEBCGXzVJG0QjN2yB7JUW8HRP39lcRt5E3Px
-7xc2WMMDvOwH8R2pVTEE81IWgL1GZ89+epfVpRi1uB+StTaMA+hGaTmu4ERnFv5X
-BQlXIMjqfZJA0p114L38Ad1fJl+gVqvSvbeOLA6Nu2Z8yRUg44zSRfayPS6K2rDX
-mDpMw66i5mrWWXe6apRw
-=AJTE
+iQIcBAEBCAAGBQJT5ngpAAoJEC7dUkA7aK9H21EQAKa+2io1DM7IAyo4OSIyR08o
+5hiBk9OgCaI9mT9rsLy32Hsc40/0W5dUvDnC3JA7uLAj6CnmillVuZBMEWc/xUIl
+UmvvCQuxWjPevCPy2ZNXWlxOsWldwQNTdpgGcDU2jeu+ZeLbHQ6Ts1BpYBk0vctB
+59a0Sc192r4BepOlJVt+uh49SCwpbTf5xgkynvOJwctFz0Fej2V9Ant/6XTABglf
+Gd1a8XrBXi8k/FBIJxxrWfnH1PyXr3ep9SEHJ4AcE3fJdFmbYPwk/+C+Vbq/svVT
+9O9slhq3q5DOsOPZA4l6PAlxeGcqEvH7KVWkc0n5SbxzY4LaT+Di5K69UsjpYRuG
+f5qtdsHpq8qt5fKoxvYedbYu0oMuAHdAhTHt9Xt5ZNa7Cf8D8IqJRaVzNCgyMzj/
+HMK9AI/RbZSbooXn8muVIqOcjj3z6tABtgU+tbS9OWzAohLEjxrpaGrI2gcdLrtX
+vnwgCEWL0e7vubaYUSSS981Y7D7fWiAqnZXoOh2umdbCOXKvS9FiOK7YHa6/iJZ8
+xuovqlbKsnuAHsILd6nScIb6L/khtHXiYNHaf85xmXcm2QH4yUmBJmGN5Cdfuwkx
+5cS0SmmXQiLoo4tEWwFzzgsb5a1fCnaWIotMJBLrY6/Wnx2ubZn1T9tgneme0mNi
+Cd0tqVX4NFNc2OpJsIlb
+=ql1q
 -----END PGP SIGNATURE-----
diff --git a/sec-policy/selinux-apache/selinux-apache-2.20140311-r5.ebuild b/sec-policy/selinux-apache/selinux-apache-2.20140311-r5.ebuild
new file mode 100644
index 000000000000..3448298a9b27
--- /dev/null
+++ b/sec-policy/selinux-apache/selinux-apache-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-apache/selinux-apache-2.20140311-r5.ebuild,v 1.1 2014/08/09 19:34:30 swift Exp $
+EAPI="5"
+
+IUSE=""
+MODS="apache"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for apache"
+
+KEYWORDS="~amd64 ~x86"
+DEPEND="${DEPEND}
+	sec-policy/selinux-kerberos
+"
+RDEPEND="${DEPEND}"
diff --git a/sec-policy/selinux-apcupsd/ChangeLog b/sec-policy/selinux-apcupsd/ChangeLog
index 16ca1f4af73b..de9e89d79b65 100644
--- a/sec-policy/selinux-apcupsd/ChangeLog
+++ b/sec-policy/selinux-apcupsd/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sec-policy/selinux-apcupsd
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-apcupsd/ChangeLog,v 1.43 2014/08/08 18:49:47 swift Exp $
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-apcupsd/ChangeLog,v 1.44 2014/08/09 19:34:22 swift Exp $
+
+*selinux-apcupsd-2.20140311-r5 (09 Aug 2014)
+
+  09 Aug 2014; Sven Vermeulen <swift@gentoo.org>
+  +selinux-apcupsd-2.20140311-r5.ebuild:
+  Bump towards r5 (fixes duplicate context for hiawatha)
 
   08 Aug 2014; Sven Vermeulen <swift@gentoo.org> selinux-apcupsd-9999.ebuild:
   Make 9999 ebuilds EAPI=5 and transform to make master for version bumps
diff --git a/sec-policy/selinux-apcupsd/Manifest b/sec-policy/selinux-apcupsd/Manifest
index 5fc68cbde4f1..1921a6ae754b 100644
--- a/sec-policy/selinux-apcupsd/Manifest
+++ b/sec-policy/selinux-apcupsd/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-apcupsd-2.20140311-r1.ebuild 458 SHA256 fed0eaf8dca9363376f413068a362150485678cae10c6d1ee1b07be6cfd5e691 SHA512 1d9c6f9eaeb12e31c7e408ea63809eb9c575e749cb2f8eec3c40550dddd7d534c63b8a4e03921eaf9216b2939e28600b7046147a4d9a724a8c07131b9cb951a2 WHIRLPOOL 64084205153412dae2ad993e5235f26bad5c3702b91af92a58d5598510ba3f3d1c8d00d66eae8f5d8b09ae2af9954c148e6e2307f2c0706a254402ba4f4da722
 EBUILD selinux-apcupsd-2.20140311-r2.ebuild 458 SHA256 32c394810894010937f45fcd9916ca51b78b0898efce834d0b5da10648391fb3 SHA512 99f172010e039609dd293fb9ed9089202f94f56dd7ed24fb2d917cc3e1001c169641c5ebf22df4f2ded0448b8f7a3984cc2efcc318605a0a4ec5f49b7157b17f WHIRLPOOL 739b4b6e384551a367a30372154a85f25104ef61c3032019ecd5f456b015ae20ce9f099ee7ecbfb2063f257ddd1d8b72b394de02c4c3b3456d43d40d72a3beb4
 EBUILD selinux-apcupsd-2.20140311-r3.ebuild 458 SHA256 74c071054f79a671021501effc77ead476efce8c5da021effaa933a7e5eb3a3e SHA512 dff9ca0fc933e476b418ce9c73f651944c8b6f9de0d37a7a09b3471b4998f2afa65e2fd7f77350b62bd40c8660728add290c3866d6a1780bfdf9ce52837bffe6 WHIRLPOOL e94356abae29e4b5a57c17de67e223f1f89a52bbc218c5f9516648b972b422c17dbcfe41ba80e74ebb1e292c2c91f015312e6c4931b71951fa1aec3cbb5d072b
 EBUILD selinux-apcupsd-2.20140311-r4.ebuild 460 SHA256 68082677bfe2340ffe44c78ccd19b23ab80d52de2d5f9d984a374fa1a915a45a SHA512 8042be2193eccdfa26389510d8848f23f1320b2218e66992d8c559967fb441f0da9c9bf09265b161b8e8b87ba79ec6abbfc893ca9543ddfe0c4f5ebbbb7c2fd5 WHIRLPOOL 2e5f0c4b920ad1ac26629aea50520a3c4dd4e049235ce1b90d11a7bfae83fd0467f7a1964ab9eb02d2b7ad46c011b3eeea8bee8e9b8a450622a2bea54563318f
+EBUILD selinux-apcupsd-2.20140311-r5.ebuild 436 SHA256 d2f2835488cf642f1b4f6e448414cdb2c376c3cf4ac566471e98c354617f82b7 SHA512 c72b4dd55c401c48f3e37ab708e0a4926e687cbf1560970b80af7dd6f283a00a38d8a88573c19db369063b20a97fc2bcb64e8c48c5bdb0d874a6b8fb53826fa3 WHIRLPOOL e583da75ef26eca1441897a8cf968ca0a9d56f16b1d9a9e0c7965c63f075a7c3a288ad547dc3304445fe464564b9424586f7652f66a6779f84058f15f0203dc8
 EBUILD selinux-apcupsd-9999.ebuild 416 SHA256 69ba1da27c62e407605d486cf83eb469a6135d04dcb0bc7b44660670abc7b3d7 SHA512 50d11ddf218356b22d20b0a843f7fe673c4ca37c3f2b1796966f98460a66bfdf804e1ecef9a8f95473ebdabc1a0daf77548453b080c493b7c534fcffffe01767 WHIRLPOOL 53df43194acbc4664f497c188e066b3249a4272c80267a515d200c2c5bb678cc7b6fc3a6f9f53779c3b5a967317bc2ccdb7c9eb5030689fce54d0476f195a9e5
-MISC ChangeLog 6704 SHA256 554b2525378389afb238954ae7b8d1b8ed4ad061b56dbe2e25e38a0fd10431f9 SHA512 5cd3b5a71c5573dda90e79c5bc960b571eaba2d8bd288c50ebeb2846cfe3fefac3aab3bc4a1c5d5fa7ceab4975e01e72171a451623a99d07a38275cd5d088e99 WHIRLPOOL 601505b64ca42a7aa3f7705d0c9360e23051057b2351598dc77d91776f1444a035bb8321607bd5d6868b1c12ab03d4e030a8d9c9f0b58ae90665e6c98200b23b
+MISC ChangeLog 6898 SHA256 72e40c05a831c282b6ba09c91dd64990960a5c888fe032e6d941fa49cf19cc3b SHA512 19bf4f9ad1c5e16aa939d4d30530087ae6e0212ae15398b403cf0be50bc35e331c5798eb9710c6121acc7f798087de70278e23e1619070bf8f985e219196cf89 WHIRLPOOL 855fd3401a044a2a98f2f9051223222ed575c3d7044c3c759e0c80c9baec82a8ab42bd1f8b6c14fb177ae92d01505b4b2c9b0c2b086708714923640eb9f11311
 MISC metadata.xml 231 SHA256 7c5ec747cd4fe9b02720042248995f5782a2e4df798bf3e99515e9046592faf7 SHA512 be6d154739ae3b8f0fe179b75f789a0bec6f94a9011159b092bcc92734fe0505256e9622fc343f67dfd0831df2062704b2af17d5706d2c892910cced9600d551 WHIRLPOOL efb89bc3681143304d14b2cab9b128d9845de3c43a9a706ebdde8c8bb3620c6a9b0698bd9084a31d5f716600f14e2ce651f5188c1fb5a92de768fc0027c0e8e5
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0
 
-iQIcBAEBCAAGBQJT5RxYAAoJEC7dUkA7aK9HPWIP/04+FRZ64e5t/Ihm/5VGh0Di
-RcdZeDBiZOV94sowEgFnqWBuXV3zcCiG5XW4CphGmDKGNlhisExbAvAUDSrP2QJj
-eCKdIXOAlfEJaaaFaqGPTYXXqvxgvp1dMn5ipXQCyZU/4ZCPtN8sQNSyq5H7w9tA
-5oZibC7bZ9Xuz2mTM5JJc4uV77x+sQQpxyHIQIuq+KByywbKn+eDDzNiUVt5ugIN
-UVEwNtaweHUq1JTwnHY2WXguhVcsy8xy6z3uNGc95uJLL0EukkZ9F/1b+TxA2HBv
-Ld8wfKGButa773M4NCIuoH3UplUSydqbbD2CN5az+25f9zlYGqUbpyht1+N8Xc/x
-+vHb0nT92NknV7F89+eDTiPErSmQz0M2JbqjeVd/GVPl9n/lvuA0Qz+v7jZ4MzXa
-ULwWiy6MtO32csG9jbFlZ3W3kJTd7JhjBFJcTK4cL8d2EoCLNP47d3dq/Pl2ZqdC
-uC+IPuagjtukVbMxFnSX/kGeMSX50m51Z6mN+qm29CzBQMAu7tHTVeTDjQbobsJQ
-MDTKs/+VxHYI/4X1h3sjalzABwwG4hlQqOR5PGjEDYpaNOH/v3SOaLFG3WvEXfwx
-0AYIbRHLltiN6hh7mgFQdlUFydTrilXxRcN33qmSl1gB4QjF7tSoeTbJxc1xXcVM
-vP6pPASXGC7ZKUan6Fh2
-=ijCC
+iQIcBAEBCAAGBQJT5ngqAAoJEC7dUkA7aK9HDPIQAI9PXEL4CPDDogJq8rGxgy2/
+0bF0LXukmhtl1Up7jpiJw57pi0gYi1ngxc0J0OjD3BYzPj7O5IYxNgx/Ck1Wo8/9
+8cgo/z6sM/zdWRkOSdG6ZXavjUPfn9bV16fSUmJ2aExfw6lmx6DI4+6QkNoL0D8q
+9ifC27AXrQglxB95Ny40ZqWstnHKI1m02U0X4PDQ1huxqk8bfrOvmdXICyzV7Oum
+WgJE1uk5flPbZEKkoXWpNdqZFlSF26lbIR12BQemU6NWLqkDDWosji7WjFOkIL9I
+EocjklzMFdjGNgxeH0FqMlGHF6LnjWuFnztYti0BTt4SbVC+TKXo9ITigum1fEJC
+LPoSNYDBEDtH++N13B985z+qZvXU9iufxMiR3bjuGdvSRI8D6gVvc2XuHB1JLQWa
+BSPuCKNgEjLIvVU05U+7G5j5KF7RWvhjGBm1vyJZ3k/YO8g4aSsTd+Qim2Kj9H6t
+uqpHdQNMZBKqeQFNjUK+ImOS6tx0TrO1ReqRkyKXkoKFHcXsDyWnAsjQoXI9S+Tw
+Tz6oXh/8EIuQdybTw+Pps7ua84krquWb0HmG43Ge+zcH2AsYpHQH0e34AYnRA4d3
+jIkQpopWkf5XM7f5dK6StQZ85i4D8XCDx6kJ1GwkKlneatVJ+GNJyQ6devlUyx6R
+IG7hHBbwYt5/5iOkQ7WN
+=c99B
 -----END PGP SIGNATURE-----
diff --git a/sec-policy/selinux-apcupsd/selinux-apcupsd-2.20140311-r5.ebuild b/sec-policy/selinux-apcupsd/selinux-apcupsd-2.20140311-r5.ebuild
new file mode 100644
index 000000000000..a5f1ddc6f98b
--- /dev/null
+++ b/sec-policy/selinux-apcupsd/selinux-apcupsd-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-apcupsd/selinux-apcupsd-2.20140311-r5.ebuild,v 1.1 2014/08/09 19:34:21 swift Exp $
+EAPI="5"
+
+IUSE=""
+MODS="apcupsd"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for apcupsd"
+
+KEYWORDS="~amd64 ~x86"
+DEPEND="${DEPEND}
+	sec-policy/selinux-apache
+"
+RDEPEND="${DEPEND}"
diff --git a/sec-policy/selinux-apm/ChangeLog b/sec-policy/selinux-apm/ChangeLog
index 165686e22f76..e38aca0cc789 100644
--- a/sec-policy/selinux-apm/ChangeLog
+++ b/sec-policy/selinux-apm/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sec-policy/selinux-apm
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-apm/ChangeLog,v 1.42 2014/08/08 18:49:57 swift Exp $
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-apm/ChangeLog,v 1.43 2014/08/09 19:34:25 swift Exp $
+
+*selinux-apm-2.20140311-r5 (09 Aug 2014)
+
+  09 Aug 2014; Sven Vermeulen <swift@gentoo.org>
+  +selinux-apm-2.20140311-r5.ebuild:
+  Bump towards r5 (fixes duplicate context for hiawatha)
 
   08 Aug 2014; Sven Vermeulen <swift@gentoo.org> selinux-apm-9999.ebuild:
   Make 9999 ebuilds EAPI=5 and transform to make master for version bumps
diff --git a/sec-policy/selinux-apm/Manifest b/sec-policy/selinux-apm/Manifest
index 616cdb743db0..e38ecb1ae519 100644
--- a/sec-policy/selinux-apm/Manifest
+++ b/sec-policy/selinux-apm/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-apm-2.20140311-r1.ebuild 375 SHA256 884dccb342f0a00fcee45cd4c0081ef0f992d789d384b42a7e1018adc8b27e32 SHA512 348699ca4185478db11314497757aa738cdfd87e02e6fbea1c7996fd09b88039b6b1b008b50f35e738efba22568427fc25764a805e962741bd37580981b02b41 WHIRLPOOL 00c535cf89f96ee76f38bf7a32af3ebd41f7c985ef291d4c066832953f05476e686f8ea58666757426d3a681f03b665d0ccd12f96b2846473f03c86ba093f82e
 EBUILD selinux-apm-2.20140311-r2.ebuild 375 SHA256 4bf56e1b2146f802d1b69d0bc84ceccbb2c7ecbcf9570ea4042ade9ec1b84c47 SHA512 e7e128122486e1393191c91bb853a904add818e8ed290718aa2d91ebd75a9b4c893b0c983d7939703ffbc0d7d9d2a1c5a8932907d1ad2ff8f48d06eae6d7a59a WHIRLPOOL 3134d8fb76af4aa52a773929d3c26c0ab5369de788c0311a31ed4bc46f79ebe7fd77e2fc7a60411577f28b44a426047623c17093148e083714609e606c7bd8f9
 EBUILD selinux-apm-2.20140311-r3.ebuild 375 SHA256 3e684f524baf9cd5c7c0b82c6abd21fd1a15da691e270448cee4e0fb447510ee SHA512 b7fa35dc74beb67f0374d306766b506e21bb9be86bd552d0b711ad5c13308f417daa0a59420f46a7d228f6580ef7e073fac712632b4130d1a1cafc2c07ac8684 WHIRLPOOL 530e011be302261bd7e7ea027b8caee148d5ee198fee5065ff6e23bf5be413432e169ea937c6bda9909e2727bd46456fef9bdeb33e94ab6188d18dfebe49c64b
 EBUILD selinux-apm-2.20140311-r4.ebuild 377 SHA256 a55a280fd9a567ccb6f89b47a7ae5db6173115c1326ee8144486d50c40adae07 SHA512 710be85bb69a8679f14fb1a6da340c9805dc9e6933cf90e9acee96d6ac96f76b82a9120010f3d143db28f23a01057f767a065719926864af513edd6dc3ee9b52 WHIRLPOOL 41f565d475e0ecfd4dffaab649d5011a27cfa2857317385169b684328b7d98b2c88319c02b6a757e84cda6a83cc7a98f380cba7837448a30bd4c86d4850421bd
+EBUILD selinux-apm-2.20140311-r5.ebuild 353 SHA256 158ddbe6cffb080a0db95e486ef370be188da820319dd04765e5169f230fad89 SHA512 e686859799b7955afbd792bc5338b651f812604b2eb2c05921bec2b6351f0d2a585a571b39f0f93a34bfc73f8081a4c87e42fc80f4d7d6247b0501cc69e1037e WHIRLPOOL 0bfe1bf8449e6440bd68485bc7627c14fea274500b8559f1bc6cf466a9553ab7c89a274d19d8de39f22268abe0e5a99f6917ed8e04d1156450345e5e4ebeb494
 EBUILD selinux-apm-9999.ebuild 333 SHA256 0e8cd7c47896e53f26390f6abd457a72e0b6f8decc33fdc8ce845e2159a05ccb SHA512 6682a1c6052e1ac53f241768ecc81f0c6666476f07c32068d8b7c5492d23d9c5ac7ffefe1679018f2132eb9cd3cbb009d569c2aca94622216adacf62dc2dcf26 WHIRLPOOL 4b286924259e40b70958935fcceeb3e97c41fa52063764ac92759598e40c7fac7d11358b7f92f879eb1454062ffc6b2efc240b332567000a5a1a5ee2d90658cc
-MISC ChangeLog 6428 SHA256 34a381d9967c09a23ddc449c7eb73ab3be9fd64b92846aa2fa420d0cff6a8121 SHA512 501d03b308a96f338c30210c63c6c07505bbd883c5c14f5fd22c16c81c9bfc5503f07a37032d753ee6c62279775b586b8a2cc1f5e8e9d047338ffc835a30a458 WHIRLPOOL 4f8afa6e530ce6703a0ec538f7a5a33a88d812fcbea7ca8f2aa9f508d841b16d0737f2bd65cfabeee0546ddea7c774f540ae1181ecd45eea582bc713d59627bc
+MISC ChangeLog 6614 SHA256 2b1c66116a8264f4b0f0589ee22263ed0159996270ff65a0d6694fad7c3badfc SHA512 1fafb8c311c96acec51d463772a0384f105e11ff735d0375b7baec4d53eaa00f3d852ff8f750da20072d050c3f4fe42773f82c95271f9903206b744148137823 WHIRLPOOL b9e0928c3212353613c126376b3380e2629fc47d8e9bdbf6e6ae063bad1b63ad670b4eb5cd22b533c4be85f4befd09845c39828a731915fee148ce30b012a134
 MISC metadata.xml 227 SHA256 c4dbecc1821489f62a7580d39aeb48363c52c461f36379195e0c58d63a3193ec SHA512 96a4321820c7617302229ed3d2a5b87bfe5df36eae1905e0bc632b9c1692f515002815e2134cae5b58adc396c713ae41b133d31eb118409d46575103a68f64d8 WHIRLPOOL 3718019d5534a91b01a793e3a7c2f6b4434f9525f804e5558b9763e7b65e87690b094424f5ff0de0e6e5b7f80f6c6f88ce64ada640a58ca2e7c3208584c7509d
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0
 
-iQIcBAEBCAAGBQJT5RxYAAoJEC7dUkA7aK9HJzIP/iGPuVo1n1831vCJ98bxIExC
-vcHSROWVmHRHWNfKTkyqZLin/bFQjOn5OrU6bdOzJ4iQ0+ys1BZZvxCFIFWPbVIm
-wh6tleL6owwH/KpExESiWmiUH3ZsSY8nzytvmSh0ybJ7N1SXWI2muBHp2wc3eFn2
-Hp6bd0alWuQHab4BAzCgJHiAjuZk2GpYig95DwjA+DmYLI3mSSoIxDQQF2W2biLg
-nIlafA3hMX09S8e+scBrmsXclfXI+ztZ5FqVqbPlLXVKF8+jVJijk/8Aq38Tn8QR
-yjptwDnmIz5OxfNmJxPO+OdRYcSa+z/sTDv4EftRtNfC2wgWXG/r8esbzs9BIVDW
-vgBxNWgHxctHE58w0pE0bTdHjYWWzXPFcMcZIrs1mWlhwri+axUNK5VovAgLZRPX
-Wik2Akx0X9FrI+9d+mnVqUcXOGOvXv47H0tHcbEVu3+UXRxem6PIgBiY7QurV/PE
-avFed8y6PsGHkUKhmj+qI1o+jCF1SfbFyuzWYnzFjEu7AqCbQAZC5QRv0qSTdXUl
-vcEHpdqdq8Onn9+7VgR1Cjc+I+iV8EXSiABo9OFabjFPXII8T2gd3DIZgFIa5mdm
-sPe4lt3CMUnfm6KE78AzXoQzkBRV3jqeWwvEORV1YeE9AgePmV3Ht2rhdBlMg9P2
-sSnpIiDskxam3G3qsrHa
-=CXvk
+iQIcBAEBCAAGBQJT5ngqAAoJEC7dUkA7aK9HqkMP/3NSICh/Y489MMcHjVwYPmyd
+VxOObyrPrbRbSoUlQG+WRjWnlh5PdcRAmXjXsJDKLKj/QmDIMwOEXae5nnkg4nzT
+ZsmLE0YjM85eVbB4gJAZfhLLd3VaqEffKKBNBavLGeaBEe8rUq6kjXFP2ylxeyBD
+14R9+40JAXXVkHlqSJRb2FrthZM+RtLNPfMzic2suZpm3QOgTKtu6qhzzGZAzZYQ
+FoCyW87j3bJeHpGkC1Ci9QGitAcP8wH0oKgrRhgFdse+Jk9urmxNiHWqbA4Ta7ml
++Rs0YqRzpKVV28a7vQHkf8vRc/GlTD1flSPmnZHYGi+zm2Nx15pefAXnLk5sjTYO
+v0juBwj4TtX9q6NHXtGbwn/DaDe0jtN8y719zQscgQCInUeZmgCHg0GtTSXnJspj
+YnzDfjroXE0i0His5rqWMcxOTzuK2btdURWAsU3E9i09kJ1UfpfxiXVNcrKFaSCS
+Bc/8qOBS48BwnWvzYf5pg/NzazgMmApph80xrxtssiJlbsghzXSaeOaa9NrVI14w
+nHnLXHBjPQl2RQd9fOfx/kGL8lM8e6TfINssVQ3iiqXdBMw8w61g1oF7erWpYmB0
+DUGvyaCMhVzPo82RLD4WCPkkKhZaQBGXOc7luRxNLTH6bT1I6DMsX4bBxEMXOpAW
+IXAlN01NLoPPRObBaZ9A
+=x/sP
 -----END PGP SIGNATURE-----
diff --git a/sec-policy/selinux-apm/selinux-apm-2.20140311-r5.ebuild b/sec-policy/selinux-apm/selinux-apm-2.20140311-r5.ebuild
new file mode 100644
index 000000000000..abfcb70ae843
--- /dev/null
+++ b/sec-policy/selinux-apm/selinux-apm-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-apm/selinux-apm-2.20140311-r5.ebuild,v 1.1 2014/08/09 19:34:25 swift Exp $
+EAPI="5"
+
+IUSE=""
+MODS="apm"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for apm"
+
+KEYWORDS="~amd64 ~x86"
diff --git a/sec-policy/selinux-arpwatch/ChangeLog b/sec-policy/selinux-arpwatch/ChangeLog
index b9129ac244ec..b4986b1c014c 100644
--- a/sec-policy/selinux-arpwatch/ChangeLog
+++ b/sec-policy/selinux-arpwatch/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sec-policy/selinux-arpwatch
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-arpwatch/ChangeLog,v 1.63 2014/08/08 18:49:54 swift Exp $
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-arpwatch/ChangeLog,v 1.64 2014/08/09 19:34:21 swift Exp $
+
+*selinux-arpwatch-2.20140311-r5 (09 Aug 2014)
+
+  09 Aug 2014; Sven Vermeulen <swift@gentoo.org>
+  +selinux-arpwatch-2.20140311-r5.ebuild:
+  Bump towards r5 (fixes duplicate context for hiawatha)
 
   08 Aug 2014; Sven Vermeulen <swift@gentoo.org> selinux-arpwatch-9999.ebuild:
   Make 9999 ebuilds EAPI=5 and transform to make master for version bumps
diff --git a/sec-policy/selinux-arpwatch/Manifest b/sec-policy/selinux-arpwatch/Manifest
index 86c4be987f66..dbe8c82b3619 100644
--- a/sec-policy/selinux-arpwatch/Manifest
+++ b/sec-policy/selinux-arpwatch/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-arpwatch-2.20140311-r1.ebuild 395 SHA256 ea5e606a4a3dd65592eb599435ace3ceafdf1ab75a6691bb1e31e80cbc2504ea SHA512 b0a2a3519bf9053d0296cd74fe1ee9c138937c7f7d420bce8f49ffa07542eadff9a925609b7e577f5a4486d4df9ccb1796171b8b7d5645b8463fde1046176d5f WHIRLPOOL 32e3f7d17517da9186a434880b1e16d6868acf4c66d96c3a0fe420220f99cbc343a97cfbc56d309cd7731f97acbe46129d087552793de0dafbe62fee4aa8ec1b
 EBUILD selinux-arpwatch-2.20140311-r2.ebuild 395 SHA256 c667527e991268b4a8e18ac444a83ef9a7ffc102af0065624c76d2980f4ae625 SHA512 69925baaacd63b02ef81e10241bc3310812ccdeefc8836a397f2994321f5dc6b74ffbeed8bf01b7d0a40ba8cfea5c5d048a880b65713ce875a3ab62223818de4 WHIRLPOOL 88d954da1d8035bb11676a2e272e212fe36e9966f562379042c0311cb30424c97b063b4867d4ed8e4bd3b6c1199d7def69beff78677dff499c3dcc3a422b19d0
 EBUILD selinux-arpwatch-2.20140311-r3.ebuild 395 SHA256 bb4596bfcee43a2f9fdb5335dc124f1038b8efcb79220cb14b8ca3a6e12c12ce SHA512 7c0225069ab40515262ef783339ff4e1532aa507f045d7664eb80823d47243e45883917f02da60bbe8cdc435d4e210a4e0c298a90440c9a68574e69defac218c WHIRLPOOL 629293f924653ecad981a9e8950b7d03d634db2cf7414ba8cc02dc157549d7925159b783392fd29eead4006b2ff00f594e7b2749d7bd48b6c001ae15efba19b4
 EBUILD selinux-arpwatch-2.20140311-r4.ebuild 397 SHA256 72696a528ba2bccc3f2386a9f2a1aa322661a9bbd5710779ba9756d8285129d5 SHA512 77ae385100c1cd2f68b19b7a7d1692d4eef9fc1dd43a51b234346aa9b63f75370cc653211cff726dfef74b61f823bb5f90305018d8aa0fba156f440696a52e90 WHIRLPOOL c03f021828710432d6400ce73795c57964ceb133c18633b12512f12d793729d80a884b4a68a5edb394031f9fc98e27a40ce9430ec1e90db88b19d34693be336b
+EBUILD selinux-arpwatch-2.20140311-r5.ebuild 373 SHA256 592bd6726461210cae686ef3411e7ec731eb1510446f0f2667867c9e33a06a4a SHA512 3180e6513e9b17b16f51887c0ec34eb809d4c77de454240263df075c58745b137c50659cdb2f8df12e952116602fe8aafc3b50b492b91867afe620dc887ddeba WHIRLPOOL 05fedf12becfa91a8ce61fd1ed2050e3b94b56ef5ad7aaa0414815b5864c89c0a123ca5ea2ba843935887933e99d0adf8ccf1ae359b6b3134d95d59a92a1f2bb
 EBUILD selinux-arpwatch-9999.ebuild 353 SHA256 23ea0d48a9dfaeb2f3bfce1145b8b4073332ba071f4474d08085b59ca9d1bb87 SHA512 bbd4b7b69e307f93531457d3c70d3362d4f696c925954d20c262237b583d58c5c8c022109d556097550b0194a382ce1cec9a5b156850d4d75fc7dc374148cf56 WHIRLPOOL a9560f5bd49b12bb544ca3a1b1e87500b5e7624d4ed3cc224698de656adb5253fc3c89864022e106eef4d3cc045e1c88afd3444910cb308f4560610f886af1d3
-MISC ChangeLog 10017 SHA256 dacfd38cd5320a7d0fe87767ba84a8294e0510c2fb746b40e5fc409e02267485 SHA512 e4720f66209e2435b8e87b2dfa78606fce884ce88b14373719dfcb9aed264e51156725ce04b164a42b21359558e9b9513cec5628a098e301be1cb0588f7bc574 WHIRLPOOL b0c18a6fd998eae42a6359b54237f9d81ad292c99754601785a94caf52d06fc73dcb172049e46b0a85455b8afb43b96169c123e518ff8e9d5cb636780ef6d92f
+MISC ChangeLog 10213 SHA256 db6f79dd857ee3de9e33b0655ccae43706fee5b456fe877296b56afdfde33865 SHA512 c5e3a3c7fc7591dd3e453a2f34dc133e0513f2f8c34f5b32138bbeb2aef7935f2ca7392b6e90ae3b535ce8aaf7e6ed8fa1a1b1138c021c88839b515fdacdf67b WHIRLPOOL 9a07661b6112381da5ddc03148502df0927e5a5d8fa5b10ceb8c10151064b7dc689e0a0ac3d0123671f0358acde8fdfcf99043bdda157cb10afdb5a300d7abd2
 MISC metadata.xml 232 SHA256 6643963d64b3226c51c9275d29137dbb41631a56c41094fd078a4f54d78916aa SHA512 d9f78a084e0365be9341deb9ab3588352b2874955f375044a5840bb7de14de21d824dbf86f7ca8306133c04ee19b1f163407903925c3b1ad079a846b1a751e99 WHIRLPOOL 1a52b20569f188b6b3df7055c189a7485ba1f052a7241f016e6c491ef0631614e30d93b968a82814e1626f34f3882832ee8208e4f38ee53f8e8daf7b79e26a8b
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0
 
-iQIcBAEBCAAGBQJT5RxZAAoJEC7dUkA7aK9HoPEQAJCUfr0M3WgU6TIrSYGxD3qh
-+jJrrrt7ICIakemuTWDSPuEkNfXHbRLYRq6IooMIqVy0gKU95JWS57HYHtlNTF+l
-GeJaZ1phHYF5BVwqLd7Plr66ERQftzh00x1jYV7f2T1vdZ5T/gSoJF1jFQ5POGMW
-PqxLrYD1VHktcA0evU+diVrzgNDbENHJlCX11vqCVE8HrlGoEP/NuJj9EZcHKOnx
-jnRDW2HsTRRZxjDMQEXeYNohIVjxWrteFhuRpzTXPmIV0q54hvjQc4O9UQ+7Gxx6
-vEtEONB+PcfwVmeydsAfpKWin7vDOr1kyU40fogbwp6Vns3RkIaEiTiVXUMNzc9X
-pq0EluYh4slmessOxlhjMnP3dZEhJJp/5nz/lDlByBvsW6ZLasN6IOzAiP4gV7b5
-VzvDSC31S4n2Wa17yMowci9+2lRnUuzwgfMCeBTo52wNrbrTHQy011r0jaiqkakh
-5XSRZ6uace/g7DhOUyLgPD2S4WvgadHK7FPoike3XGebmgywu4xrfw0GtUua8AI7
-PhG3IMLrGvwBbvwst1XshN+QAY52PSMSk3uKBpQMpYDLKVTyXRHwjDSEck6nMtzt
-PPbjOmJvS+ocAG9oqKxpoKJvBBRu9UpVO53b4+PL8aquT9ZUMBfsUvokijStcIjd
-+VLZ8PHxA6smNXyy+OHJ
-=cguM
+iQIcBAEBCAAGBQJT5ngqAAoJEC7dUkA7aK9HlaYP/362QH0qK09/xtyBtNVXbr7M
+vRovSALKw7ZRvKXHGkhMJ1cDc2TcjeuQjYWXybKLV7UOFEd1v0tpQ7a26MqsqjjW
+rvbl1zkIeVuHscsmDRpdIe036MX1r4JS0yjC95UA61n1ZimIiIAnQYtWmZfeL3OF
+c7ZvvtX1oMFp/ZbPNk4KpAQYVCe8fEVVSMfQT60joc9NMOa8uZEp/03YsQO2vQEL
+KKYXA42JeHTncFYy69PKqJK0wlzSV21pVOzaRn+3wzmwAC1eUUtDpjXuQIbm3p8J
+BEwWzqETrd57IB9RTONdd497XBQEJGMbkuPUKF34LGrgaPaPfBkDudZ9NNCwlFJd
+cMwgfJCA0Fp3cmL2bxcqfEVTwkNo/2ve61up/uCZ/ROVEaDWpYnNQpThZb9eulku
+r9nXd4VWsS+j4rj+umGOxD5y7y1ejtianDMfQ4Q8hpt5tvZ9M77f3Jkvs/Y7pOaF
+CfUw3R3rfQ2jLFFH8h/Ox55qRd31sL6v8N5Uxcefbtl8VzSA+jjTCAtYgQgwb5r2
+RTjeYKg03OGpDvnf9qqhe7AXMQdtgl2s/pPPXkNAcoPqCWNMFoAhLe+L85qkZCxZ
+hQBWyrjg1Aut+ppcdPcz8ETMsp179g36UTrJz2Qtq4MNHtMHbLIsDj/SiQSHpHy4
+fZPNq8AI2rT8l/9sb+18
+=KUAo
 -----END PGP SIGNATURE-----
diff --git a/sec-policy/selinux-arpwatch/selinux-arpwatch-2.20140311-r5.ebuild b/sec-policy/selinux-arpwatch/selinux-arpwatch-2.20140311-r5.ebuild
new file mode 100644
index 000000000000..77f2a63b90ed
--- /dev/null
+++ b/sec-policy/selinux-arpwatch/selinux-arpwatch-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-arpwatch/selinux-arpwatch-2.20140311-r5.ebuild,v 1.1 2014/08/09 19:34:21 swift Exp $
+EAPI="5"
+
+IUSE=""
+MODS="arpwatch"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for arpwatch"
+
+KEYWORDS="~amd64 ~x86"
diff --git a/sec-policy/selinux-asterisk/ChangeLog b/sec-policy/selinux-asterisk/ChangeLog
index ba482332d599..85b94822a464 100644
--- a/sec-policy/selinux-asterisk/ChangeLog
+++ b/sec-policy/selinux-asterisk/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sec-policy/selinux-asterisk
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-asterisk/ChangeLog,v 1.61 2014/08/08 18:49:58 swift Exp $
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-asterisk/ChangeLog,v 1.62 2014/08/09 19:34:35 swift Exp $
+
+*selinux-asterisk-2.20140311-r5 (09 Aug 2014)
+
+  09 Aug 2014; Sven Vermeulen <swift@gentoo.org>
+  +selinux-asterisk-2.20140311-r5.ebuild:
+  Bump towards r5 (fixes duplicate context for hiawatha)
 
   08 Aug 2014; Sven Vermeulen <swift@gentoo.org> selinux-asterisk-9999.ebuild:
   Make 9999 ebuilds EAPI=5 and transform to make master for version bumps
diff --git a/sec-policy/selinux-asterisk/Manifest b/sec-policy/selinux-asterisk/Manifest
index a246e04483d8..a9f5576a02c8 100644
--- a/sec-policy/selinux-asterisk/Manifest
+++ b/sec-policy/selinux-asterisk/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-asterisk-2.20140311-r1.ebuild 395 SHA256 9f7bda1250e2c70630e18ca9d922b1356c027b11d51879725962e34274091ddd SHA512 0a8986fbcac15addb20840cdd109f6d00abca6abab7f922d1d37e425f8a3e4502ba3759d34335cbb98158ec68552bff15b7f9e42f6fd0af00c1ce4efac169494 WHIRLPOOL 3020651e1eead6cc477ce23573c51b603e658b6124f0ff34ba04a3451fa819565aca84a3c7032ded79720e848da63d3e2073809446b11ffa0dcdbe743d92338e
 EBUILD selinux-asterisk-2.20140311-r2.ebuild 395 SHA256 ee6112dc4905320305cd84c03c0656dfdf3b78b8ad7cb6d9c19af8f1c98341de SHA512 848ed802f4b2ad37dd4cf8e49430a100bc6f8ea41a896b39779056138bdb2051b5c9e9a5456f3f1f8e1455dbdbb63b9a4b5b5f06dd2d8740fc854897ad060302 WHIRLPOOL 69b7894b9216334bf804b7030ae4559108189c35e9edf59dac32ee29397a7202621b0b8a4dbc000a539a82ac00ae4e27afb849d0a6af8129fa6f41d70d3168ea
 EBUILD selinux-asterisk-2.20140311-r3.ebuild 395 SHA256 53ed91c6a037da7048abbb6b01b5867b32b92d58601670e346b81fc2faf10ae7 SHA512 844bcb231d5bcb83590cbf70ebf5855e3b2d8ae2ec35d68715e9124c401fe01f0d743b78ffb24789663c1c801932bdd8b2495d0124d41773ec030b2b4c116204 WHIRLPOOL ffbda6af191ce6c3631ac98647b8765f09c1efb3acb101755ae68685f6bc0fb7c16d61dc2a66a196f405cdc8f230707e7d02ed321c72ac7aaada5bb9a460215b
 EBUILD selinux-asterisk-2.20140311-r4.ebuild 397 SHA256 a6ca5521b188079701e1187b6463f9578cad9bcfffc2e24f2710d39679c49e4c SHA512 8dba3d04d9df5ba7aa51ff2d34ba570054f03c2d270b0dc080421cc2a476b7071615a6deb1b01635f19aaaa599e815a4e952514a604bd77c5e4d02657d7bb851 WHIRLPOOL 07543396af728d1c1fae7256a92c05f1c1ddd09dba04fb2435ca3e9326a27e6fb9ddee48750eaa6e04b8e4ab10c46d5362fad2fec9ecd2992a35a1a6c1b8552f
+EBUILD selinux-asterisk-2.20140311-r5.ebuild 373 SHA256 17c9cd44282a4d00b5d5fe24a9cb682120a30bb2cd5ed7d5124821923ef0ba07 SHA512 c3812a27e630d7f7a7fff7556fa3afc5e0f65e0284594c5b2f408aa9ccdabfcedcbcd33909339dc5d99f2f00bce74dc2a2fe6d4ec011d488e0cbf19af98041b3 WHIRLPOOL 037b0a433993cd2335182d83ee5501c43fb47b220af90bd152cb50ab654f9c1e79df30d6533cda37d12e5f64714d96db96f38126df6b4a201e50b922bef833fd
 EBUILD selinux-asterisk-9999.ebuild 353 SHA256 1d9795b1f658ba98bdc4d3614b98ec564d8d32b4b7e1a8393262b4f2a6e4de12 SHA512 743d878892f6a149cd4c43cd645024419910b5b6ef08ea5eeb71ad7669c3e16793a392e07db700fb0f52b7f330e4550b6e92da1d89a9682f1ff8ee9ef7aaab7c WHIRLPOOL 1bd0f1bbb0fd86b460d8f7596cb557a8c4ddbbdf6149d0208da504c82f6e9a2a6cede8f6bc1f416f89deaaac41c573be1fb900b718f6635a46ddcab37ce99033
-MISC ChangeLog 9724 SHA256 e7221dc30f8c4f8047b924643f68077439c982272e6056b95b4a005a31b5ddef SHA512 6e18db2ed744d95fc27f717eb926d004e35f8949a5045d66a6246468fd96ddb6b8e86c23cb94910eee0a1dc24254681021cf329109136804533a9c3e51f42f67 WHIRLPOOL 27c33fee222d30dd59578826adae07cfdcbcf7e6d12531b3b2b761aeddc0c1db674a4d1b40bf7796c54bb980586949ea134a919286831a09e2d9ab0246509d47
+MISC ChangeLog 9920 SHA256 c1ad76042cc8ce537814408c61e9d0ec197baf16eaa82cfe1cea448b4223f210 SHA512 47e96c0d613ed0cc203182b803a924fd4ab8a74a178198096f202d041067a82ee5f14b5765fafb51189a5bbaeb7a95750bb95099aefa3623740ba24f66099016 WHIRLPOOL 26ac58f370c46f85188e19dd5a051be5d7658919a4fd16461aec49a53aec7a323ae250ece9194c02be5908545b84853e0d6d07462fc952f645d0f98bfe653519
 MISC metadata.xml 232 SHA256 60a4674a833cc1838b39bbaf65acf044874e1eed9e6f6a712d5f1b3fd8d6fe59 SHA512 e49a9f552f2fe92b13f5bb285f39a3385efaa5bb2fb8b1a30dea68e578b9f68e2d55a900d6d9f95eef44b1185bcef7d20993abc00f60e3f853e958be3f9b0243 WHIRLPOOL 1db97fb1cebf6688777216bed193a257c636b1c9d120dfdcf4cecc17b79e5e0a83f244226c9acebbcd5e670defe419e1bfadd9f81135e07dc0b0b284345803f0
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0
 
-iQIcBAEBCAAGBQJT5RxZAAoJEC7dUkA7aK9HCBsP/RvcsD7ee7eyRrNHHl66HO4c
-caF7TlAO/2lpvVs8WwLY8TyF2Mi7bY2q3pUX5Wn9E3ffuj5S/tpWsZxZuAFR6JDx
-5Vkdnhn9NPh3wI/Y1W2NdBQwxVPizZEZhVfbQObNpc+Qs25YN4rLVePAhK7QbFKI
-/phRrpyr12ActApN4mxcIcW3jOd/P5wZIo0RwuIT6weW9tbyHMdUhSur/bz3AMs9
-dDlPBvDCy+RiaofwAsyfI6W63G/RCeJyfFN/dgI2kRok/Xo00eC6vUgz525+wXIP
-x5v6MaoZF9jrxXioU+gI8iJr6CCNtmjuIoRovo8A71HMOLP29wIPGXNwCjWZW7tr
-buPrgBaGMGziMQ5OAyG6e5Ijn5zVCA8hmzXnkwjTpqDvPdgngHfk0k9l4Ce8Yu1A
-v56C3juHOojKlfVnjgCehUKyopPA6E8nAGW/al/xxgRst28aogz5EIbcgRyY91V/
-tX2dWe2dF+90tAT4kUp/ThO9nSS+4HsZrbrvcdZnf9Q4O1lFOXpkzPT9+ZyfpT4H
-FwFkWuXtkwGb6U4g/WReENuITRWdWIAeBWifp2GMRbu9FKbRWye4pDmDc/A79AQ3
-aM6OP0Z+eRSg0ibyxno2VYMxLyFmAMJ8UN/GfPepUbiwRIiohaDPDcCgeNQp2M34
-9oJv155SFJJQ/FsJv2MM
-=KtUA
+iQIcBAEBCAAGBQJT5ngrAAoJEC7dUkA7aK9Hq1MP/2XJdEbuqHtgM8GXDaVkDxtF
+lG+gcjD7D12vy/SDBpZ0E6F6e4Y9RileZc8quqbeWDAN35QwuBFOqVU+iO1iHHCR
+cyIUsdoxd+q66RGUy4Q9yrh8I0LOVHRD6NXK8qVLDj7n1uoFSOUCnqYEf3auWcnt
+Ns56xmltaQKEx4vfTkPBJSdru6BaX2RgkZsPh71JoT7leRje1J0ej+KTl/FxdIo9
+276N2VCjxbw687oNvi8azrOlI944zGBuVlmJ6q8QrOGsrNQnrKpQYb5t2rSBwZP2
+18sc1cApFj2Ho6f3FGpd/+POVYqGkE1X7OnPMnBftuST566PYmsdIgk27S/JtH6f
+9vgG3nci4Lwr5TcUQeJLz+lzi5KNprPKCwi0HEeBgPBnF5XEhDc89MIa4ZA8St10
+VbUsHjC5bGsNYsxVSOt2BkzS3htcZoJCu0q088nmj3I939PHnCAuvX5zQOd7qBTe
+UhH/cxB59ITqHQOND5tfCIEcmHgftVmEOn+wI/fQ7pyr18rs4pRbO5KFl+PFqRDe
+sWPqsDAvj1cgHy2gTCRpGzAtJMzkQ0moz+hGdio03gRXGWqvToTRbir04VUhtEul
+ZgPQWuTV+oSskC8P00Bxhp3HXyuX/imM4Z2xc2u3bee5RrXAKarGGuAMYQVzVGF9
+NF1bgY7nhLiV7yLA0rzg
+=CcEr
 -----END PGP SIGNATURE-----
diff --git a/sec-policy/selinux-asterisk/selinux-asterisk-2.20140311-r5.ebuild b/sec-policy/selinux-asterisk/selinux-asterisk-2.20140311-r5.ebuild
new file mode 100644
index 000000000000..f25297cfd80c
--- /dev/null
+++ b/sec-policy/selinux-asterisk/selinux-asterisk-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-asterisk/selinux-asterisk-2.20140311-r5.ebuild,v 1.1 2014/08/09 19:34:35 swift Exp $
+EAPI="5"
+
+IUSE=""
+MODS="asterisk"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for asterisk"
+
+KEYWORDS="~amd64 ~x86"
diff --git a/sec-policy/selinux-at/ChangeLog b/sec-policy/selinux-at/ChangeLog
index f24e8b5a264e..09be61082fc8 100644
--- a/sec-policy/selinux-at/ChangeLog
+++ b/sec-policy/selinux-at/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sec-policy/selinux-at
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-at/ChangeLog,v 1.24 2014/08/08 18:49:51 swift Exp $
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-at/ChangeLog,v 1.25 2014/08/09 19:34:16 swift Exp $
+
+*selinux-at-2.20140311-r5 (09 Aug 2014)
+
+  09 Aug 2014; Sven Vermeulen <swift@gentoo.org>
+  +selinux-at-2.20140311-r5.ebuild:
+  Bump towards r5 (fixes duplicate context for hiawatha)
 
   08 Aug 2014; Sven Vermeulen <swift@gentoo.org> selinux-at-9999.ebuild:
   Make 9999 ebuilds EAPI=5 and transform to make master for version bumps
diff --git a/sec-policy/selinux-at/Manifest b/sec-policy/selinux-at/Manifest
index a9a9e3a69a13..6848cca479a8 100644
--- a/sec-policy/selinux-at/Manifest
+++ b/sec-policy/selinux-at/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-at-2.20140311-r1.ebuild 371 SHA256 df1c0f0ed70cf6e3ae7f1f44bc9edc2e07199b17f94c3dce0c2dee054c1ef6fe SHA512 b0d1285eb92d9d9091ef4563af44ea5bbd5a153f7ba1d89faf786d7b4540066aa8651c046ac7a8e4a49ae8c6fe56cef6898458aa985ec01561c16c92bb4584bf WHIRLPOOL 93116cba9bf29f25995440840d6e4fa10b2a8a9d67ee861e37a86a90de3f556608c4d03d12360c1b74b3efdc1329f4b5fc6feac1320eecbc5ac07951f8db63db
 EBUILD selinux-at-2.20140311-r2.ebuild 371 SHA256 ccd5a664a776fb16088c7adca617faf3a5365a15ffd2f768b75eaa6fe3d80333 SHA512 57798d9fd31461367c45b554722df980f26e85b1e6882ae5cc03cefaffc8b3530f67efae3ded510633154caef08d4a0a248f58856781c24557981ce56696fa1f WHIRLPOOL 7447c52c9ba13fb2791941d9e22512a3f799e16e61caed01fc88163ac74c34831e668c18b20d36fab2a392c0dfe658b4004a36be636489a326e09ef690916fa6
 EBUILD selinux-at-2.20140311-r3.ebuild 371 SHA256 e9554ab497077fbf13126821c4eb555d71b8e195ae6a57a4da3a88335559ab2c SHA512 11d94e2c1cfad589a5516d7b484ca068b5a4a1d8abfe09b636cc7e83695283381cac7cb8c55fd314d5f56adc442e4fbde16107f62d1a5cd26de0007c11bd964b WHIRLPOOL 38524df50f3ba9d63f439e2be119e02aa0bf51f29ed098a6a04a7a5d03f75ef6b07bffeed0b52772ef1567360b291c0aed1611a92e9a319f411460d415703983
 EBUILD selinux-at-2.20140311-r4.ebuild 373 SHA256 2b646dd95853dedf3d4f6d52ba9147bc958b588c8073ee443de83f1b001b8d0f SHA512 aba5b5371544e2e62989aa783898333d8d24d8ae7f2a59b05cafb8cc4ac456037afac356b68f4714643609c515626c116a4bc293e1689e9f6db6de6f9c7e55b0 WHIRLPOOL 3699f18f5945d0498039d24921c4780960502f5479b043cd516cca9da24c66e0f2a77c296c9ff6b2d9b07f6c1154d824e5da5af9074cae7467871cbbda4b9f8f
+EBUILD selinux-at-2.20140311-r5.ebuild 349 SHA256 b57a1f2d762b04fe855f1645cecb6ad71e1c55dbdbeec1cde35ec7c033024966 SHA512 9f64468625cd20a7dbca14fc47e17970ed15699dacb988213459002dd735edf365376a57c557a031b3c281bad0c6552ee2ca525b15e4a5a425c8a3797c0a32da WHIRLPOOL 1fab27a48015b395dc2c40aa8547d30cf7ada9e3259b83e05f20926c459bdb6a9ad4ce0e39e5192cbeb441736aa7e2a60364293658bb9811d2bd2333c9831291
 EBUILD selinux-at-9999.ebuild 329 SHA256 f94efaa5f82663dc1b4018af2670904daf549e2ac3fd6dd780dd437991eab559 SHA512 1f5e3c1ad7c414e66d085302ef5c12d809b9b08e0491381d407cab2c7554aa89bed86b10fde14e552f38958e41582fedbf8dd4d4b7f066e1f089ce3db324c2d2 WHIRLPOOL 4b89433db87f6934c41d1f11e9328bf87fc2c9946da264e02205cf7dfe6b014ed6a3ac4b2195645cb5c5a5354f0ca18a5248e0d8f4c99260032d4203c03267a0
-MISC ChangeLog 3726 SHA256 79f6a1e361108fa9bc512c8282c065630b28e47d3c4fb8648cb3d0e399baa37b SHA512 2da2014cb6f449e00d23d2a654161bd0a3571e8b5d9341f4bae8472881534da6cef82ce65c927c1ca68b68e51f9101e087ada3cda778a575305e71725e383f03 WHIRLPOOL c9275729f5e671b008a207cb376755b8c7576d298c4bd8a4977349823bde6c6cf67b7191fff0c1e44276d08b9dcaed2dccb41b6c91dd2865a875090ac86b8380
+MISC ChangeLog 3910 SHA256 738469ed84f1c80987d9116390fc2c727065bc34132a02c06c1739c263d8392a SHA512 6ee24497863ef2045de626126db6f52bb6d81de91cac0f094fc30e18932e17193546c0cf0eb806e86d2160fe4b81fc6a2c137ae70f252a348c8fcfa00c391a79 WHIRLPOOL 306cfd9a59bf6d51d296d1e2d3ffa7db729eb0f0c4f1aa6c0451199c2c1d2ca02c9feea6818766c0fcc309d4f65122105d3b2d4252bbbfd6d28db5b9552db89f
 MISC metadata.xml 226 SHA256 7ebb98c75c72eb26b16f09dd4ed2a0997067b9e2f48c41d5b1a4d38bc005f6f8 SHA512 9ff5ded321544f025c12bb8ba1b616207afb5947d008daa040b713c719f4cf59bf3b4b2342bfb10d67a29da715efae2bd2894c2c73e8f130dbfb906d4ca5cd9c WHIRLPOOL 523aa063d399892e83c428729e1ee4b5e18e68e6581f2e56480b61665092573ff45b0efd387c17cd86bf88ce90260d526c1b42a586c76fd33705d06251721099
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0
 
-iQIcBAEBCAAGBQJT5RxZAAoJEC7dUkA7aK9Ho88P/iH5L8wAU74W8vh3eSekUGWk
-Zt+QxTA7Fpo/zEzU4aYkzywa4RnBOobg1jKlNGcsbgyHrqSs5fveSKRNmAKgZMdj
-HIAe6hwD/cYqHyQZa1GiWZ8lo0dA5xyYlzerCxRxWaekCBTuV+Foj79OOcKxJGD+
-50NNMBaAxN2cGhVaJWlppvQIhKNyg64YNtKi88CH83TVv6AlcezIWCGodlHb/ELf
-RA1iSGNc4WoigH0siZB45XD+AU6uJKI3I2YHTQL08XyBYGeowVDgdLCElH3l8Y3A
-q35OeDVl7apliwhBObCCbrpF4zRn0V/RCz6hQylkRL0LjqQ+bXCPiajeOHW/IULk
-d/BWxG+2cVhjeo/AFoODdWxukZVCLw2+U4fYmNLoa59Fg1gmQBq5q9sNE+nJyvpt
-zkxLQt2iRLg3oy3WFIFIGwaonbUly7513EwRAWGjbbMnGfX4xaebq6tqS3S8VKH8
-KI8JbJXLliDa+TerP2STOnVu9zG4lO9YJDmnmmBpvRevG4gTGR4L1YKUAHekH5ml
-7ahiEb9B2pHSFPjsk2ne2SRmcvazZYFPYeTy3Y/3HAEk3aO0lqRzDqlhI8pnvGqv
-Gr8V13eZnuvQkUBoNHE7NnYwR+AGsH6xPRKje3ePxjM6fenNsKHILd+OJew2By0t
-S0vdYS8DzPDjaOZnJ9qq
-=JHii
+iQIcBAEBCAAGBQJT5ngrAAoJEC7dUkA7aK9HJf4P/RGuI8NJax/BB2p1xNeia6wi
+/rGgcUoAf8j7MyMr2oJ1Q0RbbRyYm+s93dT4yFrX7UwkmkLe84/iEqn8yE/461fK
+zVTt/w9uZPmBzUQ+BslfUgs6O/LAZoFWyfnHtFJdsEDY+5ny7WKIES1XUp5PeWlz
+p/NiWqnpG3VjrANT0iARoz5Nooklmd7u96XPvwyWapHpAa38dMihSiWFykyJLxpj
+s8nXK1c8LjIIQv1Vc/1XnKkwk+XxhaVn0zvNz1U/zYA/Fbzp77OeqCtdTRgppKr9
+OUW3LJQX1nPsmGVyjChcza05VgjnRl9y1HRK/NGoOGbfPp2Guq0Z7VhvbT0WYFIi
+iqdR+6GxyxUoIryoWA4lQP0vqbXA8O4LMkKU+HZWzQ7XwGZ8v5dNqG3DWlRT2ZmC
+e+1veCmtE3x0rNWQm1oRTnXJbld+HHm3jZcMvWXgWi1XzC489xlGfBf3ZHEJFLQ2
++oQFHkLJTS4/lSZpV8xSrkefDAJVzpe37ugho7OCAK0HrCjgjwDvvCJXwL37xi69
+xmxitYGEe8sELY0VSP+cyzzFaotnjb1r9p2tx0T4A9XXJFUAHkzEZaORoHnoPCsx
+6FUcN3Q0n4S+0eekTfqUevDrxB2Ukz1WKh7F1ZByDh7oV0Y7rjGovcV2jS4Lj38G
+rEV6rMbyAh73Ul03SNDl
+=0gCf
 -----END PGP SIGNATURE-----
diff --git a/sec-policy/selinux-at/selinux-at-2.20140311-r5.ebuild b/sec-policy/selinux-at/selinux-at-2.20140311-r5.ebuild
new file mode 100644
index 000000000000..39190faabaab
--- /dev/null
+++ b/sec-policy/selinux-at/selinux-at-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-at/selinux-at-2.20140311-r5.ebuild,v 1.1 2014/08/09 19:34:16 swift Exp $
+EAPI="5"
+
+IUSE=""
+MODS="at"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for at"
+
+KEYWORDS="~amd64 ~x86"
diff --git a/sec-policy/selinux-automount/ChangeLog b/sec-policy/selinux-automount/ChangeLog
index 9bcc57f945bc..ca50efbcc113 100644
--- a/sec-policy/selinux-automount/ChangeLog
+++ b/sec-policy/selinux-automount/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sec-policy/selinux-automount
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-automount/ChangeLog,v 1.42 2014/08/08 18:49:54 swift Exp $
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-automount/ChangeLog,v 1.43 2014/08/09 19:34:23 swift Exp $
+
+*selinux-automount-2.20140311-r5 (09 Aug 2014)
+
+  09 Aug 2014; Sven Vermeulen <swift@gentoo.org>
+  +selinux-automount-2.20140311-r5.ebuild:
+  Bump towards r5 (fixes duplicate context for hiawatha)
 
   08 Aug 2014; Sven Vermeulen <swift@gentoo.org> selinux-automount-9999.ebuild:
   Make 9999 ebuilds EAPI=5 and transform to make master for version bumps
diff --git a/sec-policy/selinux-automount/Manifest b/sec-policy/selinux-automount/Manifest
index 92d0e1482a69..942f83add079 100644
--- a/sec-policy/selinux-automount/Manifest
+++ b/sec-policy/selinux-automount/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-automount-2.20140311-r1.ebuild 399 SHA256 5c3bf3140cbea5423a670c673b9628ef1b52e7319da3f2490f63221adb380b26 SHA512 93c93141be2727b56cbf5e548d3ab3a1eadbfc7aab3ab3c8941d60c3d101c4878b0e4cdd1078f602fe98614426b10d935bdd68a8eadcd560aad3d6bb60fa7fd0 WHIRLPOOL 3950a718ef71d0a52ca7e1c6335a43004005eb08905a39985babd5fe4bf0875ca637650ddb4a54aabdf9751b57e25f12ed3f83032b8dc170150f744d0133ac78
 EBUILD selinux-automount-2.20140311-r2.ebuild 399 SHA256 e073413cedf48838563d5b7463075581e2e42467dcd728eaffc94a571e5f91e4 SHA512 7f2e534e801978dffa73016eb9273ba7dc58b3b8803041220965d738b061a71ebb34fdc757f22aaec215fde277d620d476945c82f6d5fe09c7eb851a9eccf740 WHIRLPOOL 14a1ce729ec1fbfd9e77d264d24eb0dedab2a7af11223c2cb259a57bbada1ebd98128c1f278cd7b4eefbc9126fb879e4acc0476f4b05ca83e37f735c86aa0bee
 EBUILD selinux-automount-2.20140311-r3.ebuild 399 SHA256 912771f01bdaa7faefd304cb197e77b08f302a9e0590ec84566879b9aa18eb9b SHA512 5ff5937cd4deb8be5e4226db9818b2cf7155b996dde7bdde2d1ba22b86d79d2dc696cbd4210d954b649397677c5003172e095ce1458dc5ce7861963312e94430 WHIRLPOOL 953578b987c864d30ff396588dd58a3b040086e2d8a14618b338898c1db3e9b156a6f10a911ec1a9d71ec7172e3579a69d4976f168847cf225699936963d21ba
 EBUILD selinux-automount-2.20140311-r4.ebuild 401 SHA256 8f5281aa25046b08726c8ccd0701ec853e358ae4382a7053d7b166824fca3d66 SHA512 a76cddc8a6b00f3a9f31cee14336436bb912390d8a200d2bb4155d104516a766354a29627008f45922f0048be0fa9e40e70c6e5a4a42a37260938e5a2fad47c6 WHIRLPOOL a50752d23a24db3e4c805c0dc774af3ee40a6b791c637d9ffdfd1273bb259253bfe7b868ed49bdebea9c7f4c06d26b30649fb6fa3807a64c88fc27d3dcb50b83
+EBUILD selinux-automount-2.20140311-r5.ebuild 377 SHA256 f23dbaa458a09abc88763d66f70017cf09eecc49a14b546940d4f1ea69342cf6 SHA512 44e726807b4b32eb340e63a38cb84bd90bdf155b51f51e5878afe0f9743f626fd49edc52e5f674966151cceb18354c252aba7b1cb05b75e7094ef11bad2b8239 WHIRLPOOL a08b9e1483dd7f7e1b3b82d1cbe3e5e16b3a28b3c665963501e8734a2517aa77e16d5106782717528f8c4e7d9c5e217741acfe2d3723299f84d3f3307197708d
 EBUILD selinux-automount-9999.ebuild 357 SHA256 96ec936afc1864b2da105d9330aa9a94a040e825fd712d450a8514ebeb0cd09f SHA512 4247a6be550ebebda0481e3eced22181f348f374a9fabd387c81f0f5f0f799952d27aa1aa77fec524ba35ad7ba81b1269c9b94f1789b0721d196f2fce3305a59 WHIRLPOOL 12179fe2990b3a933f8b25a72959f8b64e6f48666cce004e3f0c0e498e9c51204ac08e87d4ae42c4ffe4e0f42cd2ca041d157b52fdf56f5789e9989f75210ac9
-MISC ChangeLog 6746 SHA256 1dac96c103e9353d6621a16d76aed4b6db6a19e9b490d3f7fc0fb3b399e2b467 SHA512 872fa7c399b297c67ce51ae22c7faab1a0d9c0501ac2897b8c32e38d8834128ac425fad6d3f37bbb93058a957fbbe40dec09e98d1e7fa61b828c402be6610abd WHIRLPOOL 31c5e489453fe8d8fb76b6c69ed2bf4394aa51f20536b52ef272e7e9eb5ec10b4c36e60a4c55c31f574cc7b145d58cc34f3b7e28eff50ac4551c9c13d1fcc11f
+MISC ChangeLog 6944 SHA256 64fe2efe07099a5295161be024140b2b963db268333bcb305f31daffebe373df SHA512 b798252853b8005e943acaf2819b4c3920d4d0f0f3a670f479e94bb5321013a8e8f4885f10a82b6de7aa9d257701704f8ae57af802b12768de3aa364765e8c44 WHIRLPOOL 447c277ff3733c62307700031befba3f0b29bdc53903b29ebd4807fe8701e36e132852910707c4e6cdcfaa8c04243d29284159ec65bad8e214e449f62cf0f9e8
 MISC metadata.xml 233 SHA256 8b5d855aa7def2563e46b9dd5d15837c04eaa2ea6e82ede0821a8841cd9edf58 SHA512 656c4a72c5f4590d0f3bc374c336d959e7ef014cc5ed16f44a6d4109572568c03bdf1552e96861425258c05178564c10e66eb85ab87d3c3a76ce4538ec178119 WHIRLPOOL 3c8a86e83de15ada25d19632d652e169c179da50595666bfb72d36980ad3323924f07fb1158e1a6977b4ea0ec22b98c33667732e15953ece2705676d8ca3bd66
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0
 
-iQIcBAEBCAAGBQJT5RxaAAoJEC7dUkA7aK9HFJ8P/AnVwR20R3d+Z0d76iB8bICU
-StgmiEzQmE4HaKd3HBf9DucM83z+Ij4eiGyYRz9N3BHRn4L6PGGLnL7cbygZ1oNK
-uhEVnTIOuVXvyaLBfCgQHUTxjragopQe5hpuFpuka99f5b/sJYaEgrXTGMr7DNdG
-OlQu3zISzQWKbIUTy5Z9QXsXubH5ydZTWEpLFCKpQuDEdpv1PxrlmTXfht91wtjR
-6uKTDspZa6gAXS6Odc8PLJjRWOIfZKxQwQfGABIyEmQfrFicnNtSTo+FjNVJZmEb
-XihvtyAsMwO/aWqKwvBNPKYp0kwTPU/gezzGnFH7jbte5MR085D1Y8bjg2xh8lQu
-2z6q0aAdqvSg8dRHnQYDJCrtztsysqvCGglJBF6c+ZB4ggCDEvv1PeXRNS8iGiM8
-nTwHQRRKSA7Qhix9OLdaL9nWKkm/4hSNclvFwicpYqrXqnTYdXqTNppu3F6h9xGM
-L15hGI0PskdLrEEvfRqXvBA2Lbo9oj9m6saWjKuPGl6KOLAf9w+XBxM6aqlb95uP
-4R5V9Sn3J6/tMsM91D9zqQnmWO7mmOltsmvBmh4IYhBPGwB/6/aIlG9g6su1Du2e
-wgmVaH7YsylHjQ11Emjs+h+AwmCoPInLf5MK1/8k2ktJbG37S8J1MQr6v+nofJ/n
-Qabch/dUbqgS5kyheTpT
-=D8MJ
+iQIcBAEBCAAGBQJT5ngsAAoJEC7dUkA7aK9HauQP/jZTqbQ12CzoX5b9SoWuni5n
+EH2aSLxxYh1NLszvNDzQnPeyJNq5oZMniA3Ca4HKVAUCElV5VGt9+8Pw/hUcN5c0
+l4sC7gqhv1/ujlNKOKYB9X/PjjwPL7Ai48oGUWc+sVw6pgl69skS/sDAlUr+1k9L
+Xr9Ai8K97SAh8d8qCCjtfYacMp0Se9uVSaCi/i591cBH4xTGqfInaP1wLIsQDAyu
+fq75gEWhajgl4RNhUCCxwGhLjV8TKvbzc3JIM2zftiYVoFERXWvy3OTI+stmrULa
+DT9iAXsGBT0ri0rXEp3MAVEhbt2C5BofG0AyLIe7DsY9SlPj0V6QQwWhImRFkMKB
+2XWjNOGapwHtK46sxqy2vQjAxqo895K+PadmIR99t+ZL3j0P7VgQZvAXBZts3LBc
+kqjl++gR3labFTgzVwbkF5RlH+A84TyycPnoYns5DcM+FeTA4R5clDWxqPd2EU7X
+XEZcXF4FX7lkHoAvybKutlbvJqpjY6Pi4YJkIKLZpH896qlVYOM7EX11qlF3xLy4
+8Hm6I61ys1PR9/PXtxA+HbZ8X6EChJq/88iM/8id3yfHGuKkqP2njJMLEiNTWJ8+
+d236g/r5/SGEXWSnxq8MY+K5T1tg7Y0RIm1y/zS6XpLV1NvVU/pThf+mZWM5sktY
+usK7twxcQEq1Lzd7vz25
+=ubwt
 -----END PGP SIGNATURE-----
diff --git a/sec-policy/selinux-automount/selinux-automount-2.20140311-r5.ebuild b/sec-policy/selinux-automount/selinux-automount-2.20140311-r5.ebuild
new file mode 100644
index 000000000000..ccf3f5733fbb
--- /dev/null
+++ b/sec-policy/selinux-automount/selinux-automount-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-automount/selinux-automount-2.20140311-r5.ebuild,v 1.1 2014/08/09 19:34:23 swift Exp $
+EAPI="5"
+
+IUSE=""
+MODS="automount"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for automount"
+
+KEYWORDS="~amd64 ~x86"
diff --git a/sec-policy/selinux-avahi/ChangeLog b/sec-policy/selinux-avahi/ChangeLog
index 111363861852..a06b2cac247d 100644
--- a/sec-policy/selinux-avahi/ChangeLog
+++ b/sec-policy/selinux-avahi/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sec-policy/selinux-avahi
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-avahi/ChangeLog,v 1.54 2014/08/08 18:49:25 swift Exp $
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-avahi/ChangeLog,v 1.55 2014/08/09 19:34:17 swift Exp $
+
+*selinux-avahi-2.20140311-r5 (09 Aug 2014)
+
+  09 Aug 2014; Sven Vermeulen <swift@gentoo.org>
+  +selinux-avahi-2.20140311-r5.ebuild:
+  Bump towards r5 (fixes duplicate context for hiawatha)
 
   08 Aug 2014; Sven Vermeulen <swift@gentoo.org> selinux-avahi-9999.ebuild:
   Make 9999 ebuilds EAPI=5 and transform to make master for version bumps
diff --git a/sec-policy/selinux-avahi/Manifest b/sec-policy/selinux-avahi/Manifest
index c8cf80da5fd1..6a7bcb00230c 100644
--- a/sec-policy/selinux-avahi/Manifest
+++ b/sec-policy/selinux-avahi/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-avahi-2.20140311-r1.ebuild 383 SHA256 dc3074809b1dc3bb59a827aa5f7256ea114c1b4f3c321c8ed90ab24dfbcdff17 SHA512 0fb3a79a9007db462f88aad6e2c37af69b477157febd8561d600604fdf2ed42a3739928d263a889bab29dc9e312c1cdfe52d0a7e194e2abdb8eb532a2209faa9 WHIRLPOOL ba24e01a050d0bf551e74a52a9632a54a104c31158e6fc5f69fc07f385faee4dca5b002035e2fcb1850eec54a0fa877f753eae735788e594c62573653cbd87de
 EBUILD selinux-avahi-2.20140311-r2.ebuild 383 SHA256 ecc83f7b35280fcc3925d82f33e3d486a52d92f1d16b122bd413c80dee09c269 SHA512 b6f34958b018cb1df706838c75409591a4f3dccc62a16c5e625494c60239ba3f22309b0f00b4eb5d72a39b2c88417ae6a533b594da03b8d634b6a60dad5c61ed WHIRLPOOL 0276aa1dafa45925655669ca9d366a99f02cc5600f083836b1613d4858281e9bfba11f1d2f1bea715990ab080adf6999658d74e0ef6bce61829e42406f943931
 EBUILD selinux-avahi-2.20140311-r3.ebuild 383 SHA256 4344e40d0901b2798f7b851f5bdb50edd4f11dd235fa4b00e1ebaa6ff2d188ab SHA512 8124457951271beb959336c7b2f0971f7a27f4c274dc2dcc5a01f0e7c74fc76bc5c0312de016c7a3fecb4a7e8561e502cc46caef80f9699aeb284fdc8fd510e3 WHIRLPOOL 1a759d53d05914786e3e815eaaabec06bc008323d49a72841ac11e8aa2409e5ccf2f265d1db02d64a4aaf5634ee2063728ec4fb42bb62bb0231689713ffb33ce
 EBUILD selinux-avahi-2.20140311-r4.ebuild 385 SHA256 93605af477673e80a64aedf9156832fb4deee6d8e9b59c7f66cf2c8c994d6f16 SHA512 e0a122ff2173bb56820e4ba3166561f60e44e242e89f3fe43edf4a156bdb58e1e7192c200380e10053ca5c47642331ab83611e49869c79afe3fdee5b4454300b WHIRLPOOL fb1fc22a501dc87d7e48c3bb8175018f22571f106bf43c2f37c1badad52fcb81c274c6e74fe752a6a96c6994148daa3dd52e2c5140e28f4e0a0889476619824b
+EBUILD selinux-avahi-2.20140311-r5.ebuild 361 SHA256 b1f0547f30b0d5b39e4a201162db3e1a53ce75042a0cf829efdfa6fcf01e0cfc SHA512 4d552a5274ac51622a7d142cd997a0eb41269ba603fccf57fcfd4ca7b3a96382f5635fe5c898caee4fa5d91cd03ee8b6d019572bb77b0a541929815c099c23fa WHIRLPOOL 8f46046629d0c03b7fdacf770d592adda512a8062729fd38c5199a56c63e3909355e39fb64d736ff0d5ed4b5aa6548a5df4dfc3814cf3ef4b297daaeb60ed14a
 EBUILD selinux-avahi-9999.ebuild 341 SHA256 e01dd1a437e1db6ea668e920451e3a7a93eae986d083e92000f3f516d091cae9 SHA512 df54b661c4733445376b8cb572faf2195fad8ecb8ba7f6dc8d1a39560f1110b4388f8d9699b08b949488fea673e472b70bc023b1267936adbe00f58c359790ad WHIRLPOOL bbaf5bdf1cd3d3508acf1d1033f645a80fe270c7cab2a135966431ea8a4f3b7a5862d1d22c0b786155d7d776b7a1070a3537cc5abe3f6627b3d833dedc0c1483
-MISC ChangeLog 8291 SHA256 165f14cdb77a900580f3e8900279a390a9c69521174724d0481e5f17aa314cfa SHA512 79dbe2c1a609682904870708d367cc2bd8cce88e1920b9cc16dbd79844f33ce2c1c3e61b97374fd0f9f87596d4d1be4c99ab49d98f704af272244e29613a7f3b WHIRLPOOL ffbe962038c038433fa3fb8b1b5507e569c09e241c1ed3deddd28da3cde2aaee6e79db1569983e1c0797476bb6758ea408002d4320b3349f9d3694fbcea4ed69
+MISC ChangeLog 8481 SHA256 047093ff6951400a60f344682eb3472c934444cce60b202594558dfbfdd0c30f SHA512 81603f64a0af7b40293bf7423926f13ddfedbf553937982a7f785a890269fe6d4820afb2734e80c0cb47dc0994c5dbce7a722965639f0b8fe8cca0276b12a05b WHIRLPOOL 0933f3df9ce1637011026c61a89ad79230ee6f9df64f4c5237a44a962bd4ed929d4fbcee3b43883c1ae2f677c0120840a63d054196352437ca183f4f3edadd76
 MISC metadata.xml 229 SHA256 ff40d6aae0bafdf7d94c0f5931100bcb25d2d8c53d76d0ee1e7355681aea3d77 SHA512 e3cc6d71e47d64873b54fdf45a7d83686f5043d5e287ed0e8f290b0bef42aa8f51eb1cd4e44de82007507a4ce2df895770017ff41425a0a7238c8c38a3ae655d WHIRLPOOL 592946e598e7bc76303150ead627efa9bb6f3b079bc2e78a384e8f74dc18bfec74ff8c55354e7e37f7b753f5c953e76fe5fba434d685d83d53f88490503f438f
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0
 
-iQIcBAEBCAAGBQJT5RxaAAoJEC7dUkA7aK9Hk7gP/i+nPdckrPWAZujObSnt1dT/
-7wA2kLyVBXj9f8auJwcAypgXEcaMjtJoDzNUBEnRfSS9299c8bisU6uVkVlNH5m/
-sYV2+abCwT10VvqBRaXfMn6jZHCdkqOpLaUaFZO6DEq4ICAJeDSsnX2abEzVe3Gr
-xb1e0aSU5Tl073s+eoCjYXALrhBnIY01NwWIXp8HUZGwFLAb87J1LA7vijj3rJQW
-3asqdGHwQR/rtKzuOC7D5NRzCbtP3wNRG3Yzo+Yx0zH+DXVQ+jbe7oIF5lJjVmR1
-sLcZ1N/bQGZlbkEgcwYivxc3N0Nahr3dfHo5SEEb/SqCLxpjz+lNrzhn0LyFpOrt
-9MWn5m1r0iZ9uQJnBtwd2XTL5mo21HQddT2Koh+5+2i6fhp5WuyFn9w4ZjqnbJHY
-F+mTy2qRcTfn4OrY/F+DZ9BnSTWZAkIMFzaZIuDhW4Ukyn6fNzqWXXIRTKbcyKtc
-x4wJGjQkQgMZvYqqZaYC17Tmio8paj/6k0YC7wOHG2uwM4ekvAukmF2Q+3xsjR62
-xr9y3pY6RmMX/cctpeQwEFO5NRitsbEmVslpMhLrS/LHMBPJKI9QywKiN3GHG83V
-DtCPP4FrMn01+PZtWggD1C3MzMQjYSitL5bGOtf8Y8D7VgDDUG0vEhLfuTjgBo7n
-HUQw9LPKzZGcL4QjVMmx
-=BEUD
+iQIcBAEBCAAGBQJT5ngsAAoJEC7dUkA7aK9HI0oP/27RxMV5tyYbETDLayskQEMW
+9SX0qBW7NZJ/YaxCVYkRZyr9vp+1Rdbv0j78Lr80f5YKKcn4hc+FcijXFfK9rBWz
+pAusk35rS6X3zOa+sJx95swuoBAy2XQrblf7z6EBSl2Ne+OQAI6Bl1Ay9psiNITv
+tV07uIleovKlGooj68sWKvwAJt8ZPlD/aKq9BschBfVgAL2YZ3gJIRcSo5iLhh91
+8GyQXKl8ukx3ukrmMt0lH/D9pguLmimEeAhnQHytfz9oGJ8+DJy4RGI5/L2D86s7
+mLcFB26Nmbd1njIACWUEc+aoZw9GI3Gi4YPh2jk6gqWioO1WcMsjTEyIEs0OeiP5
+bR6JbLUKPuCqI1+zukrX6h2tKtm+rtCjJr9704bxaf6jqdGIMIdR/MJhxPhhpxMU
+xWtkqKjHmC2WoUgsmPitILWBacCtnJ3zZcCCcHPyICvqlCA8s/d6nt4BvIUA/WlW
+UcnJYBuyqPfT/lakN71Ddup5Z3ymE3I079bKa+d6unjs0SfhJbkGuy5oqV4yAlms
+oiLSUCEPqoaqIBfXX4nIBBHYDMoSSM5kRjKruYwNJm3dpdOI06gUyaBxEKZno8jw
+dWjWNhbICgHpNWyZF1Y7b9rKJXQ2uLQcF5KaQgc5sqj23JBFXcBQx8J2kYLUjUQn
+8VYlo2m3syhpnKSUhdSt
+=EHzp
 -----END PGP SIGNATURE-----
diff --git a/sec-policy/selinux-avahi/selinux-avahi-2.20140311-r5.ebuild b/sec-policy/selinux-avahi/selinux-avahi-2.20140311-r5.ebuild
new file mode 100644
index 000000000000..c31eb77cb20c
--- /dev/null
+++ b/sec-policy/selinux-avahi/selinux-avahi-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-avahi/selinux-avahi-2.20140311-r5.ebuild,v 1.1 2014/08/09 19:34:17 swift Exp $
+EAPI="5"
+
+IUSE=""
+MODS="avahi"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for avahi"
+
+KEYWORDS="~amd64 ~x86"
diff --git a/sec-policy/selinux-awstats/ChangeLog b/sec-policy/selinux-awstats/ChangeLog
index 4fa0b3ebbcbf..3ebddf4ec00e 100644
--- a/sec-policy/selinux-awstats/ChangeLog
+++ b/sec-policy/selinux-awstats/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sec-policy/selinux-awstats
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-awstats/ChangeLog,v 1.43 2014/08/08 18:50:05 swift Exp $
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-awstats/ChangeLog,v 1.44 2014/08/09 19:34:08 swift Exp $
+
+*selinux-awstats-2.20140311-r5 (09 Aug 2014)
+
+  09 Aug 2014; Sven Vermeulen <swift@gentoo.org>
+  +selinux-awstats-2.20140311-r5.ebuild:
+  Bump towards r5 (fixes duplicate context for hiawatha)
 
   08 Aug 2014; Sven Vermeulen <swift@gentoo.org> selinux-awstats-9999.ebuild:
   Make 9999 ebuilds EAPI=5 and transform to make master for version bumps
diff --git a/sec-policy/selinux-awstats/Manifest b/sec-policy/selinux-awstats/Manifest
index e7c30cf145fe..408070051bcc 100644
--- a/sec-policy/selinux-awstats/Manifest
+++ b/sec-policy/selinux-awstats/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-awstats-2.20140311-r1.ebuild 458 SHA256 0beb22bbdad5e5d55b56700d118026b0d4a11a1abba3ebaac19e07a0c1b48878 SHA512 e901b1e68a1a9ed8e470eb3ba095660d623d7611a6fe2186eae3e7d8a6dc7ece43cf01f8802bb6f982ae3466b95a14cfba3c7d8ac234f0523838aee9cdc95160 WHIRLPOOL a311c431fd678edafb41de491fcae95bb401eac93c60a78332c73eb8255304362c2257022fd579bf56a46451a5737db9f4588e233f271ced12bb05046b9489ad
 EBUILD selinux-awstats-2.20140311-r2.ebuild 458 SHA256 d47eb419f4023d00653fc9db4c4d77302d735a064b6bfa7cd6e4ecf1a9768cd3 SHA512 2f2aa1bcf6ef04ffdcba07e8de17b006acc6e49c3ef793c03595391786564876e6be25ed303f722288015c57f8fbaba5ec268111dcff21df7f3c299fc6e3487c WHIRLPOOL 73833796621910a639af47ca2a307e5f0b06dc45495ccce8b527ccabfe6bf926df5df1696fbd448f394505e5532eb46f1fe2b00e29ccb1da7dc6ae341981209c
 EBUILD selinux-awstats-2.20140311-r3.ebuild 458 SHA256 0877d8f4380e08bd1b57116c786b80b0522a81eb8987fe3a5992345e69afdfd9 SHA512 4d2d655b8ed64ba12c0591653db063605624730bf43382c7bdd943cc3d017275375a0ccb895b3aeb723f4d4017cb755bc4687252ef0625cdc2f92332b31e9857 WHIRLPOOL ad3c713fb71ef399d753eef066a2388edea93effe9056ec45008ca54705bd23593cf1c44df8533d23f8012057872e7de7a75cd5112ce8136cd069d45e2ec0822
 EBUILD selinux-awstats-2.20140311-r4.ebuild 460 SHA256 e424a7555707a5d8bdf6faaebed009ea1404bcc5af1b1f9d1acd8f2da8265fc3 SHA512 dcb2e64907cbf7fa2458b3ba64d41fe87f09d6a2219bf7c8421a160fe3c6163a92101570a8beb016be2b2b6aab28ac2a11ac2f1ad4a2730989a66b2894262aca WHIRLPOOL 703c887aea7df3faa8569f2cea36b9615bb1e9f663c29447e4a7fae3603449e02d4f17a7fa5e12d7ea7793d50a339c20ec7fec29e58e8ae2ecf3c7eb38640b05
+EBUILD selinux-awstats-2.20140311-r5.ebuild 436 SHA256 26f01e8133458cc91891f0e7d593510ad8bc354ac39421a93945c2f816e264ce SHA512 3481156ca6907083c42506a4f45cdb0489342c1635f6cfa0ad6f4a06cb3b64d67e36bd55eac620f7a4b2c83b51de86f43431a104e86d9480ef75e516522fc057 WHIRLPOOL 013b9fc95762c627f1949972bda7c6f321c4b4aa76a97184716b104ac9fca6c8a9e4e04019c5dd8a9398d5e900491ed23381953e74ac2b321a22266c8f628ad6
 EBUILD selinux-awstats-9999.ebuild 416 SHA256 c6d31c77392d1769e299cdd881cf1ea94c97f850445436c6ec6ac4c224dbba70 SHA512 ed9cb0d39fb829ff1ee5362b995e6dab6a8a051b44ee31fc4e0686ed4d10e9ab74360129251d7f4db093bc885ae31174e6510696b8ea230c506d697b3f4b695b WHIRLPOOL dad885e549ce8cbe76d35d77402b9cf786d141623d63edf9c4859f408f5dfcfdf4f285d61e787c429557ca32db406ef327f336006ea66f66b052696a2fc35216
-MISC ChangeLog 6697 SHA256 e4ea2a606c2bb38700f34ea8130c49977ae9f00bcbf6d2e8f748f4b967c52036 SHA512 c421805747b6757b2f6b22372335d78a121757eb1ddd07fbb7e34e1fa48508fa298bbb04367121b38f73133bc16f9bfa75195bb8d2fc4e82401c8e2126b4b75f WHIRLPOOL d83c64207b040c56735050c8426e1c274cdafbc9c0797ce411df6893130eddad620d312616c0db4c12df12d3d4fe35cc6aa872faa387f9478b2f6a4496cd52a2
+MISC ChangeLog 6891 SHA256 84c4a8d10388536e79a2418a311b7fe29a8115e30d934a2e285f7034f424cc52 SHA512 4b465d18aad06d509419d74dc3a7ea9dd63d08a67834509b3cf7891e0c466831dd00aeae1bca502275dde860c2c5afee81d0950dc8cf1a5e291d86dc7df6cecc WHIRLPOOL d60e8d91fdc20f518b3bd8a69494232baa7ca768a09514025abf661512992f05a257839ed87ac6bc5fa4a947927ef89f2dd1437d3419c0b422b68cae330e8662
 MISC metadata.xml 231 SHA256 985c467a86abc9784413075f287ddf7c6686dd6af469252a8a4cdcfe48b676ed SHA512 13365a60681e3541bbd9e47df80942f73732e78b4703e79f4488d6661aac5432f817ea2f9f7e7d828c2ec52f690d2948fa90c7b0fb682a55f2e1cb8f384a9552 WHIRLPOOL c43e95ed609cb8d83d05e69408d2fb59a8200fa63c46aa19bef25f2145d5d9af9c9241384d889040aab149cf2637e848127c1c005b95a320815b1eaa84ade943
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0
 
-iQIcBAEBCAAGBQJT5RxbAAoJEC7dUkA7aK9HWZAP/1S4J5r39eAeihEiopUz21Vn
-aKhs68tLl95DmVYZSefBbQnnWDTiMBVLMcvF8YJb5nw7nCay3tFfgQj88d9kMNry
-YR7NxQOVjABT3P3Wc9/VwhMd0AHQEF3MccmjDFkfJtY2PxXkLIDL0M3ouhLoEhnh
-JDRqyyTIHv/MYjWBrBqhFqukdO2KoRWHLXMVmOaVaMdzYD+8Ucg8PiK+LrEF5Uph
-cvNnU4ixgQEnRx4sR1CQ1mU2p8ujubdfSSN672261xTvqiBd9fN8feec3N3ZLgOw
-GUtoWd7tQ9bztcpOk196eD1hYb6s3UUrHlY5Ypu/CYcgcHtxJ2xFIUKrqF2wrU0C
-7TUGYPwt16BovFZ3IDemukZDV4mKbw9dq5oNP1AUCDae4jlQFuZx3cIdR3jvbisu
-qxDgJhAwBm/3Cgyl9UAZbvrBn6IBihMAj+lOMevQP/5/h/aACUrt1/38DVfTFPmF
-nRR1SNX4hsimyiTRL+qPQwwSV6OdXjyUxkMynjDynRHoJkG/vD5nr+2e99EKWTMe
-a3aP/OB1yoaJ2t6icJW//Je80HeM00WkzwAI+M+7xbubTZCPNpowXgEW779HH/pk
-ippEsQI1sE69Pkw8iWJgLM2VReZjGzeyjRlNKijL+sK7a0Dy9LtxQK16mP18ix77
-4h8C+g0IAW+24txWoX2C
-=ajP5
+iQIcBAEBCAAGBQJT5ngsAAoJEC7dUkA7aK9HLQYP/RUtszxJhVGY89WDYfsAeEh9
+mam4C0J0V6Yk9q+TRmUaHiP3Ybllyy6PlzhE6OOoKpooBRGSfGCpq2Usxu8+3YtD
+K70nQ22ohxpdAqFv4Ww9cOA6GA5rI8XIIn71PUZkZ5MJbY4mpqv5bWaLai3zx7H7
+BWI1+pDuy4bSlmbc+n2XID9ErD/JiKXm7+vPQH66+3HmwyLJuPMI3juJo0b+QU/b
+wUcpRusUWYP5S9pJ1tHO6sMCXFGsXXEKVdURq4xzHwyH1vibLvheAQAllJQ4oR0p
+kzLVw1DIdQZDMXYtYDtq6dUa81jAzoXzW677iqS/AJ7/TDYpM7TbpTO2YJNfvrYA
+J5f2rLXGY55Rz5dF8P6cjcfPT6O+bUoH1OUA6+17XX5eDOpxDVBPvs+ullmp3B9q
+WJenhBt9xKCx1FJd2H+O8KNCqkkwyB4R7CEmqp8wmTVb5YZ2AcY+KPIS0RLG91pT
+Wwf0Mz4U7cf/A+7oDN+p01zOidI0E2zc/bJGQXwKwV4LOWkBNJf6fkmMIWIHvTrR
+dYo8OBOfLGueAyhvJd+PUQBoJrEyZO93s3ehyxdXGtQNOOnHlb+RyLRXnHniv3Cr
+QXMyF568TP/7NHKMNsmTnmJxb9oBY/HWIMaOvhYrZZn6PPhVKR3ZpKHIigZH5Wve
+gY7Pz492clShOsiGN3cN
+=yclo
 -----END PGP SIGNATURE-----
diff --git a/sec-policy/selinux-awstats/selinux-awstats-2.20140311-r5.ebuild b/sec-policy/selinux-awstats/selinux-awstats-2.20140311-r5.ebuild
new file mode 100644
index 000000000000..b6b6111ff7be
--- /dev/null
+++ b/sec-policy/selinux-awstats/selinux-awstats-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-awstats/selinux-awstats-2.20140311-r5.ebuild,v 1.1 2014/08/09 19:34:08 swift Exp $
+EAPI="5"
+
+IUSE=""
+MODS="awstats"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for awstats"
+
+KEYWORDS="~amd64 ~x86"
+DEPEND="${DEPEND}
+	sec-policy/selinux-apache
+"
+RDEPEND="${DEPEND}"
diff --git a/sec-policy/selinux-backup/ChangeLog b/sec-policy/selinux-backup/ChangeLog
index fed05b7f54a6..c96e897ae49e 100644
--- a/sec-policy/selinux-backup/ChangeLog
+++ b/sec-policy/selinux-backup/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sec-policy/selinux-backup
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-backup/ChangeLog,v 1.18 2014/08/08 18:50:00 swift Exp $
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-backup/ChangeLog,v 1.19 2014/08/09 19:34:43 swift Exp $
+
+*selinux-backup-2.20140311-r5 (09 Aug 2014)
+
+  09 Aug 2014; Sven Vermeulen <swift@gentoo.org>
+  +selinux-backup-2.20140311-r5.ebuild:
+  Bump towards r5 (fixes duplicate context for hiawatha)
 
   08 Aug 2014; Sven Vermeulen <swift@gentoo.org> selinux-backup-9999.ebuild:
   Make 9999 ebuilds EAPI=5 and transform to make master for version bumps
diff --git a/sec-policy/selinux-backup/Manifest b/sec-policy/selinux-backup/Manifest
index 3f4581578752..e6541c5036ec 100644
--- a/sec-policy/selinux-backup/Manifest
+++ b/sec-policy/selinux-backup/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-backup-2.20140311-r1.ebuild 408 SHA256 aca8253b597a9a587f37e4a43a63e84da885e46bcebebcf4d1cc06e560e3c74e SHA512 371b79f6479b408ab76bd65a6d3aa0df410b8c521de566267c87116dc46e36013f0db4c48469b4b77370a1193c6bd36c86bcbd866a21e51ea7f8ae9b2564a179 WHIRLPOOL 7121eb239bd24d24965189403ccb5d690eaa15da788771c369dc5484ad145a270b61a0371b24708cb754833e6f7448983e6cf9b732eb1edb71eceed352cc4792
 EBUILD selinux-backup-2.20140311-r2.ebuild 408 SHA256 4f0d52b8fbd58c90ab85510d9283c3cd9546bd79e5a8954c5594006fa7f2d7a3 SHA512 ba8a36bed40af2113b0ff0c0a2553bf1bcf37cf471b1c23c09439b9bf4b1a624ee3294ad8ca8639ca70e763f8595e18b7c98ade9dc65d28885d677a92e9e0eec WHIRLPOOL 237fb5844848d938f2e41dee864288fcc63b430af9ea5ed024cb820da8f4b94d5738c687d5b069bde6d4a47e9ea29e100354bb723bc7984a8289dcf6098305e7
 EBUILD selinux-backup-2.20140311-r3.ebuild 408 SHA256 2dac32e867ff27454d4d68f7b3603d2a4bf17bd23a63d1c27d0a73619457ea4e SHA512 44ce9be139127b4e05a89378e3efa06feaa8cb273a64de10613485788e93d380d29846df866f7b14c66d962e3c69c107da77e24c83a5a230b11d316fb20b7d2f WHIRLPOOL f7594e9d3b02ca1012d634b8374a6aea9a0774ad44c8d947bb3671fab44385ad619136b8d1495361c95fae6bd65fde8a10d35d0497a944cf8a13f363ccecd864
 EBUILD selinux-backup-2.20140311-r4.ebuild 410 SHA256 8a4b5862614518ad71b9e69cc994f85df8af0ae2b089b46e00df8d360ca7c0c0 SHA512 4d91bcfc77ed8fd05bfa06ce79e1ee3aa32a8ded7783c2a035f3cefd0da6c9950716a7743e5f763241928b00195e9ef553f71d298999f8cabd30ea820e057754 WHIRLPOOL 5d199759c0630715eeefb71902a238876dfe8304decce6a0f59605a98121c250bc2d753fe987185323c41964bdfc91671ea82debf8c25167812c43bcd99bc7ce
+EBUILD selinux-backup-2.20140311-r5.ebuild 378 SHA256 6c9857bd884b2812af946de985af6b591ebf74ce02864253a90e201106c990dc SHA512 0190220101670a132ca9b041ddb90365e09e82ee8cc50447d7f0d76b109cf5392c44c3030c60b62470474593c40fb4ff03a062ffd6b5b96852532f482ac27577 WHIRLPOOL ab0de44e5ffeff35c4c761c095530fc31368edad70971e0aedd375b4c15aef3fa285cf61057da8cb113fe5a38c375cadc6d251a18eee85f48f2b9aca6b1d49dc
 EBUILD selinux-backup-9999.ebuild 358 SHA256 690b24d5044e8190bec8f6e48e98c03349a1fdf37ae74a34e21b07909d40b04a SHA512 e807d93361a90f269f6098c0008e8dfced888b08c6a3165cd17b358a51eeb50b60e7957b1ef489b1345cb65ad8e56bec5af72dd1f3a0d6d6edea7ee9c48e61b9 WHIRLPOOL 77eb3c121bb5f4d74f6569d41a7bae00999c44f529fbe212302c3f1e6d93cd4b37c3754995c5a4b6e2bf702132d1bedb6bd1206c68824fa8dcd2e853cb632e96
-MISC ChangeLog 3215 SHA256 bad16ccc3253810cafcceb441492fee8b9edd9e075284f37fd7a13ea8972a671 SHA512 77ba879c08045cd6fb555bc245c6c5cdce24abeb3d7a0ffda37ae382d15865e1baa7bbccd9a95cd0fb1b26c05e23dc3038758c0b9b4af9e19ab8066456fdee10 WHIRLPOOL 55fc0067f7f12f911ea7bfe416f40f02cddd040ac4e2c0c9acdcd569c244ca68e7e601586a713160a262a5397404d4ffe252582f105b5cd9ebe9c69442a62228
+MISC ChangeLog 3407 SHA256 80c9141c2668cf1140398bf7f8817e7e61e2981b5e61fca0df5276ec50422472 SHA512 64adb607d591a81b9cd35e7bff3565d9008ea0e142bc50148e06e49d071af76b3bda5f7b9e55cb060b95c864669e49082c591d89b2b177022d3d6f0ddad1eb22 WHIRLPOOL d1cfd0cd69bbe6719db4fae7997cc64beb7ad520a5354636c5c69c7ebce9503356eaa45bd0756529795120a8e546f92b74d1b2e8a6fd89eb35ee5e15aeaeefab
 MISC metadata.xml 243 SHA256 e4ad06e7538b6bacfd0ee68de23ef56a6116bc0595686bc40a3767282f3a2bf1 SHA512 3eb9c5434cc00e3182ca2216eddeb2259ce1c91f50569869fac18f1eec9d6f582cfb81da94b1626260668baba70d26f192dc8baee100f832f8b2d0381fe9511b WHIRLPOOL 283779fce54862294b9279f2ba086530bf7a69ed9b73ef43a5f45b473740ed7d1f3fa5326750c79d4abb4540dc15e5bc902386949e95b534ef21ba5b713d87c9
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0
 
-iQIcBAEBCAAGBQJT5RxbAAoJEC7dUkA7aK9HlrEP/RiyiRuoQiM/2YPgZg6slNUu
-WiFwKjY6OwiKRteMHramKsZ9W7GLqJ6d9Fh5+UitHijfI9TuFIGHkceUobk9qzcf
-8CXIkaDo3m0QJNpBtP2tLpVQp7XfZsnej6aODw5MRNC8Gup1+vhlh0ptIXDwv6Be
-7h7hFfh8vjq6VhCGhhfbJmXRhx3JbUx0m2AXXHCThAeS7G2f9Q6qseHzaF5+RySY
-iNf9MzHqNuse994/EW6pYb+KCYZUwzei1Rqb4fEZ+kF5b/xzWPfvQ9FahOVJFc11
-X34YxtVLET/RWD5der1V+dxcHpQca7lFN1ADdZQNup8LsEKPT2sHAmMp9dH9Ac45
-w073WpOEJfPBTCixeVpHvgvxhTP/dRLobk9VJUvRJ+NLRKF22lSiQ0GRZGcGxiHi
-ywFzYNXgnJxFp9sbCrpY+VenfmxZzIZh4ZyJQENqDAckvjeavwveqYshamfeqwVo
-n9a00YwRP56/UQm4iYHEsRB6GoM6hUkl68pxeMdOAzyYOLTd6D6GX2MjtXR0VMxF
-qgTmrci2QTJrihL+fdMacm9J9yTBVXfhZFeeQEmKP16/UAjcWNz0eOt2H5EQzXES
-RLO+HG21ou1iZWTOi5jxBPszfDt8j9bfRfP1WEZyi575NlVil8NyA5oQVOSIAV+L
-v7UCRdBViKk3mt+Rias2
-=tIRF
+iQIcBAEBCAAGBQJT5ngtAAoJEC7dUkA7aK9HSiMP/15mdmTBXZK41PeNwZXAyBH2
+p8S1P+qi0GtD120pIsW7cFlsIyG1ioDE/etY94TronPEWI7Djkgwoz9VvPsBcZkH
+FjU+wnRask++K9xrY0UuwU3IIe8v1YF4eVHamnFdbUheysaQwR//3w+16o99y96c
+1NMaXOegoa0tPknCr3OV3rm3BO5QW48kCQd7ZB/yF4RSQ6B/m/Z63oFtp5lvrTkn
+90LKEgznSVmnoxXcAlh5GwPBz7xpzCu2X8xvD62r3ddeA5aI5rXvqrPDbiYRZwVT
+87aF6KVSgLAGHMkJT890wbYrHKJKM8vE9r8Xz7z8BmQ/fDgmoa5Pv6P3C1D/jve3
+3BkRYEVol2KlivmHeZ+A+jmEE4j2OM8JKMMq0xr49d8rULUoVoa6Bt08xXLVF91u
+lcFKNRE9O9gcNScPce9I73/tbx72jfVSRTfQ8vxTuujLNIxlPHKmY07dNXSefG35
+WBfer5QjkLmKgDUXtW6/XvRAzZ770JBlBzsF3UwSxJGKZ4EolBipmSR57RjRgEXU
+0ITbC3Y6+FjRRRJgxO4DA4axOgSctE6c2jgbYE9fivkn9lzefcbw4/SsW4Z9S6NP
+5u8HBW06k96C+VNI1vqMaOw/3Ywkl8sob3C+mcpRHvKNw4O+Y1luM1jZ77tMuOSj
+mV8tKS9RK1+gNE+eXxqx
+=Pf3e
 -----END PGP SIGNATURE-----
diff --git a/sec-policy/selinux-backup/selinux-backup-2.20140311-r5.ebuild b/sec-policy/selinux-backup/selinux-backup-2.20140311-r5.ebuild
new file mode 100644
index 000000000000..8f8414e5f570
--- /dev/null
+++ b/sec-policy/selinux-backup/selinux-backup-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-backup/selinux-backup-2.20140311-r5.ebuild,v 1.1 2014/08/09 19:34:43 swift Exp $
+EAPI="5"
+
+IUSE=""
+MODS="backup"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for generic backup apps"
+
+KEYWORDS="~amd64 ~x86"
diff --git a/sec-policy/selinux-bacula/ChangeLog b/sec-policy/selinux-bacula/ChangeLog
index d5ee1196a73f..b6b9a0224206 100644
--- a/sec-policy/selinux-bacula/ChangeLog
+++ b/sec-policy/selinux-bacula/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sec-policy/selinux-bacula
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-bacula/ChangeLog,v 1.39 2014/08/08 18:50:07 swift Exp $
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-bacula/ChangeLog,v 1.40 2014/08/09 19:34:44 swift Exp $
+
+*selinux-bacula-2.20140311-r5 (09 Aug 2014)
+
+  09 Aug 2014; Sven Vermeulen <swift@gentoo.org>
+  +selinux-bacula-2.20140311-r5.ebuild:
+  Bump towards r5 (fixes duplicate context for hiawatha)
 
   08 Aug 2014; Sven Vermeulen <swift@gentoo.org> selinux-bacula-9999.ebuild:
   Make 9999 ebuilds EAPI=5 and transform to make master for version bumps
diff --git a/sec-policy/selinux-bacula/Manifest b/sec-policy/selinux-bacula/Manifest
index 66bc248295b7..713dbec3574d 100644
--- a/sec-policy/selinux-bacula/Manifest
+++ b/sec-policy/selinux-bacula/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-bacula-2.20140311-r1.ebuild 387 SHA256 cef38e2c3647af006a28f94b0c8717e2edf839496286bd20620eb9275bd854e3 SHA512 7f5059bb8563b01865044510a3121ec934daab9e5e84e48fe43d40dede97f7eaf577af442b9eaad1672e887055de9a98f10bf8064e6024dab607216ffb7e72d1 WHIRLPOOL e0ec4181793edb8ac1a42e65073e1026d0124452026c660bc296c11be00d3a97db6afff60f3572b5f7b28742e5c3ea59e8230d98edeb227260cf5bac566313cf
 EBUILD selinux-bacula-2.20140311-r2.ebuild 387 SHA256 5e852fd477854631180188501a6dca2ed52432cc4932a2fd78b65e55f15f1d1b SHA512 095cbadc27f1f03a7bf9d0593dd437d66cf2c79cb83a0ec75b3701c760e791f6243896e85e22f23f816cdcc16c9e6f08600485c95b6f6b5d96939ff0f3ffcc19 WHIRLPOOL 2553756ca9f99a63fadd31c0d4cd61b9520e75dfef8f400f8ba3e53886960c20696d4da4e766e4895072625665adda2cbd19e82fdb98b8e3bbab139a52f82533
 EBUILD selinux-bacula-2.20140311-r3.ebuild 387 SHA256 44209b22bb002b08603659c194142cb415c0ae30fa84e720a51d5c3f9a2af781 SHA512 5bf2fe38eea2396a46d18fb2c5e0beb2dd5c9d80696b140f5fd33041779ac266924444ef4af80b8360345f182c6e551243733a1428421548cd3adf7877e3891a WHIRLPOOL d12a2bfc7838e8e9612ff830b4aa8b6757c713c6647daa377321526119ba1329844ad8568e04a37e73afa80bde3df192a1f004fbcd2608dbfeb00a8578b1f15f
 EBUILD selinux-bacula-2.20140311-r4.ebuild 389 SHA256 10fd7a3966fcaf259313e2382500e0e732330de6be4ee6e4d3ea192a36727583 SHA512 cd8ae973aae1fcbdf350d035c3c3983f2727629149f7dd05bb8e0450fd30c224a7e05ea648216286616b7cfe456cbd9c8187e845d5ece67aef90cc8cd7a7e3fa WHIRLPOOL 8cb63ae86e53c220a7ec2a5f6364f0bb2a2ccc7180e9a06594b6617007798fef4a656b3384fb99a61752f299b0cda151e6c157428d0f13ad9297710749424537
+EBUILD selinux-bacula-2.20140311-r5.ebuild 365 SHA256 d834d96a27d699d235adbc4a2a9a0a8758041f5457c05b01bb79887d03b1f8d6 SHA512 11d80f4b600a50c971fdd65017a73b033a18a11b74c446ccbfdfea9d99ae777939a7d18d37c4946b99f00208ca0c46b79e15bf4c9e5153cb2ef33b62c8c0eaf9 WHIRLPOOL ad258d4c2a28a9614abd16b9ff0bded3de4b167b3c514c08251036f1af02cf432f2c1caf7f6760970c2d309e3efee42ae2381b0b2ce8681f94826cd6db87442e
 EBUILD selinux-bacula-9999.ebuild 345 SHA256 0c928f3300ba36ee0335d249fd7430a964622f609667c7b3c95a965d802dd2ac SHA512 b80d019ca9bff8e7712100fde90bc964d0011b1dfba29e7b5456fb8a22aeae092cfc643934d8e635f13024ba6c1bb90d72098f3e6ec23a1843d3b487d4e7101c WHIRLPOOL e6a1f55e622469f39c204c29f8674084a8c14d439389de5c654f3d3368236a34b2e6d4694410a83d5336a692f4416e7161b45cbf62fc6e0f04072909d18f32f6
-MISC ChangeLog 6192 SHA256 de689b6ae6a123708dcd753082f63dcfd01022f74bfeaec0b2f1eb32bda16759 SHA512 dd4af71c86e3ab4dace28d26a7b964accd28d14944a90d1cbea41b10d13397322974343cee69851b3045a3769a0d6a26ab086da7707764ffb6b6974a7ad01bc6 WHIRLPOOL ac85d27165cb2be8eb273258e1c979f2d9b245a5c21cd2279edacb53c3babe3757dbb4ee0af39ab65f9930e949716ec5163694572f1edef2664315d2dd4a4225
+MISC ChangeLog 6384 SHA256 7ff64cbcb311113e51a89849a251d3f4c276c880f3dc7bc40e9ce66634b6f1ee SHA512 0826d6f10930166f7cefcc9ac4ef5a241de9f61651cc86279c40b4da6ad1c5ec84735fa104a120a2df195a40896f68a384aa74eb4592c42c60e15fca3dca2153 WHIRLPOOL e8fe3371fb0a9c691a0b5bd6f502d9fb25c80c977542019e8627e600a6e7fb7b428e07140d34740fe39d838ac75e8ab0dfbe7d1829a6fb98e12810646918a0ed
 MISC metadata.xml 230 SHA256 74f78a68d6fbb546f5a858118d84b5122d3f37475f7070432b90b97cb540c577 SHA512 5894c76c8b33c66d9f4fbfc693ea871e81d67c8c22247a69fcef6f6f76bb1a1c1fa9d892be6d1afa4ba9661e072a1192b09394e121500fef8be5eca0a9ebe10e WHIRLPOOL 5a1b2b50204f8c49fc9db6c598efd3526b7b05d3d6071494e80d3215c71eb3132bab8a21a39e2c90deddd4a1cd8873c14c5c059f8ef398c95964a044649411ec
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0
 
-iQIcBAEBCAAGBQJT5RxbAAoJEC7dUkA7aK9HAPUP/3747ReD+dntihrEycQzMU0u
-9RKhmAf/zRXHd9kcDZWuFIf6l5Oca+aDpkxMHSJpLPsusOu2qAAO+SsvlS5KdBq0
-WSfbJRtzZ6TLHBpzosN17cDkAfjtWKFNw9k9Z+0kGBkHeH2uGFtHwobWZTbvdWR6
-LM/lIMD/pRy9DaCfxAKB/fFNAstkhaLudJseVhG1C6IZgPr5d8WXehR3TTsWmYVF
-AQSZnBOnEmsWr6HUgc/Rmpdd6bakQ35P5DoHKT8fxO+mUC1dKGouWEynjVmfIuVZ
-wXL+RF8eBock2opVqbSY/iirw0PEkAfdwqZhpn0KHMAy3/iGOKxTuUkxue90ZtmI
-SC0YlPb4Mr169LYAi5ua5O5Sj4tP6xIV7Lc9l6ixbA6lseLub1bwjIwrw/2G2JBE
-WCgU/hBwAlZJgtgGDVpsm2nnCZY67sXa/Fv4oCDuXrqQEffkhoGRoe1xwbEoBaM2
-IDa67aDmE4WzcyJJWeBpPhAmCH1ivc5M+xZWHdVJPVH+7PLfF7XEQKO6z1nuJpCw
-Ij11pVPFwJou5humxJk/Ky24Q+AQrMtgq4nQnUVvYI4nsQjCyP1EJeA0ncmG3lxn
-xNrKbLLpdBwJGtHXhz8wZ1UrFkB4627OoTNJI3FS0OQem2hv/ClrFVNWJbiARIxw
-f/jkwscntoHg+drz9Pml
-=mDBZ
+iQIcBAEBCAAGBQJT5ngtAAoJEC7dUkA7aK9HHEoP/i8reOFUQ3VogOUYgxiOl/MZ
+q1BuCm0S/JGO3zZY2g6OPlrPLApAaQPhjZkQl3Fr2xKKYXWBkFZTnxPgWq599HnU
+SYtmGZFML7GlbMJE/HvWA6y6JBaTq4AnqrZ7RrVEwzbovpiTblrsCNfqzrX5XjTy
+zFreRq5s5IC3mmk4SzsI7lACvXFXLYw21JMu3ZUwoVZYgyLb9AJOJJl6274K6X0n
+dS0ohicxWkPMzCCWPy5fwFgT1WS9SbncZpXNUys39lmjflWhopPnHl0JR00NVfo0
+k6oM3FcK009lLS93BqFqlnE2gKHV73mmnIkxxCM1Hr2Il6Psgvg+DdHeQYn/xbKs
+6P/vfSW1saSBMCx0DNbRZYsqo/fyF0syLU06ij8+TUsIpOD9wemdhUAlJZZUKEbR
+sf4jI6XLhkqXvShLf52HERDdOwZKDpCpUhXGwIYsDG+LuVli2tkDjfjzFzxNQyQn
+JXXvnFeEve6tGeDKsR6Q7GDkO5bNyRp6MzuJCHXSeSblUJrow3WmcRVrCycOq9Gh
+Fv4WH7s8d2BU45CnGGVfFB4S4XPMCXFzlHxV6PqhqJBGodfla7i3kNNaOxa21DOz
+j70HLzF7yoQ2ZyE++Whg4yrjDnwtCntpqmcJnyhv4BKaaNB5+mFC6qKAwIXpU1mJ
+PSSl6JVK5JyFSS0+FYnz
+=9ePB
 -----END PGP SIGNATURE-----
diff --git a/sec-policy/selinux-bacula/selinux-bacula-2.20140311-r5.ebuild b/sec-policy/selinux-bacula/selinux-bacula-2.20140311-r5.ebuild
new file mode 100644
index 000000000000..455021b684f9
--- /dev/null
+++ b/sec-policy/selinux-bacula/selinux-bacula-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-bacula/selinux-bacula-2.20140311-r5.ebuild,v 1.1 2014/08/09 19:34:44 swift Exp $
+EAPI="5"
+
+IUSE=""
+MODS="bacula"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for bacula"
+
+KEYWORDS="~amd64 ~x86"
diff --git a/sec-policy/selinux-base-policy/ChangeLog b/sec-policy/selinux-base-policy/ChangeLog
index 528c3e02b89a..a4c80bab4c37 100644
--- a/sec-policy/selinux-base-policy/ChangeLog
+++ b/sec-policy/selinux-base-policy/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sec-policy/selinux-base-policy
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-base-policy/ChangeLog,v 1.148 2014/08/08 18:49:42 swift Exp $
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-base-policy/ChangeLog,v 1.149 2014/08/09 19:34:19 swift Exp $
+
+*selinux-base-policy-2.20140311-r5 (09 Aug 2014)
+
+  09 Aug 2014; Sven Vermeulen <swift@gentoo.org>
+  +selinux-base-policy-2.20140311-r5.ebuild, selinux-base-policy-9999.ebuild:
+  Bump towards r5 (fixes duplicate context for hiawatha)
 
   08 Aug 2014; Sven Vermeulen <swift@gentoo.org>
   selinux-base-policy-9999.ebuild:
diff --git a/sec-policy/selinux-base-policy/Manifest b/sec-policy/selinux-base-policy/Manifest
index 2d541d358de5..681c98f0551b 100644
--- a/sec-policy/selinux-base-policy/Manifest
+++ b/sec-policy/selinux-base-policy/Manifest
@@ -7,28 +7,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-base-policy-2.20140311-r1.ebuild 3842 SHA256 7ade39bc56c0f5709444348a4de0e8fa376c00bc073e3e6827171df88147c63d SHA512 432bf7d88c2dfcc3f52eaa2c49cf00f3a5b336a639536390745d69300830d0708f2707e962eeb62e2bd82065bce008f9f625b49a08a16e2c4168073c855cbbc5 WHIRLPOOL 17a2b8a8759adeb7e11024540e22261c33c2d0e5a39db89482379d4a18c3b5c9c7346b572393bacd615fa62389083bbae4a4a8ef5ab95f250b62262dcc168735
 EBUILD selinux-base-policy-2.20140311-r2.ebuild 3842 SHA256 4e8fd70bdccf6ebe7dfac5653f04daca037f6260a731b7843bea78d474a02774 SHA512 8b6c3ef63ddfeb2961a3cb485a472775056903698140b456788766eef410f89dadedea5331b0831f22e75390c14a3cda3be9f20cc57211c16f1551c5cc7aa1f4 WHIRLPOOL 434bb884e4818324c8fdc0a3e32b0472db759e357774fb3891248a2057d5f6f3c870068c6725641d706d812b6e84263950935ba97e0ca373dfe7816a30c5d9cf
 EBUILD selinux-base-policy-2.20140311-r3.ebuild 3842 SHA256 2d3062fef28e7d4c196d1fc58f67dd375ed50559f49f04a4813602ec5c62f9e8 SHA512 1c70c28174b19f5cbe133bf1ca2417054836f5135af4afebdcf2c286f5fec8cc235568bc95fc576f08fae00338f04ed09b6b86df4e64e9e2bf5d27e8b7a9ff52 WHIRLPOOL 2566012f7972999b05c570aa1faaee97b27c7f60c9c69488e5ed40fb19620bc4ccbad6bc59ebd8faeaf51d49c9224de6e6bec3c900eeb98674cd894b0489d839
 EBUILD selinux-base-policy-2.20140311-r4.ebuild 3844 SHA256 15b1a60872c468e5e323987b1d56a08f8839757a50e77d90822bebe3a8e4e794 SHA512 c3080b9cdfeeb59272d51aed107f3fb9823a875dc10336e0a65e13470c154c02a6905246108ffb85cff7324e745440dd80135c3129a0908421a9be9862da2868 WHIRLPOOL 8f4f17e533c628d9783c60049397aad29ecb6e74871842870e220fbc18360b5353fb311fb927e8540ff4f9d0c57748c5eb2d15eba4ef6561a488a34d262c7edf
-EBUILD selinux-base-policy-9999.ebuild 4065 SHA256 ae4915921d31b0abb52c2f0dcc55da037877658fa6d04eb2a82c24d99d06e4d4 SHA512 08cdadee1ab5f7737d55e2c58e05bf135d436bce9a33ec725bc90c188c311fd976b710352dfe7f0785a7340500bf55060ad7452c1bd9ebd94a52204fa866c10b WHIRLPOOL 1071296bcb5f201d9f270673afa21520fad169f8da043a69603f425227f1c18fe0baadbb4c4b32684100f782c23a422f4c57fd6dd6212d5342bf96488966c86c
-MISC ChangeLog 32753 SHA256 7120d25fa580d12e28da30e3964bdf143aeb6c639cbafa688c460a407685f183 SHA512 50233915f910f00d840f379ac2e955643d214fae4e3c2369ca225e96fc5c0b30f42219d52c805d15b29e64571b91069fda2dd8295b013293d3c32fef12588eeb WHIRLPOOL 7ba73fbc52e913e8bf0892b6e1b3f2e77012be8092fe0fae19f444ec00c2f062a1beaff7087c3417a1001deb012fc1e783a18be71f3dfaa2e49a7326aa6b0243
+EBUILD selinux-base-policy-2.20140311-r5.ebuild 4091 SHA256 6182d6e36be342d3e2ed70b3b039c1e22ef2bcffd92d0322ea525e044c0bbcfd SHA512 0d9317e7378dca6cd854ac41ae962bebc7fb205a791601cd6583b6e69614218125e46610949515a7bb38c7e5f11741999fce1a39209d3c4ff1883ba8b0f044cb WHIRLPOOL d9afe18c9c152ae5ce14f8e46eb6d6aa0dca061ef4ae48efd940150530a470086509cc46ef595f885804266a671b8ae5e399e92e50d277de2e784c23f62a9ba3
+EBUILD selinux-base-policy-9999.ebuild 4072 SHA256 08de36a14cdc2ed72a4889969db61e839a0b35d49fc3ef654e50afd8b2d2c4d5 SHA512 5f3df63cb7900c4e707d201ae9ddaf7630bfd3ad10ec4933a7c023b39912fee20d22324ab7dac8fdebb680e0c0a419e5ce57acfc4370493618d3f1a418f68340 WHIRLPOOL aa9bcc7b90c8606c91d8d236500cc0bcee4675e785dd101b3437e5dd999e04b83358f98d96112f1ca133450fc163ab4cbb3f70c859eeb0ab3a968175b23a45e7
+MISC ChangeLog 32988 SHA256 a656cc0bd580db38d3800817b020d3969dcd4ec03189ec9c3059b9c5c89439e9 SHA512 eeda3667a65bb290c11de1c2c0feadc3d865331d6c914c69d5e219dee12ca69dc72875c8712a981082aa1ad5010f0b6ddab3733e3c0f923299e3aa65388c1aca WHIRLPOOL f8c1b6b3d8c497a32cf72fccc251bfdb7bb97e8fa5f39b8f3afd38eda82bce90d312d9d0a6a2c8d63e8521a7eb8cf72996bb2ce99fe29b95925bd34c9388cda5
 MISC metadata.xml 448 SHA256 4babd5e53785136aa79ee0737a89af1fc49c4fc144aba0f6163d6f85215f57e2 SHA512 7e747c9dbae3eaee62a284824a68039961264540e0633e617aaabaeef2e83f4623863d29ee26c2e4738ac706d3824914f530f8e2b990ac7f06aa8f6e4cae9964 WHIRLPOOL 733957f76ca89c6fdd08060a368048276247994db56cf8325e69b896a07dc5e576ca124f3190079b169ec078a2e69156d4b12e6c6cc94328248705779f357bc4
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0
 
-iQIcBAEBCAAGBQJT5RxcAAoJEC7dUkA7aK9HpbIP/jCBHRTP8ygHyIC4mVl39/pu
-XxEnMf6BAkXWdSVQ7SEvAvvYfqQ0su1TgT1lmI6r4Zij8Kpp8a4WlX5KARJR7YaC
-xIG93OgY8HmGzNNgSLZPF++kNIqH3hku2Cm8yjkKX1Aofp2QtF1TuLpP5oj2Kpv8
-zQRtrN6R61PPQ+krlToEAGeA2CL65DqnUZvojAp2fNovsx+cc/y/6rRwpV9hnlxk
-nN6hhU7EGOb4N8Q/3nh5btnZ4fQGpTJBRHLAhcMPEtdmYB6BRqPewHrZraTBs16V
-76eokvrmVs2N1uIoqhKOWsYQc077Dgplolcxq3M5M3XmQGIIKVpUQAvVqjQcrMjO
-RWIM6fMNgq5OvSKot6FlLOzJWzgHO0aqQbhV/YRT2DEZsfps0hQk22Ymcy5OXpmW
-YgbHA/PBSLgoecucM1ZpcRzFHUvJZl5RAByDr83pc3VB/BIA7aFoy+RK8gASh+T/
-QF+f7JJuzVNAyFHpwU0TDO+kaUbA3IJG4x+qbJgt0jD/yYwvXi6rtIt+1lJ4FyZe
-oXmU04e9wAhtKTAFJsMIe0L5EGbmj/P6vtcJ7DytKQfiaRrIOUL+F3G9QRq2YZ69
-iP9SevTxw0FNqG9MwYnh8JVrcPVHJL+DXQViuH2yRTkbYFyW0Sww6kE16RWwNnnh
-weG/L7JAnGqfW3qbWjxk
-=Tu1S
+iQIcBAEBCAAGBQJT5nguAAoJEC7dUkA7aK9HnoUP/3CkDgcSse37S6BqQ3+giYDw
+fxy5pk9fm8YNigQ8Fxbsz6kRHgZ20rEOczB5gK2+7xSob9O1Q3xB+Omz6uFRCaab
+0Dvu8a4Wp0e+fc4OnXcSI95HSsjRqT6u9xPfkJKagrdLPqnH82SoJNbBXj3Mwx98
+rx2J3qyzKSOpnWQLWrXamMKcubFwMsUtQ17i4slzunLM2TYqlx3PFoHfuVGY/wq3
+2FKAHet5sAPuJlgr0jhBog1DZ2vTQjuWa46RVNeazB//oLxIR7KLpqUOkeFJaibq
+/OWx11jbxN7AxsRsxbvM2ilXMN4zaPk6KDYHSzU18anyoe5ZDMOdtHda0SXAVUhN
+cjWLEL2WayJSAxe0IjF72eQX+n9t5gSHjzBOuy0mMUCIsVU0OVcqz1Iqe7XzvQ08
+71h1lYSX1rnPJCWKStEwtPuq5OCWxhdzJSE/ro3E25MrcweVbBxD0b0DL22innzy
+H2BnNzdVDrcW8CYF3LP6OKGD9DcuUfyybzH6iRJizq7SPW+9eO5DRo2MbjmGsqIu
+z2QVhtNQoBx+ht6hl5YgzPvLB/u6llGQUVdjmaoZTkzRyw3EMYYFie2YHqTsUVzN
+2x7+atn5ICQz6K5VlSiVuU2qb2ZOIqEq6MXojwaJL5ER3r86F7khzKJEeVPRHvGi
+QOiVXntkzXNPRURjkr6P
+=syIY
 -----END PGP SIGNATURE-----
diff --git a/sec-policy/selinux-base-policy/selinux-base-policy-2.20140311-r5.ebuild b/sec-policy/selinux-base-policy/selinux-base-policy-2.20140311-r5.ebuild
new file mode 100644
index 000000000000..a203858c75b9
--- /dev/null
+++ b/sec-policy/selinux-base-policy/selinux-base-policy-2.20140311-r5.ebuild
@@ -0,0 +1,134 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-base-policy/selinux-base-policy-2.20140311-r5.ebuild,v 1.1 2014/08/09 19:34:19 swift Exp $
+EAPI="5"
+
+inherit eutils
+
+if [[ ${PV} == 9999* ]]; then
+	EGIT_REPO_URI="${SELINUX_GIT_REPO:-git://git.overlays.gentoo.org/proj/hardened-refpolicy.git https://git.overlays.gentoo.org/gitroot/proj/hardened-refpolicy.git}"
+	EGIT_BRANCH="${SELINUX_GIT_BRANCH:-master}"
+	EGIT_SOURCEDIR="${WORKDIR}/refpolicy"
+
+	inherit git-2
+
+	KEYWORDS=""
+else
+	SRC_URI="http://oss.tresys.com/files/refpolicy/refpolicy-${PV}.tar.bz2
+			http://dev.gentoo.org/~swift/patches/${PN}/patchbundle-${PN}-${PVR}.tar.bz2"
+	KEYWORDS="~amd64 ~x86"
+fi
+
+HOMEPAGE="http://www.gentoo.org/proj/en/hardened/selinux/"
+DESCRIPTION="SELinux policy for core modules"
+
+IUSE="+unconfined"
+
+RDEPEND="=sec-policy/selinux-base-${PVR}"
+PDEPEND="unconfined? ( sec-policy/selinux-unconfined )"
+DEPEND=""
+KEYWORDS="~amd64 ~x86"
+
+MODS="application authlogin bootloader clock consoletype cron dmesg fstools getty hostname hotplug init iptables libraries locallogin logging lvm miscfiles modutils mount mta netutils nscd portage raid rsync selinuxutil setrans ssh staff storage su sysadm sysnetwork tmpfiles udev userdomain usermanage unprivuser xdg"
+LICENSE="GPL-2"
+SLOT="0"
+S="${WORKDIR}/"
+
+# Code entirely copied from selinux-eclass (cannot inherit due to dependency on
+# itself), when reworked reinclude it. Only postinstall (where -b base.pp is
+# added) needs to remain then.
+
+pkg_pretend() {
+	for i in ${POLICY_TYPES}; do
+		if [[ "${i}" == "targeted" ]] && ! use unconfined; then
+			die "If you use POLICY_TYPES=targeted, then USE=unconfined is mandatory."
+		fi
+	done
+}
+
+src_prepare() {
+	local modfiles
+
+	if [[ ${PV} != 9999* ]]; then
+		# Patch the source with the base patchbundle
+		cd "${S}"
+		EPATCH_MULTI_MSG="Applying SELinux policy updates ... " \
+		EPATCH_SUFFIX="patch" \
+		EPATCH_SOURCE="${WORKDIR}" \
+		EPATCH_FORCE="yes" \
+		epatch
+	fi
+
+	# Apply the additional patches refered to by the module ebuild.
+	# But first some magic to differentiate between bash arrays and strings
+	if [[ "$(declare -p POLICY_PATCH 2>/dev/null 2>&1)" == "declare -a"* ]];
+	then
+		cd "${S}/refpolicy/policy/modules"
+		for POLPATCH in "${POLICY_PATCH[@]}";
+		do
+			epatch "${POLPATCH}"
+		done
+	else
+		if [[ -n ${POLICY_PATCH} ]];
+		then
+			cd "${S}/refpolicy/policy/modules"
+			for POLPATCH in ${POLICY_PATCH};
+			do
+				epatch "${POLPATCH}"
+			done
+		fi
+	fi
+
+	# Calling user patches
+	epatch_user
+
+	# Collect only those files needed for this particular module
+	for i in ${MODS}; do
+		modfiles="$(find ${S}/refpolicy/policy/modules -iname $i.te) $modfiles"
+		modfiles="$(find ${S}/refpolicy/policy/modules -iname $i.fc) $modfiles"
+	done
+
+	for i in ${POLICY_TYPES}; do
+		mkdir "${S}"/${i} || die "Failed to create directory ${S}/${i}"
+		cp "${S}"/refpolicy/doc/Makefile.example "${S}"/${i}/Makefile \
+			|| die "Failed to copy Makefile.example to ${S}/${i}/Makefile"
+
+		cp ${modfiles} "${S}"/${i} \
+			|| die "Failed to copy the module files to ${S}/${i}"
+	done
+}
+
+src_compile() {
+	for i in ${POLICY_TYPES}; do
+		# Parallel builds are broken, so we need to force -j1 here
+		emake -j1 NAME=$i -C "${S}"/${i} || die "${i} compile failed"
+	done
+}
+
+src_install() {
+	local BASEDIR="/usr/share/selinux"
+
+	for i in ${POLICY_TYPES}; do
+		for j in ${MODS}; do
+			einfo "Installing ${i} ${j} policy package"
+			insinto ${BASEDIR}/${i}
+			doins "${S}"/${i}/${j}.pp || die "Failed to add ${j}.pp to ${i}"
+		done
+	done
+}
+
+pkg_postinst() {
+	# Override the command from the eclass, we need to load in base as well here
+	local COMMAND
+	for i in ${MODS}; do
+		COMMAND="-i ${i}.pp ${COMMAND}"
+	done
+
+	for i in ${POLICY_TYPES}; do
+		einfo "Inserting the following modules, with base, into the $i module store: ${MODS}"
+
+		cd /usr/share/selinux/${i} || die "Could not enter /usr/share/selinux/${i}"
+
+		semodule -s ${i} -b base.pp ${COMMAND} || die "Failed to load in base and modules ${MODS} in the $i policy store"
+	done
+}
diff --git a/sec-policy/selinux-base-policy/selinux-base-policy-9999.ebuild b/sec-policy/selinux-base-policy/selinux-base-policy-9999.ebuild
index a8f7c8ae48dd..50a556548f0d 100644
--- a/sec-policy/selinux-base-policy/selinux-base-policy-9999.ebuild
+++ b/sec-policy/selinux-base-policy/selinux-base-policy-9999.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-base-policy/selinux-base-policy-9999.ebuild,v 1.9 2014/08/08 18:49:42 swift Exp $
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-base-policy/selinux-base-policy-9999.ebuild,v 1.10 2014/08/09 19:34:19 swift Exp $
 EAPI="5"
 
 inherit eutils
@@ -15,7 +15,7 @@ if [[ ${PV} == 9999* ]]; then
 	KEYWORDS=""
 else
 	SRC_URI="http://oss.tresys.com/files/refpolicy/refpolicy-${PV}.tar.bz2
-			http://dev.gentoo.org/~swift/patches/${PN}/patchbundle-${PVR}.tar.bz2"
+			http://dev.gentoo.org/~swift/patches/${PN}/patchbundle-${PN}-${PVR}.tar.bz2"
 	KEYWORDS="~amd64 ~x86"
 fi
 
diff --git a/sec-policy/selinux-base/ChangeLog b/sec-policy/selinux-base/ChangeLog
index 8bdaa3c790da..c8c956cf6613 100644
--- a/sec-policy/selinux-base/ChangeLog
+++ b/sec-policy/selinux-base/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sec-policy/selinux-base
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-base/ChangeLog,v 1.48 2014/08/08 18:49:22 swift Exp $
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-base/ChangeLog,v 1.49 2014/08/09 19:34:44 swift Exp $
+
+*selinux-base-2.20140311-r5 (09 Aug 2014)
+
+  09 Aug 2014; Sven Vermeulen <swift@gentoo.org>
+  +selinux-base-2.20140311-r5.ebuild:
+  Bump towards r5 (fixes duplicate context for hiawatha)
 
   08 Aug 2014; Sven Vermeulen <swift@gentoo.org> selinux-base-9999.ebuild:
   Make 9999 ebuilds EAPI=5 and transform to make master for version bumps
diff --git a/sec-policy/selinux-base/Manifest b/sec-policy/selinux-base/Manifest
index cc40b36b5ebf..401a2772bfe6 100644
--- a/sec-policy/selinux-base/Manifest
+++ b/sec-policy/selinux-base/Manifest
@@ -6,28 +6,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-base-2.20140311-r1.ebuild 4500 SHA256 f79b925d17d5ab4d68301ead1ca4f2372bd355fc3204b12c4eb24f67d4beaa12 SHA512 dfd695f5fc8085361e73e026606b35ed60d6714801a390375a6df7f82ef9333b3686aa6a288831ca0e91ba68880a9383e801ea9374bc0a3d032e2579974b6ba7 WHIRLPOOL afb40d421963cebe974336d29abb4bfa6397027736d735645b6d738ead142b37c0a056400b782f5900537c4b03ade39aa5664fb4c047dd2895156f5d1c4aec17
 EBUILD selinux-base-2.20140311-r2.ebuild 4500 SHA256 706f0ed52ae8617bf6d349daeba3dab3660dab5fc361c11f33779c0ab6562518 SHA512 97f8ea114ca4974c3f8ba0ae53cf12aa2e68a270e7e424caff49179024e27aa0344d1c9b9bf005709c1f79c53f384ab9ba9bd1d49960980ec885593916b221fc WHIRLPOOL c7b6bfff7047f22951693881d4117ec33f3bffa4ed2255cf669b9890f16a3b05b56d412747afe2b12ac7f65b11e65f1d0b4fa07d8141e0263a8d52e48c3658ae
 EBUILD selinux-base-2.20140311-r3.ebuild 4500 SHA256 b80c252890a682a023fc212e3fecb631f51d0315a52b1931732562fb1a9e687c SHA512 167a1488e191791e9f12bb3e585608625cb6ac812d5a3d6379f907657d1832cc472a626ea308be0c0f2d94c31ed0fa13749b881b79eaeb2dbb3ab146c0b2d2f3 WHIRLPOOL 00a345a9a7bf273326d5a84d659aa13a61d56bbd57fa12f07873315e06e5f7f29921cf673dbc4a8172374f54ae0bf875dfc3164cb275c791b4040833aef7413c
 EBUILD selinux-base-2.20140311-r4.ebuild 4502 SHA256 cf21cd4dd2f3edf00ec863a24ba10aec99e7abcd70f3eb011d84c9647f449332 SHA512 90c0a5fd5f0c1d694ef34584cdc84136bb441a8d16f75b28f8e52ff9c9eb4ee61a578a1aa10a5621d7f14460c23f54d231d009a9770368734cda74da2a882cdd WHIRLPOOL adc40163bc672d7f513d85e3805108ceb011c51e9acf2fce0d0b594e64d6059f4c45bfaf8972706af02de5413a80376ff531229fec1d3ffa54d764a3fe25b192
+EBUILD selinux-base-2.20140311-r5.ebuild 4899 SHA256 50e98e1fb4d071912fb383966a621962e5ac21137398a6e00c68549966a159cb SHA512 ead6eb24303f96125085423bc2351124dfeea66aa5e652afb6f6e5eb2a6f21e14f6f0a8abbae87101e9ef65b44ba109b0f76793ea89ab9daedbfa5220d960fc8 WHIRLPOOL c0335f341c979febb9522af0725b3b5d2fe04d06b73fec417ee94f8e00431270d0643ec64fe135fdb5bdcbcfde1a9c0f05881e147df55e88cd142de33703d204
 EBUILD selinux-base-9999.ebuild 4890 SHA256 4db861dedfca1f8ba059b8707512438dbe1ec2093139d57023e1d1326d80e9fd SHA512 0f0ae222f9066b107b96ff24aea4864d06ea8cfdda7d75de751cd8eb1191469ea45edcb5b32cb2b653990de21c1c259daf2848955ceb48f392c9cc0dbbccfd36 WHIRLPOOL 9de69e3d09da0124e59e61166c1d502bd174e0e4e9ee562c88996dc6d32e1c60bd5b51534ac09c0fe5f93a7630ec4bbe67ee6292d1391131c931c76d1b3a2598
-MISC ChangeLog 8293 SHA256 e49dd1d231e05394f7ec5ea202296a4a3652400884a1cb7be9d1bccd232a5387 SHA512 830b925d686cc44425609c485c59ba3d86e5f54317bce509b90d4b35802a895b09388c7c09c0afc0044af1e23249f71edd4e47d9ef395d87765c7876516df14f WHIRLPOOL 33babde7e0ad78a5aaa6305ccc81c76438ab183989e8a478a3e1e9cbed11fc023aa2496b931930252491deef833eb596e986767ca5496db0e3087b5be141ff78
+MISC ChangeLog 8481 SHA256 32024ad6a522a3a976bd4ddbab5133e40eebb88277420302929a8e498342f011 SHA512 e93c7026db9982e6da8a37d86a8de698c80df2b1ae09a27e003c20f85ebd1f2087d0b63f004fd01a0bb749e61c0adf50033ed4cf035b8ddfacc4a1832b68cdb3 WHIRLPOOL 6ae2be7d49375385a3eed9f0eead474b98ad7096388366e6b59a02af81949c94fa856c2defaf174010c2d5f5e788b7f4a6e107d335ec7b1248a840d4c8eb7bf3
 MISC metadata.xml 753 SHA256 2542c8e9c994b3b2699d601ba980a8daef2288b5ad199867764f607978ddee67 SHA512 d5e803494fe0831fdddada0f1f464c941d93896afa19d9d1005daa8a4ebea7b20f905e6d0d89dd10ff1aceaee0c7c41c190f16b68bf4466c0f75d3a6110b8df0 WHIRLPOOL cd2535802ffacbdae1ff1787aa203311330202cb08df488dae59b178b102b818766d2320fe62de3cf7710047e8cafa6a41963381655d9fd5fb4c75a232decd52
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0
 
-iQIcBAEBCAAGBQJT5RxcAAoJEC7dUkA7aK9HHlMQAKGPst97EAmRagxYj7/nWXPQ
-mUQLkDlmcw+i5E32BOOr1ZfRdR2YM9t6RH9ny2WpNwSTPF6fswGl+RxtsTX6hoBw
-giyq7vzhonlCKiPWimK8er/RVNj4+yylx7uQ6/d+HttsDTzXZWv1P+ckg2dzU/uE
-LYKhx3N5sHZkEQjdnRQq5ninRcn7GKFI0KNk5yPbiy8Q6X52Y6n79zM11iGy3bm8
-6Qp/L5KBRZtvjN8hkHSfSP0oOwIcctp0GfZJmnTDYdnl8EW5YltlonZulbYQO7iZ
-2hF+YRBatKXKOLq2ZvqtUUZd+C64DsBUAXdHlb2exeY6vpHsllptCBQiDKjtuXRl
-vJx/3rqPVccHy2tkbrobVsX+Uoefqo+OivUDVXcCTGvNvUySoxlbu0uJHcdDxz/X
-ltC7St5VmiHEvTEB5Da0V0iaNg1MwCEg3EHUCIl0B9FsGGJ+vBvqjKmyj2s4r2Fs
-qlrk1lWke7OmcRFSA/SLh6qqASc45D6e6uD9MNI7CgORl0gdEv8NjNnx9wKLrVQW
-tTDbFjxoJBa1Cs8DEofE03/4Kayg68VVa1veDfGVQ2+wirQ8We61iCnUsthYB5qU
-Vw0GrpUzFZdFYB7RQpJzvdHFHAM/kJnORk2xsZEjnNYlDsaQND5riczbPsUGJqHQ
-W2eW6cRTyvRa178SqxzC
-=91/K
+iQIcBAEBCAAGBQJT5ngtAAoJEC7dUkA7aK9HjwIP/01iAorYQwhIc0i1r3iYJ8l9
+fWbXgR7hNY3No9Eo9oYztHd4Nvp/pyuMNNg3p7qOBu0p5VtTzF+gKXGyt49o5yvz
+o/6kkNlL3Pb0ZIoRKQrs6KCbjFEY0q1M9OyyVuFyOs7rjv2LbZprxlJxEvxTxEVE
+5TcLLMl6iC3UycX0Evuyn73VMBi4w4nD8fb9HsCWK4960kQnTdZNKqv8VX6tRbU2
+TRzG+rfLUANdapah0rtYcmAwQ4YcyP1nig/S391fuHq7qhKJjw3e1olji/psk99y
+5tMnrtLrGl2kP1UpcJbRn/YJ8zT37ScW06ShHiKKHCGvD6U6UbzANnkW+nPVyIgR
+ujH2WPVlPo/IgL8SDc10qdni37hJsl1qNTmCzzGugNlUfQK/jecaBxttC2ZV7ASr
+H5nNaAQe2h876viCMOFTRgxs6HEPhb9WIjqF0Rmrxi7pknRjJtdGzokJnYpf8Mrx
+jDuEuZeLs32L8kqGGFhjIKjPhszkPM9lCVntwOExXJ0PqHCyaUwzxZj7k/ezdJdp
+B1x3/8ybLrupPEpoVuGF/0rWz2ENU9vXarx/Uc3wKRTL9oePfPNp0mBzxdaSlYgt
+qVr2/mFJQluN9xb55z1kMLOWezdOo//onGHrkQXdTChdqCKcBM+ZxTZR3CX4orGB
+xLKitS51vzSAH2K/5iSS
+=ypRE
 -----END PGP SIGNATURE-----
diff --git a/sec-policy/selinux-base/selinux-base-2.20140311-r5.ebuild b/sec-policy/selinux-base/selinux-base-2.20140311-r5.ebuild
new file mode 100644
index 000000000000..13674a037860
--- /dev/null
+++ b/sec-policy/selinux-base/selinux-base-2.20140311-r5.ebuild
@@ -0,0 +1,178 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-base/selinux-base-2.20140311-r5.ebuild,v 1.1 2014/08/09 19:34:44 swift Exp $
+EAPI="5"
+
+inherit eutils
+
+if [[ ${PV} == 9999* ]]; then
+	EGIT_REPO_URI="${SELINUX_GIT_REPO:-git://git.overlays.gentoo.org/proj/hardened-refpolicy.git https://git.overlays.gentoo.org/gitroot/proj/hardened-refpolicy.git}"
+	EGIT_BRANCH="${SELINUX_GIT_BRANCH:-master}"
+	EGIT_SOURCEDIR="${WORKDIR}/refpolicy"
+
+	inherit git-2
+
+	KEYWORDS=""
+else
+	SRC_URI="http://oss.tresys.com/files/refpolicy/refpolicy-${PV}.tar.bz2
+			http://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-${PVR}.tar.bz2"
+
+	KEYWORDS="~amd64 ~x86"
+fi
+
+IUSE="+peer_perms +open_perms +ubac +unconfined doc"
+
+DESCRIPTION="Gentoo base policy for SELinux"
+HOMEPAGE="http://www.gentoo.org/proj/en/hardened/selinux/"
+LICENSE="GPL-2"
+SLOT="0"
+
+RDEPEND=">=sys-apps/policycoreutils-2.3
+	virtual/udev
+	!<=sec-policy/selinux-base-policy-2.20120725"
+DEPEND="${RDEPEND}
+	sys-devel/m4
+	>=sys-apps/checkpolicy-2.3"
+
+S=${WORKDIR}/
+
+#src_unpack() {
+#	git-2_src_unpack
+#}
+
+src_prepare() {
+	if [[ ${PV} != 9999* ]]; then
+		# Apply the gentoo patches to the policy. These patches are only necessary
+		# for base policies, or for interface changes on modules.
+		EPATCH_MULTI_MSG="Applying SELinux policy updates ... " \
+		EPATCH_SUFFIX="patch" \
+		EPATCH_SOURCE="${WORKDIR}" \
+		EPATCH_FORCE="yes" \
+		epatch
+	fi
+
+	cd "${S}/refpolicy"
+	make bare
+	# Fix bug 257111 - Correct the initial sid for cron-started jobs in the
+	# system_r role
+	sed -i -e 's:system_crond_t:system_cronjob_t:g' \
+		"${S}/refpolicy/config/appconfig-standard/default_contexts"
+	sed -i -e 's|system_r:cronjob_t|system_r:system_cronjob_t|g' \
+		"${S}/refpolicy/config/appconfig-mls/default_contexts"
+	sed -i -e 's|system_r:cronjob_t|system_r:system_cronjob_t|g' \
+		"${S}/refpolicy/config/appconfig-mcs/default_contexts"
+
+	epatch_user
+}
+
+src_configure() {
+	[ -z "${POLICY_TYPES}" ] && local POLICY_TYPES="targeted strict mls mcs"
+
+	# Update the SELinux refpolicy capabilities based on the users' USE flags.
+
+	if ! use peer_perms; then
+		sed -i -e '/network_peer_controls/d' \
+			"${S}/refpolicy/policy/policy_capabilities"
+	fi
+
+	if ! use open_perms; then
+		sed -i -e '/open_perms/d' \
+			"${S}/refpolicy/policy/policy_capabilities"
+	fi
+
+	if ! use ubac; then
+		sed -i -e '/^UBAC/s/y/n/' "${S}/refpolicy/build.conf" \
+			|| die "Failed to disable User Based Access Control"
+	fi
+
+	echo "DISTRO = gentoo" >> "${S}/refpolicy/build.conf"
+
+	# Prepare initial configuration
+	cd "${S}/refpolicy";
+	make conf || die "Make conf failed"
+
+	# Setup the policies based on the types delivered by the end user.
+	# These types can be "targeted", "strict", "mcs" and "mls".
+	for i in ${POLICY_TYPES}; do
+		cp -a "${S}/refpolicy" "${S}/${i}"
+		cd "${S}/${i}";
+
+		#cp "${FILESDIR}/modules-2.20120215.conf" "${S}/${i}/policy/modules.conf"
+		sed -i -e "/= module/d" "${S}/${i}/policy/modules.conf"
+
+		sed -i -e '/^QUIET/s/n/y/' -e "/^NAME/s/refpolicy/$i/" \
+			"${S}/${i}/build.conf" || die "build.conf setup failed."
+
+		if [[ "${i}" == "mls" ]] || [[ "${i}" == "mcs" ]];
+		then
+			# MCS/MLS require additional settings
+			sed -i -e "/^TYPE/s/standard/${i}/" "${S}/${i}/build.conf" \
+				|| die "failed to set type to mls"
+		fi
+
+		if [ "${i}" == "targeted" ]; then
+			sed -i -e '/root/d' -e 's/user_u/unconfined_u/' \
+			"${S}/${i}/config/appconfig-standard/seusers" \
+			|| die "targeted seusers setup failed."
+		fi
+
+		if [ "${i}" != "targeted" ] && [ "${i}" != "strict" ] && use unconfined; then
+			sed -i -e '/root/d' -e 's/user_u/unconfined_u/' \
+			"${S}/${i}/config/appconfig-${i}/seusers" \
+			|| die "policy seusers setup failed."
+		fi
+	done
+}
+
+src_compile() {
+	[ -z "${POLICY_TYPES}" ] && local POLICY_TYPES="targeted strict mls mcs"
+
+	for i in ${POLICY_TYPES}; do
+		cd "${S}/${i}"
+		make base || die "${i} compile failed"
+		if use doc; then
+			make html || die
+		fi
+	done
+}
+
+src_install() {
+	[ -z "${POLICY_TYPES}" ] && local POLICY_TYPES="targeted strict mls mcs"
+
+	for i in ${POLICY_TYPES}; do
+		cd "${S}/${i}"
+
+		make DESTDIR="${D}" install \
+			|| die "${i} install failed."
+
+		make DESTDIR="${D}" install-headers \
+			|| die "${i} headers install failed."
+
+		echo "run_init_t" > "${D}/etc/selinux/${i}/contexts/run_init_type"
+
+		echo "textrel_shlib_t" >> "${D}/etc/selinux/${i}/contexts/customizable_types"
+
+		# libsemanage won't make this on its own
+		keepdir "/etc/selinux/${i}/policy"
+
+		if use doc; then
+			dohtml doc/html/*;
+		fi
+
+		insinto /usr/share/selinux/devel;
+		doins doc/policy.xml;
+
+	done
+
+	dodoc doc/Makefile.example doc/example.{te,fc,if}
+
+	doman man/man8/*.8;
+
+	insinto /etc/selinux
+	doins "${FILESDIR}/config"
+}
+
+pkg_preinst() {
+	has_version "<${CATEGORY}/${PN}-2.20101213-r13"
+	previous_less_than_r13=$?
+}
diff --git a/sec-policy/selinux-bind/ChangeLog b/sec-policy/selinux-bind/ChangeLog
index 6e3be1efa0f4..7480f8a40609 100644
--- a/sec-policy/selinux-bind/ChangeLog
+++ b/sec-policy/selinux-bind/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sec-policy/selinux-bind
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-bind/ChangeLog,v 1.70 2014/08/08 18:49:37 swift Exp $
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-bind/ChangeLog,v 1.71 2014/08/09 19:34:28 swift Exp $
+
+*selinux-bind-2.20140311-r5 (09 Aug 2014)
+
+  09 Aug 2014; Sven Vermeulen <swift@gentoo.org>
+  +selinux-bind-2.20140311-r5.ebuild:
+  Bump towards r5 (fixes duplicate context for hiawatha)
 
   08 Aug 2014; Sven Vermeulen <swift@gentoo.org> selinux-bind-9999.ebuild:
   Make 9999 ebuilds EAPI=5 and transform to make master for version bumps
diff --git a/sec-policy/selinux-bind/Manifest b/sec-policy/selinux-bind/Manifest
index bfc660d70b3b..fe8c6211c551 100644
--- a/sec-policy/selinux-bind/Manifest
+++ b/sec-policy/selinux-bind/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-bind-2.20140311-r1.ebuild 379 SHA256 57b79c7e64d48269bb502f9e05278e5d1f5a93736563cbcc43232084f107d161 SHA512 0b10074d3a13ebb9709fcc65980f7247c6552b81da65bce12533266593b3468017863872313938d180fee254f0aa742df37d0e674ffb68b47ef1001d09dcb87e WHIRLPOOL cf3a85a4f628cebdd8789eae4f0ef39adb12530ba5b7104d8fed68704cf6a830d11f9ba0654939176b37d466ed123dd6e5cb83496755794697e8340bd4b76a23
 EBUILD selinux-bind-2.20140311-r2.ebuild 379 SHA256 a99f93b0e563a853ad93034673671466163c950232150446268a50e119f4eda2 SHA512 9b88760ac65f7490a15bb16a7440d262a945e3fa36fa2894431442156528591b50f49950a6bdf56b43c255295817580f8b86c2c52d43743ba6345a7ebd3c4126 WHIRLPOOL 4111a1b2e0e1d121d8162293644c450416efc8dca94f2279ee06377c84c5e276d0412122d978a26e944f02abd5d58a2fda3748310d9cd7cf24840c6046ec317e
 EBUILD selinux-bind-2.20140311-r3.ebuild 379 SHA256 b7b3bf11f49e02e10fdd1fc745576b9d36b813d3892eef5f9a0b3625ebb598f5 SHA512 9a10a5300cba6da181f3f093c17d77a25a04493fcac51f62d3ba6fba2ee2685e65306e656678ef3d9cde97145d86397050684d97ea390f8024c96b3c281c7488 WHIRLPOOL c5aa7bee16af1a75ddbe70dccf923f9a6ee56b01dd8cc7d3fa09bc9b6c9fd8d8a0ef036404c7dca0c66b24358fe5884491b72eb1faf232e0f9e18569f81e7dcf
 EBUILD selinux-bind-2.20140311-r4.ebuild 381 SHA256 e99a7bb6f70c3682429a91fe7de42d68355de5383c68cbd00a39996a7c90a07d SHA512 1b5115549b3bac6fa69378b4fb96892e6419b91532b8990d3b04bb2d8ec9965435628e4571b0092292ec51e12a09ed66e05fcdf4a3d9c4de2efeb353cc968c48 WHIRLPOOL 329f6a87dd0c5e46630b3e4b0a97138f6beef899c6f615e6cd9b40d11d87c233e7c68b5ea2cdbd68289b7bc5c8ebe61d5fc85d499d24cbdd3a425b2795aa8044
+EBUILD selinux-bind-2.20140311-r5.ebuild 357 SHA256 59ebd82fd4eb97c6badba8c1c4e7947c1b727d8d590e21b647e79cd912750c9f SHA512 d5e37a152102439c8051229c6058f5a655088e3150a1b1cb4514b2996f63c57e66a6d5d191bf6ce46385678ce7813e2e29f9e9db7374adced43f1eefbc792469 WHIRLPOOL 97b888bc5db732ef05e02ca97fbfabd5fa131e662f9294e996c7711a4ad821abfd3e96c8660c00c75cc1714edc2680ec1d24c625fd0b6b04cf3a59d2af00bb20
 EBUILD selinux-bind-9999.ebuild 337 SHA256 caa0efc77c316babcdb401e02487fb79cbf97869016355ee6a8f71a9fcd02420 SHA512 079ac67a7b1477b409e9e30eecf6b23a2e6e10e581b42aec609f9a5bbca268934cfd2ee389f354d38da2b1a7372fd35fe93e84c0dfb7868ee436033f65b89d63 WHIRLPOOL 2a0b8623b379f9dab42db6f44caf76d4c711a316f122c403ea8dbf620ad63cb2e110d5edbf89b309df38f9a219e70085ddf09b2bddf11703eaf3e5ef8e77491f
-MISC ChangeLog 10491 SHA256 fd3d4cf60a7257b02b7ee9fd9f8ac875a2a30bd147eee298ed6669e4d34c51e4 SHA512 c0385e7f3064fb7b383c0c66c877762c8c96a9ce757ee09b7043f4efdc7c785f80db2d8638068d4b4557c2f74b5548800e996e47e32693408d7c788363a93084 WHIRLPOOL 08452c6ea4a71cbbd44ee20685b1b5979368316e98cdfc9773c09f014ada96cabbe2e3b623d2836d6174d44f6d4fb5c08d23f519bfff11bb19347bdc4745450a
+MISC ChangeLog 10679 SHA256 7c5ecb5c5626c8bffb98d0b47dba0a6cd8f1abf5331ec17951bcb07b50130946 SHA512 09ccec2c9f8b23198e2580c1c56a91c14e9ce7ebc752183afc3c693252a1ebe4b386c00aca188b861c6e434a881647b9f2359246dfc753ddbe6d63dcf7c810f1 WHIRLPOOL 30867f010889de92043df874dda8b4ea8e85a5bb8db32d86c0d3d9af20c33e26eee5b8f190da95f7508778f25ef657cbdf6d4d12003ec4cd2ef90302fff9a75f
 MISC metadata.xml 228 SHA256 21419d65f5be2754057b9aa594bd9213d747581af89c43805a16d0960b0538fd SHA512 959a2200074726406a9a0fa9a0032341fa94ede044c82c73b4313aef43d94ee3de50095df8c75ccb4d962692108a265116b4100f0538dcd2975ba9ab2b097175 WHIRLPOOL c38d97b0d6141659c2b415c8371ed639be8a2cb129a41f465fce5cea08f0c6896e4bea2721c43e1aadf82b876135f4ebf77503f6700480d606667d7ef4c51b5b
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0
 
-iQIcBAEBCAAGBQJT5RxcAAoJEC7dUkA7aK9HTiQP/33siQTEVd4VGXb9TTxDPcFK
-I0LnTJcqGfmUk2ShW3gdEyudxT9RZs+5uqcD6g46+mnrM00RA1kjfaigaZzfKoGr
-Jjv9Tl8Gf1xT5k6M/ruHqpF5Mrh0e1DyQ2nf6S8xQddxAXuQZxtoR3J5Gn8pWho5
-iFxsTwY4xh8z2BJst/FWu/wUyBD2P6lFzOdlOIqBUMIujKdHhvKUAJxrbYiq6+5r
-uXPG+72LYpgiosAmqxZPQU4/b6BxHW+EB2Fegh3ovGfhHnwv3n4hw2JLEiWBCqZP
-v+G/GdBgWgkP5rzphuf1wsEs07P4FPZlS49anzBEmK8xmXnuFNgl/I2Ir+WrXIVP
-+7+n1KDdT7PO9qDn2Znm4kqeI5NzI8KqSj4Dzg5aXY95dE2ONvkzG1F0gPMoa9J1
-CznIqBOtwAGiGaUxsldxdd79s56jQnPlOrQDFjueC8C6oGw5TsGNhOtro5fo5pBt
-w+JrmIOrVQDNPXZVKL78WfG1kH3c647lplGemL8JPAMxIcKK/EAZ/irYgS93/921
-JlIXnJBXjQehARIa33yJvW0yNQ2RHL97oAeJDLtFsXRSaBHU2USYJUG4gT2S5I2M
-aa1+ZP0Hztau45l7syJpqRLMFtFTjMvc1Sn4x5o2a0GQ2JZ6UsV2b+iTx45hvcX9
-Pkji4EebShQEhf4b/Jlw
-=Kobu
+iQIcBAEBCAAGBQJT5nguAAoJEC7dUkA7aK9HYVMP/34ZfdTlBmslshuBVzyqPRcf
+/pC6f3omHEdc+m9+9IrIC3vCRnLP9YGxWEK7iXfZpOTuz1M/dRL3fRRp70JZ8dDj
+QB6y5mqjCdcx2Hz0LGtaGJhUvvbCqSHPzd4bW/stCHbG+6OvYKf04MkfXeQO0S4x
+0CvvGzHTRQRsTMOaNh4CtodqWEZCcO/ttW+XENHjA4UHmPFRYfAd6EjDl05J+m4W
+AC2IOmefMkMSLNVVQ2YYNr/j03cpmT8ZvpWCQIG4ZgUuhkB7NhbXaa1glQ+pY5Uc
+ZWILy+jHNTlHUAQqiKVF+EmsohZ47VYwyfOtMnkO4hFdrw/9ELWc1MfWtRmX9fpb
+SbRx4gjU1Itz77aJRuqOpXdZVi4HnI/14mhJYdsPg5ezFeykEDC88gRZ2Ah6aEcX
+7DjM6CHFxBhgsPo+4KI3046RPSlNAcegVss2juVYANdd3UKgXv5ArhuZCbbpFOiX
+KdW2WMwx+lbEiuoFSGwRvMKTmXAsbNJGbLQ/hRmqzQIpKPHFZlgmESVK9MaLEaws
+FdWogpqLtpd9mXL/GLbjexrdtHVYhkyFzCEd33KB0jZsTzyoluMjzHozsNdFmOI7
+ETWbj3c4/04LTAafTJ0nb7l7SzPnH4scEI5HQ8viEZSLF6F9pp743WEIfcn4o81c
+zV6ZCAZ8tFdGZMCwVp43
+=t+xD
 -----END PGP SIGNATURE-----
diff --git a/sec-policy/selinux-bind/selinux-bind-2.20140311-r5.ebuild b/sec-policy/selinux-bind/selinux-bind-2.20140311-r5.ebuild
new file mode 100644
index 000000000000..61d79dd83a46
--- /dev/null
+++ b/sec-policy/selinux-bind/selinux-bind-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-bind/selinux-bind-2.20140311-r5.ebuild,v 1.1 2014/08/09 19:34:28 swift Exp $
+EAPI="5"
+
+IUSE=""
+MODS="bind"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for bind"
+
+KEYWORDS="~amd64 ~x86"
diff --git a/sec-policy/selinux-bitlbee/ChangeLog b/sec-policy/selinux-bitlbee/ChangeLog
index d14a5ac2cf65..7d83a3be5946 100644
--- a/sec-policy/selinux-bitlbee/ChangeLog
+++ b/sec-policy/selinux-bitlbee/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sec-policy/selinux-bitlbee
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-bitlbee/ChangeLog,v 1.41 2014/08/08 18:49:52 swift Exp $
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-bitlbee/ChangeLog,v 1.42 2014/08/09 19:34:39 swift Exp $
+
+*selinux-bitlbee-2.20140311-r5 (09 Aug 2014)
+
+  09 Aug 2014; Sven Vermeulen <swift@gentoo.org>
+  +selinux-bitlbee-2.20140311-r5.ebuild:
+  Bump towards r5 (fixes duplicate context for hiawatha)
 
   08 Aug 2014; Sven Vermeulen <swift@gentoo.org> selinux-bitlbee-9999.ebuild:
   Make 9999 ebuilds EAPI=5 and transform to make master for version bumps
diff --git a/sec-policy/selinux-bitlbee/Manifest b/sec-policy/selinux-bitlbee/Manifest
index 0bd3504c7024..c349e912eead 100644
--- a/sec-policy/selinux-bitlbee/Manifest
+++ b/sec-policy/selinux-bitlbee/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-bitlbee-2.20140311-r1.ebuild 457 SHA256 fc842bad8c42c81e880dd33b343a2624a4d80cb443281c75ae4bfd1d7a11b36e SHA512 5a62669a2525b3f0244df3585b3e98d68fc198e50924611432a3fec73da5c4562ce357cfdb1442bb10f3f90c0b3f441ae189283b6cd71f44e2a2138adff5c2ab WHIRLPOOL 7afaa3b374f3cbbed855be1f5d47c9456c488fdb94ad4212be038be6ff823368af9556e1ad02af6eef37d0bdc5ce2f7c54e4133aa210fdbdd986869b35cc9810
 EBUILD selinux-bitlbee-2.20140311-r2.ebuild 457 SHA256 6e3df8a545bb11cb6651e0e5a93cd233d687280fb141384b230c34b5b71a763e SHA512 95e2f345c5e89f208f4b0b06f8e6184ec6db4ecb210fd45620e1ac6383534698dbdf15114b346db5e7d3e60413e1077772365b2533484b171be5615b8887b07a WHIRLPOOL 71ee3086b1c5abe868c3c2e28c0077f23b2a09e0be730cd3c7b7d78a4b4155ccad6677165a866a46f694cc35ec84ff87ef76fd523516cb5242e30596eabde7a4
 EBUILD selinux-bitlbee-2.20140311-r3.ebuild 457 SHA256 f7d9a51dff34160397958e9e4ca0875ab990b0478660dacbfe832c6f069a0661 SHA512 de0c953cac268f6987faa2b630eaa66121a6382d461e16f4ebd12612016ec0161c8a1fb5ea889251cec534f3d3cd5766c581420a9d4bd7f33acbd1d12293385c WHIRLPOOL b2844043a8d69a804132511ad0599df485a98fcb794a54d971a3a05954eff50d001c8caa9fd47dba980d4ca3eb4c4ca85878e31903c88d340b7e62c2c5a5501b
 EBUILD selinux-bitlbee-2.20140311-r4.ebuild 459 SHA256 cf3c09347cb37ed7014ecff83da22df79fecb23fb9b17733ba730d11bc0ec96e SHA512 bc2a4c4f440efe837ee6430aa861650312ec297103763391d3862e4ddd5f968bbbca9b5d92acc07b569cfc2cd75b460474289730cb044c0ae6b385249a5f1567 WHIRLPOOL 068ea58044dedbd6fe947e24ffbcb68e09e98c49a7f1c6667501dcf11105be3c6e695e1d899cbb3d022e5baebff6a63e8244a51cae71a4f75abe1d7dad54e900
+EBUILD selinux-bitlbee-2.20140311-r5.ebuild 369 SHA256 47773a7538e51575a1afb2af6c912e640052114368a8812d848309753a0c562b SHA512 45ad8842c663676dbe30515570c85c25fd9071d4f67954fda9ae54b9282f22df4ac6243720c1b31b3b6b64e831e741caebb16d7e182c1ff27dcbe746f71f3b1d WHIRLPOOL 634d12caea1d1ca339188a641c33ce16733786eb69f92fb3134b42a5dc7fb4e97346ac5eb3b7d37b2f755147c3971f7b4d3d5b48f0149bb0b9ddb1ad2c2b256a
 EBUILD selinux-bitlbee-9999.ebuild 349 SHA256 cf6c0ffedbcf00bcd920635c3467edb1eb2f5f2002f36deb1a4bccc20ab09ecf SHA512 2c7bfae71bb88beb462fcc039e7afb992c6dae7c867dfb10d69d8196a6a9901c6789795df621b108aaf2bcf3e9d3b941a437afc8fba27d1594fd04de0e877da8 WHIRLPOOL 9a6ba836234154edebe729a654f8d5f3c2f1692da70f747290cc32ed3cb9d3e60e7d3cbb98e77f932c954fb63f580ef8b9564ed5bda2ea80652e2c41b413c025
-MISC ChangeLog 6474 SHA256 0c0f8677f352a888f07b8485fb851a09ba027c9e18ffbf2b75737022c11a2ac5 SHA512 b822417c24cd1e7e50134815b01876462f5a21e8783bf54a265cb1cabe04e7a4c6b16078ba7832298e4a583ebcf10ba31d26b9df0550303b52dc42123eb90e24 WHIRLPOOL 247481cb263128c07b05295f8f0e8e3e8abfb0d81b14782943044fdc18ee810d4d5b72205d35614a7fc1be94af35390ba460ac184c80b2704f4238f0bf0c9784
+MISC ChangeLog 6668 SHA256 d4172cff02d61eb9d917b2822c52e7b8a932bb2f7f63b21e6eb977049a79246c SHA512 1f007ff1dc3e88aee09c389e9ae307ef84b358add77634795033a46102e5b9436f9015d655bf2e2a0c0a27f16914e4f507dd51eab0900192776efb3b26220c7d WHIRLPOOL 2dd3dfa11879f5048eb1bfefca56d9bf5528e95acf784f43cc9f9a359563625215022098b41e67732baeb9b1c823c61e011ec1318a274a26f16a4ab0198f7fb5
 MISC metadata.xml 231 SHA256 5e68653d49ff64fdf68378823aa9df92da2f27cae84765999e044b235e309ae8 SHA512 664ee99567c265dd652d87e5f936c1cbc5735ade58b1eb728142bf881b3781f5a005c5d91a61b7738266098b22880d803e6fac2b9d89d4a9c313498faf1be57c WHIRLPOOL f77ea93bcf7ddfd5427bb0fd569bf592007766ee3f668ecc5b3fdfce64ec3189879946213c00f1d5be04f2b5ba1eb5bfdabaafb4513a6cbfaf2b8d5ded1257bf
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0
 
-iQIcBAEBCAAGBQJT5RxdAAoJEC7dUkA7aK9HvEkP/3ePa8W3O0xWTp4GJA3VeJB2
-+f8MAeiHs0WoqhHdQ2s5fXCTvyhuWQ9v9uLCFsdEfuiFCSMEV+ydAi/bPKv6o+oD
-cCCQwY84UHEkHP3R5LqnjngCS99tpOlQbJHJzJ2HF9cv9sYzRMGEr4IDwJxaR2Ru
-UPQKp7uje225QpH+IOGD1Dua8ICNhNPTV5rcX/KEAuaHm4VNy5NSPdh9rUR9Gtew
-YyBTEKuEFntUyuHxzEmjkQd0TvPscRaWFcToZ357bn5pcZcRxaKJemNzultsN0Ko
-OlFOtzH63bCFhP2rmr+2pvqWze59ODlY+uF0Y9CERcNoJ+ZwAzJug4NiO5+PA5HP
-rw8rHOF2Eeik+rEcoBP3QDJp7eAV8UuMNETsFvOK+cJ6zeQke8XMxUITETqRJUqB
-b6m0ppd0BLbRk9j+EfIAE04g+LWS+BzOZcAM4l7wxndt5GS2yTI6OEQQN28fzOwY
-twJdRGD3gYUXGU9i0NcVGzRRQ4S7lw7g4bQqC+UuAl3XFzitkbRX0hreqQdP5TQr
-+JUo8bYDTwVtDwC05NBXeyxkyXfakRXBy3xU7oYR8a00xYVN4/aNSlhDIUPHQtFl
-BuzrlVQp1Hb7ZcqWOnCzNoI7Mf+KV+ug6Q/xNqDFO301qYdOX9CAyuO+aZMXbgvB
-55zjClcAn/Wm6kCrQ/ut
-=FKYH
+iQIcBAEBCAAGBQJT5nguAAoJEC7dUkA7aK9HG/4QAIJMPBPj8cfHtFsiTltFQdpJ
+T33CtjciSg2/P2l9s6Au+8gdg/omti+IAOQqZS0qM4s61iRu/PTdk0J8pYQpsFGa
+oiHd0WL+qhg6WPr5RRGFYnKIpgfwW6OVlRBM4YrJZiNt5n9lrjeCo/U3vWsLVVYf
+99DySouZVMaWDa40Mf2V7zNffyc9l0MHhP6/hYur2ZhhQGoBgMf78Sa3EY0xmMq0
+4dGlt1lCuSoB8WWUxAx2CFVbJVlVnf1vXs3F8ySCYw1o6i4Kzhkxz3Wnol9+viq8
+1x6Frp5+rg7hKbqDJ6epZLsR4LHelyGsbUdF2YGuO6mJXK1MgXUP0nDVAAA/nIg6
+6UcLDug1OKyQysUrUIOJVz6rYBA9HXZIPsAVTXXojSIjIIEYpkLSQ1BLZwkzINSl
+PJii2t5eByKXnd/23/JnQJLoh/cJ+YZumEkvZvo+49ajmkxmdcx3+xB6E4zrdNN1
+QiEd0H9kKPxhFgEmPuzQ7OdR583AM3sTkLuuXGby6BubY9hipI6gl9LbtyGmWwt6
+W2ZjSfIe4Wz4Lnw8d2TTKHvFxhPjeR2lqZ97nVOroBKeC1gSrFr3zZSbCYaerhi8
+VBaJohNvqyMe/RLTsTwsyVTuLCeLaeK5N1IxuFo6KgRGUmUY0TfcuqqAK0+aEy25
+XiTJCPFf5w2HMDrgtk+H
+=GQlB
 -----END PGP SIGNATURE-----
diff --git a/sec-policy/selinux-bitlbee/selinux-bitlbee-2.20140311-r5.ebuild b/sec-policy/selinux-bitlbee/selinux-bitlbee-2.20140311-r5.ebuild
new file mode 100644
index 000000000000..f85f80297b7a
--- /dev/null
+++ b/sec-policy/selinux-bitlbee/selinux-bitlbee-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-bitlbee/selinux-bitlbee-2.20140311-r5.ebuild,v 1.1 2014/08/09 19:34:39 swift Exp $
+EAPI="5"
+
+IUSE=""
+MODS="bitlbee"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for bitlbee"
+
+KEYWORDS="~amd64 ~x86"
diff --git a/sec-policy/selinux-bluetooth/ChangeLog b/sec-policy/selinux-bluetooth/ChangeLog
index 63dea1cd23f5..725b1cecd240 100644
--- a/sec-policy/selinux-bluetooth/ChangeLog
+++ b/sec-policy/selinux-bluetooth/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sec-policy/selinux-bluetooth
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-bluetooth/ChangeLog,v 1.42 2014/08/08 18:49:24 swift Exp $
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-bluetooth/ChangeLog,v 1.43 2014/08/09 19:34:13 swift Exp $
+
+*selinux-bluetooth-2.20140311-r5 (09 Aug 2014)
+
+  09 Aug 2014; Sven Vermeulen <swift@gentoo.org>
+  +selinux-bluetooth-2.20140311-r5.ebuild:
+  Bump towards r5 (fixes duplicate context for hiawatha)
 
   08 Aug 2014; Sven Vermeulen <swift@gentoo.org> selinux-bluetooth-9999.ebuild:
   Make 9999 ebuilds EAPI=5 and transform to make master for version bumps
diff --git a/sec-policy/selinux-bluetooth/Manifest b/sec-policy/selinux-bluetooth/Manifest
index eae434b0218e..408571bb7a96 100644
--- a/sec-policy/selinux-bluetooth/Manifest
+++ b/sec-policy/selinux-bluetooth/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-bluetooth-2.20140311-r1.ebuild 399 SHA256 e77af043814f5f8d65efe2799daad940cc0b6a890ba5452f06cdc0e87591575c SHA512 217f70f4e991633b423ef0088d82df17c7a1a483ea269dad8b753eb4bfec9e4cb4354046fa29f63cb0a3c66c72ed1e583a68fdbf441d638e0fc9ef551ef637f2 WHIRLPOOL 79673f56542ef5efeea6c4b0ba355a4eaa3dd2bdd3f3615e47c0f0deb51dd82dafe5428c81adee12cb1540ab48258920dee12d2b6183f1c3f6815927191770af
 EBUILD selinux-bluetooth-2.20140311-r2.ebuild 399 SHA256 6333d816f923461aa3439facf675014b53a42feb2c20733a71ef1da9805e76be SHA512 2ac8d64aadd83a4205a270c1efd83ff4c94afa4da21fabb5d5c7820b0a8de133aaa27b0e01a0e3e8d024f63af3e726ac750679262a88e298a3c908d841d47dd2 WHIRLPOOL a9d27e76ad5224e0a70f2e9b421dc318ccf6d73a7900d3351d69576bfc6595e11e6c45cf49eff916df8545e8b43cbf0674dfbb0581f2304a949fccd49714f65e
 EBUILD selinux-bluetooth-2.20140311-r3.ebuild 399 SHA256 b19f2debdac2574b63da76db496059457fd0d9c0d42e350afe79f4be4b6dd9ba SHA512 1c0729d2b0d02e9638669d87cbbbf4888d6ac2a257c14279e38bdf9d09d37b794186ccd73c97b6905537854d8bfdfca7f29f4b3096ea568a887cd4b40f3fdbb4 WHIRLPOOL 05b0e95d89eb87590e93d1521a6bd4ff290a23c683fc5cf422efff72cb95e8fcc207bfce6e74aa3b5e3eb99dc6ce9e5e87bf4cefd74c955175d0bae881e56f1a
 EBUILD selinux-bluetooth-2.20140311-r4.ebuild 401 SHA256 c2a1f2a92819db0527d520907ecc6d9233e246d49ed931053a53964d51e4de39 SHA512 25652c290852d6ca013f6f089cc76540e718e24ee5af188a0cd9990c48875cacab590c99f39caf975b1ece8927104f688d688907641b16b4ae89aa478d39d4e0 WHIRLPOOL 60b1fb2adb8c8a793a2ba5df712e03ed895838c4661ab73584173b2549be362835795f4c453349df8d5b79452557419bdb74bafa1bf7221f9c2afdf3106a8a19
+EBUILD selinux-bluetooth-2.20140311-r5.ebuild 377 SHA256 f2c24f0fb05b271cfa66636234463698e8542cd2bb91a7c68b57c7f1e95e0e8c SHA512 586eef828445d43da841400464112ebf3a9f1ffbc725777414e0aa3f4ffd0fb1405156d94f0c850f38c75facb8e9579bca8bc23756569409f3c7dfc0f3db2d4f WHIRLPOOL 20a9e34c0b211915a1ca57a6484f7b2f5e4595e05aa96b5c27113d4658390ac4a0e65b72684230738166e9299ed429a27e009c62241ed257c20a0918804d58d5
 EBUILD selinux-bluetooth-9999.ebuild 357 SHA256 5232106d169bbc4411e76239bfb079933cced8d0748d219ee9be47a063040068 SHA512 ba53014a19aef267b2c1d4cd55bd099c5ca0a205ac3422a054e9095d194304238cadf9e323908fb0bab1ca0f1e92fe03b59fe210c0d993451841878b6a01f30b WHIRLPOOL a1305135bf2705a2852c61788787ab47626dae1b4eef9d1d895917e36b152609135940fa3b33270b211c7e9856f517221c93deffa407dff2409cd15024b60d2c
-MISC ChangeLog 6904 SHA256 5c4943d8850c9719cc93f6e8bdae2771813d53ea359609cb7d94686463147ab2 SHA512 cab2bb6ab1880766cee06e88fb3080ce612328cc31f8158946d62986faa145817667a273f1ee4cb19909a969fa46703c2cbd8ce20f50d7b127e638fee21a47c3 WHIRLPOOL ab9e0a8bf653d16f9a703e109bb45da39073dd3e3f297d4582945a2bd83a96211d183ffec54e3f7e2d64e659c1e413981495a4bdbce4ec0f4d67a4839b6e5d52
+MISC ChangeLog 7102 SHA256 4ae5297d6bc9e5f7bea5b3d75fcd11ae239812fcea246ed961a2b156e0804dad SHA512 09debcd6125dca0a5e3b0eff5c2ac3e24c05c61412d2a94ca16ca87b07eeb50393428a93e5269f3fd0269231ae289d694aa7c6f9c71f0cfa12fc09f5b4863b6e WHIRLPOOL ff08d3014daf18ef1b0ab00bfd4fed547cc80142a8ad3b0f5ec63c88d004eab9f6408976843ce583cf1907f0c1ed17e396bb1326284a4bf0ebd014d975c0ba8a
 MISC metadata.xml 233 SHA256 0d257adf51bd6d77def690ece4e1ef7388e345dcfef34e6dc398a83a95c73db4 SHA512 5f4e9b3d081e80a04708903d8bbf04e912b5eccf7236734cda5f2f6bf3b3c7a6c195139d50c644c541bb5ba12665185c539466ba3bb1b7b1b4d0be5a7ec04600 WHIRLPOOL 40dba65f0b4babca1f63f6020028ae32990efbab6da1c6584529ac29f09d51df6e9af29083dd7fc6ffd8d605ac76da8b716af70e7d1b15b3d2d49fa46e568b12
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0
 
-iQIcBAEBCAAGBQJT5RxdAAoJEC7dUkA7aK9Hfr8QAIQeIiwxqRttzrwfWYVTGatz
-a+c3sehf+GfBb7ZGZKsGqRck8sQcHKzBXE98q0ARChJELwh8ouAxcKJrluqWgy2g
-FtqWjQqmpC9b/A34cP0AyNfw5ndfn8+hOuLAoLDGSApKCqB6beb3h+aLSVtSA/3m
-VAFC6UpB/1SLqUWAMujTvVXscrdf3qRhvzUVEryszyFmEX9sF0SJJRHh1Yl54hIl
-Rd8jwt5Xw4d0c67/3rl8cTTPrKGPdHwvDDBUVSFJmuK26DUbw8x6dt4BVLfgxf4v
-rAzUlV1OI9/MAg9I6eUi+0w6LKf1W05s6raLD74T63PhYSX6M5fcF1Kr616+HdSS
-Cn9M71ookEIYEMOD+iIPnDs2GdAs3D3squJOrJd0J5ytZ+0bQdyVWkiq8/RVx1WV
-b3NPDLVv6GYyq54UEIxvAVCLvcTeX9/GfwroRJT8NOG0L/SLOoHfPlcMet7/LI2/
-pkVNf+PTkQzqogh40+4NrCjR2CfWaaekHLeVsTHV0YRxR9hrRuual/mpavxUfpm2
-nbpaG9KPmFffAXltdRlbKsnGB6629JtaYxKaBupj4qXP3s/z/V9Dha4zNUxDC3n9
-d+Uc+aExY++fL0QDej7NzjVqxdTNEYO9znUHCiVGiqJYLGVCCRA7e1sLDD/3R+QZ
-vCFbLvCvv6ZWMsUrSEoz
-=Efhy
+iQIcBAEBCAAGBQJT5ngvAAoJEC7dUkA7aK9HGXQP/3hVW+44JTD4lhcuZCTu2c8U
+j99ZO4v0FAlyKrJMa6Bz1DeV4bqTKN8hlSBGQ8nNdWdbthjBqtejz58pq0ZTheHM
+kYGtIhXF9dx9bdK3W7+udrxrqyjGif+HL7+7LbY7ohrvRLICIbPP+K+C/mM1c6+F
+HGDWS4m0GPp2Qc6z9wYMEE6KTL8r4cz4PSjD+i2slLd41Y+xUFfFwajazPoQGyrZ
+Rkk+39vPi09YRW+d1CS5a90WdAMmoE6q8wkHnNBdA7swes1AFlezv7VT3UZ2cPuU
+lG4/BkbxsUUT/DF6Z8y74Qwi1q9upCve3WEfxW16v6SityounP0k3e/7S+XouVpp
+Rt3pfh3O9Lm/Z2AHXXzSrxqekNrhvzCz1yTEBqH84IvZdRW+52ZXXuBFy7f0CJK7
+YIgBPrjq1id8A1QNGY2IvcO1GEiFoQ2HQCBzlB5VWl9GAWn1syu6sraVmkWyFkuG
+AHAcr8U5dyarWiKe1SnPp2ZolK8J1y6ttPgMxNP5bOvOe9E9rj7Wp/vERdjz1iMz
+IH1qmUtEUmd/E4TuM5sNBDa3UpNoKewPfvXa8Vope7xZaeaGp9w3DAYSFmsH6PJG
+t8YVv965idiJk57OqVeBtg7Cjacgij8dJ8BU3dTZ04G0NniX5t8gfeU0g9x6Stiu
+pZV18NHJLUq4XuGWlenx
+=ad88
 -----END PGP SIGNATURE-----
diff --git a/sec-policy/selinux-bluetooth/selinux-bluetooth-2.20140311-r5.ebuild b/sec-policy/selinux-bluetooth/selinux-bluetooth-2.20140311-r5.ebuild
new file mode 100644
index 000000000000..ce6d7e015ef7
--- /dev/null
+++ b/sec-policy/selinux-bluetooth/selinux-bluetooth-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-bluetooth/selinux-bluetooth-2.20140311-r5.ebuild,v 1.1 2014/08/09 19:34:13 swift Exp $
+EAPI="5"
+
+IUSE=""
+MODS="bluetooth"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for bluetooth"
+
+KEYWORDS="~amd64 ~x86"
diff --git a/sec-policy/selinux-brctl/ChangeLog b/sec-policy/selinux-brctl/ChangeLog
index 2e2c0394143d..7112bdb3770e 100644
--- a/sec-policy/selinux-brctl/ChangeLog
+++ b/sec-policy/selinux-brctl/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sec-policy/selinux-brctl
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-brctl/ChangeLog,v 1.42 2014/08/08 18:50:01 swift Exp $
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-brctl/ChangeLog,v 1.43 2014/08/09 19:34:37 swift Exp $
+
+*selinux-brctl-2.20140311-r5 (09 Aug 2014)
+
+  09 Aug 2014; Sven Vermeulen <swift@gentoo.org>
+  +selinux-brctl-2.20140311-r5.ebuild:
+  Bump towards r5 (fixes duplicate context for hiawatha)
 
   08 Aug 2014; Sven Vermeulen <swift@gentoo.org> selinux-brctl-9999.ebuild:
   Make 9999 ebuilds EAPI=5 and transform to make master for version bumps
diff --git a/sec-policy/selinux-brctl/Manifest b/sec-policy/selinux-brctl/Manifest
index 3fd36d3d5c96..7b0c189fd4fe 100644
--- a/sec-policy/selinux-brctl/Manifest
+++ b/sec-policy/selinux-brctl/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-brctl-2.20140311-r1.ebuild 383 SHA256 1b21316fa18b33aa4335d93518c9f04dfc8c8d600e01363a67c6fe1c38c002a2 SHA512 5fde746a8556b4c1f423c2b8f47b57c2bb48ce53e6f677f013a7cb3bce9305043729eaba8972cc0177fb18383b581d9ffc4231302eae5f340fd3ba81f1c4eb16 WHIRLPOOL 325f3600153d55723e55b86b99e4f11e8cb65116eb5da975fdd98b62a0126b1c94723a59419e594dd9f395ba8e2834f1512ae5f4b213e47c68596d3de09de6ee
 EBUILD selinux-brctl-2.20140311-r2.ebuild 383 SHA256 fdf6448f7e12d0088de55ead332a0b8bc87f484f920aa67ec3fc56abdd6b5ee9 SHA512 630b0103bce8415546d4a8050b5f48eac24a75b47fe3c928d35a955f58a3db0c5fad0cd2421cf6f9bd964d2211b7f69f50f397b4684fb17bc0d7a7f3b11edbbe WHIRLPOOL 05d555b78db5693b4b2a106d641028411ee9b384c6b87079473a03131375e921dfe5f2787455ec98b490c997172f07d87427ab0601bb5ecca13acef4e1214dfa
 EBUILD selinux-brctl-2.20140311-r3.ebuild 383 SHA256 7fa8e2b37fd581a9a661dfd70ae7e78112a533bfec8a676a736af71f705e3313 SHA512 ed8550b697573f86a329a57326dc8b3ddaf79f45b86cb960cfa58f75c86c109aa32a1591e9aef5139285df16a1e56a7e971501d8301b0277ad168a1f28dd1138 WHIRLPOOL bb35ca3e491bfb4f34b025e3784eb8a72e2724a266626b53785c6dce5c12d49311fde9314c9d65d2c8f4576433f4b14c7473744dc5fe3dd2c7065dabb906f7dc
 EBUILD selinux-brctl-2.20140311-r4.ebuild 385 SHA256 1645024d3a3171ccb0efe773adcddf832971825f339aed3161b40a45d0e13dd6 SHA512 e9fdb02c3263e399a1685b20d32c11990e9a5daea632443ca3f577528754181feeaaea1c4be5069be3ab077af1a3f0341bb774b6a9861719e4455573a2a7a10a WHIRLPOOL 59ed0884566af970ac328171aa53bf46e54c607f8044b1f12caac97a3d9b63e661951b02e1ba316fb9e807715f380bea689bdc402ff19cbdba5cc96284a3144b
+EBUILD selinux-brctl-2.20140311-r5.ebuild 361 SHA256 7f7b26619f6ea300ddfd109d3a876e0272a12dd6b8649fb4b24f445251911aec SHA512 844ba953cfa94153ede6fb002821edf1bda91acad0c2aa0dfc05854734331f6a7d0b59764cf4f6e973512bcf5a14661f875c7a429b125ff9a57bd3fc95e86ccf WHIRLPOOL ce4b4c319aa4a7fa01447a0927d6640e9067402ad60b219e61f4e99998c444a102bbe9a911544c90c0ca0e5d148a8d5f185352d0a048d06fbcc4cc801607ade1
 EBUILD selinux-brctl-9999.ebuild 341 SHA256 07292400b7a02d22b515938ee10febc4918af6cfb3af4eb581457343089c9eb8 SHA512 8ce35142978f62ca8f1aa690a37697ec41295a45a1a3dd6ca377f755443d244b99581dfa3dc558221537aed7c4030fba7202064d87211660f45bb2bc09320f6a WHIRLPOOL cb0fadeaa5b407ef3d4560fa2d6016df2611fc2d88108529f2437fe22753646edaaee82756a6a5cc40c3debee29142ce8050d86cfaed0f30da393f5165509c7e
-MISC ChangeLog 6432 SHA256 d32dd7fee2d51f283cde7f2695a19f5ad2bfbecbfae461fdefdcea9ba8f47317 SHA512 7d12a75504fa9b6c15cdd87cb9611e18bc1d68aaf21f1a11535806b84deb0b16cad3cf9d513c57555dbdeb09dfa26f5985557c29a4252df86427dc026971558a WHIRLPOOL aa8f2199910548ec77b32536a421c98998ce3bf7a4db9d441011b7238ca7030ea1075ee8055c86b0c44c5d8016c4099798376b70954ec21d61074ecb75fd41bc
+MISC ChangeLog 6622 SHA256 2e376e4e87ad2c32afa48d7f42978b4384890a29164a0be75398a868514e3e3b SHA512 cae5ac07fab57f84272dd9489825a5aeff1ac4bd27cf68e341b402bee05833475fc7fc74cdfa2de292ba979ea11bd90a7edda0bfe2bb00ccaa20f4ee7057f843 WHIRLPOOL fce23780421c284d3c16237f7aaff7d9512ca5accd5a765bdad39576dc80960d42fae77cb8944ce40ef2a6ef19c8c6b06beba35543e5c8b34dc6d55e9c19f89e
 MISC metadata.xml 229 SHA256 a0ec9cf1430452ec8aed9b16fe283196deaaaf7a955385ce5479aec3c5b18e2d SHA512 ad9b82b8a8ffd83eeb5a8868b8b770e73c14f7375c404bcf2cafcf741da47a22477645ae11b23fd7f95e058bd05b2a518d89337aa7157f57018f99f39538e591 WHIRLPOOL f67613ec3973a8299e2d28b767d965358a15114d43e1c256b28e5044477bb81b469a576ba5ccad0b2eec503db2e2dc495c8cbfa3030196af01b828e2aa9065e3
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0
 
-iQIcBAEBCAAGBQJT5RxdAAoJEC7dUkA7aK9HSJsP/RBoR+GknOLEZUcLE11A3Wa3
-LRF8tUb/8NxPdZ8CsdvMYaPYqhbLgio+a5PB9cNw+17UogwQ+O3TLGlCD2PtrKg4
-obYHsRKBJUoZxVAIwfyKvbIhhoDx1KslPWM3UKBWY9SYXOychpGVFHsDxJb0+tK1
-1sFLKFAyugcPY6VLr8Hlang8l12DBzw4ID/vXZ3vbrG9rNW6ffYdhvxBrGXu4GQO
-T1kKrWB91kaeNvHHFf4E7Lwc8zGiqdcaUgmTcWW8+/OZ+kvyJhPgIREIxrmKIFwc
-rfJh/r/G3eQZP/RByE3/k/vz3WAc/sX9bQhYBW4ZY46uq9C5l/lqG4f6XjFUTh/D
-Oldpp0jKeDxoLAVNYPKNZdw+Q55MPlBc71Eg4yLYuryBJqSvyvGFxUNnfifKhz2F
-khIbyGWryrnQuU2MF8+jgbNtBEj1IzpYOBdzLqXMH1gUQHsy57JH+FEIYgBekyv6
-yBQiqaJyCLHnP0ZPS1Siq6A4RMCogjtn0QUw8hbAt7Ch7K8IH9S5Ornk6A4+1qwo
-ZAVEsXsZVq+L8BpIE2p7t7IhSS+/QHX++FuY/73m+hjozTA7JT6rvv6hjWt58E2T
-SAj7TVZh6v+2pPhCL1wIiNUniG/bd6zNxgwnEWPXHjVS0d0A2HuB1kZkNIsVhJuZ
-ib16tAyxHAR8wwZePqAB
-=QLO3
+iQIcBAEBCAAGBQJT5ngvAAoJEC7dUkA7aK9Hdt4P/1TkFDkue25ZHRT+qn1X/ApZ
+2dzN0F2goBmBU6pBH6TYRur0qrYiJw0q2DywYgfl4Myff5JftqVfeWC0L9ogVqNh
+MuXkbg9H3aVufYkl0sajswSxnaWLHPp+XXAs9d+34prAKLECVVycRx+BDU7pA+1C
+wi4H4e22B6ZB2DvP1dwCss9hX6SIDoLp4VNJaM2h/91M3JtilNnzEUq6U5LFSSGK
+xK9oF1qSNafLW8d9hSQoshjkMLT1zyT2pmKV29ja2qCUsRIH02G1dIMY1+Nn/tGz
+f0BOoNEmokj3X+npSsb8nfL6LTZ+CKAmPEiE5iRzHU7ylDMGMix3kz0AGwf5j3Qg
+2KSMJkQ5LnA6THpq8puANaWRha7ABnAk46IfHra8cGxF0FcMR8+Jw8k+TlVjwjjv
+tR5ZfEHN2BmR5YLaoOaMqpSbnI47SIvCUS/HsNtRRNsel5Rucbbhk621zFzC4JJ1
+/O1wjXS/WIoRIGpawsqRxb1u0QexsgRkH56fM9KjJYTlhMTWdfCUtY/XRnDmOnDr
+/03TVfT7yaXmcRMdNtOvI8No8bEoLGzFC7j8HyCMnKoPqX9F58KnoHpN4eheosyf
+YiX82YPRvghdMTkL4K2CIAiYxAXgQ+BvoEFLhsIEm9qoSl9uZ63jzBElMs1bxrck
+HVwf1WiC8zmtY7wwH91z
+=ESaZ
 -----END PGP SIGNATURE-----
diff --git a/sec-policy/selinux-brctl/selinux-brctl-2.20140311-r5.ebuild b/sec-policy/selinux-brctl/selinux-brctl-2.20140311-r5.ebuild
new file mode 100644
index 000000000000..3ec810acd46c
--- /dev/null
+++ b/sec-policy/selinux-brctl/selinux-brctl-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-brctl/selinux-brctl-2.20140311-r5.ebuild,v 1.1 2014/08/09 19:34:37 swift Exp $
+EAPI="5"
+
+IUSE=""
+MODS="brctl"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for brctl"
+
+KEYWORDS="~amd64 ~x86"
diff --git a/sec-policy/selinux-cachefilesd/ChangeLog b/sec-policy/selinux-cachefilesd/ChangeLog
index f9e61f8f5a03..e352dc8cb250 100644
--- a/sec-policy/selinux-cachefilesd/ChangeLog
+++ b/sec-policy/selinux-cachefilesd/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sec-policy/selinux-cachefilesd
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-cachefilesd/ChangeLog,v 1.10 2014/08/08 18:50:00 swift Exp $
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-cachefilesd/ChangeLog,v 1.11 2014/08/09 19:34:16 swift Exp $
+
+*selinux-cachefilesd-2.20140311-r5 (09 Aug 2014)
+
+  09 Aug 2014; Sven Vermeulen <swift@gentoo.org>
+  +selinux-cachefilesd-2.20140311-r5.ebuild:
+  Bump towards r5 (fixes duplicate context for hiawatha)
 
   08 Aug 2014; Sven Vermeulen <swift@gentoo.org>
   selinux-cachefilesd-9999.ebuild:
diff --git a/sec-policy/selinux-cachefilesd/Manifest b/sec-policy/selinux-cachefilesd/Manifest
index 76e49a85a7be..0aac81806ac8 100644
--- a/sec-policy/selinux-cachefilesd/Manifest
+++ b/sec-policy/selinux-cachefilesd/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-cachefilesd-2.20140311-r1.ebuild 407 SHA256 68823e899b10db0d282dfc5f05d5a75c5e37f78b0fe6c2485f64088158d47a4b SHA512 82eb86ba3eea2914ace637383c73552c2fad1f595c32fe86d662578fe278395d73a5f0dad1d3c6525c6f93e01cadd66fe4985a5dba71055c0665908f1bd330c0 WHIRLPOOL e40bc8841f0fdf2b56f9522c756051cc172df084c50d42d6e7d21ccaa1bed73b5d55cfee7c21b04978b0d9badd8d7cd0a6ee8bcc63bcdcef323be869130dd8b2
 EBUILD selinux-cachefilesd-2.20140311-r2.ebuild 407 SHA256 2f261b90bbc7e94957f1d4cfc5e55b009e4c26d5085c5c62d8ea417e56933a8f SHA512 bf791e1b22d2ceda623a16a5cfdd89c964ff9ecb3cb8e1173315eeb45c9dde625504cebb322f821f8919ae32018fde1ce70896a1f9d8cbbecf228fbdf16a385b WHIRLPOOL e9ea1eccd0c468a425d9d0e426b9f25ca6a6ccdc7238d4b659250cd07b762f01489f71c91c8e58f045c39b335152414d5804d5163d8fbb1a5954546813569d2d
 EBUILD selinux-cachefilesd-2.20140311-r3.ebuild 407 SHA256 571111f75a74e3fe23c33b7a8e92e782f3943e0b9db3f3eccf5c637e81b8e857 SHA512 28aa8e4c0b68b70d4b548840315c39e32c99d6d1c822d2c6feb081e130b5ac71a1a9454fc535be4bc202f98546d933235252a435b9065f21ea095501110adec5 WHIRLPOOL c36cdde06a48d473d9a8c5bdd7d8296931f740ee981b04fe893fdb417f15ebf5fe8b764191d383e28bddd3aba8e25b111621e7b97e751bfe61857aaa2970e25c
 EBUILD selinux-cachefilesd-2.20140311-r4.ebuild 409 SHA256 be8809044bc52c590d5a567d1ce1a5ea72f18bfb672dc61a6ef7e7f8effeac34 SHA512 ccf6dcc64fcddef12935b3edfb37a43959e207a0d98f277ccc70998bedb9a5e321ccdfb7a13f168501b283faef7cefb684eb3e1b37686ca4188d3b1e7b86e973 WHIRLPOOL c72ebf9863186b9a5455474af5d0393e7b5c5755f5feb262b3ce9e2f22d76cd4dfb5c7f9d5057785cd0f74d6d296a33e8887e2a792b8a7d54cdaa41f4584d473
+EBUILD selinux-cachefilesd-2.20140311-r5.ebuild 385 SHA256 08b7f189f3f790e7c9b5be3b10d47bcd29a9846c9d821c06bc02577c8c0c14d4 SHA512 426bc5af244415e0b8acb47a699ff2bc15f52eef524e74f9b7b6b29f96858ca0d7e1fc3b8e5951ad52078c2ea6df48ed8b6648d0486a83bc75c18b0b31bc5123 WHIRLPOOL 461836411f4443328c4d179fa76f3c26b211db13a3bd1f714d3f57a223b65e261f09149375e4eb221d1c3e013df72347a6ace2f99154aafd51b7e55be3ca7db3
 EBUILD selinux-cachefilesd-9999.ebuild 365 SHA256 b850722f77e96bfbba67454561659466db8f73276c26fa9efb03895d1e178167 SHA512 2cf1de41cc558623c6f23aa6029d788bb7b8f5ec1cca88d2fcd6baf97934926c6df7b9d1593d6dee23425730a792c4ee63f91c6a541cf5371153ac27292f6150 WHIRLPOOL 1d9df476728698aa2d439d764859c0b1c30a97433a059c57a9a5526521278d6c5a1215e5d1b6e9d088e6b8d4e7193d511ca7f0928692c064600f632ef99c4dc1
-MISC ChangeLog 1900 SHA256 2fbf53db51b0e53c47d54036e089252a6e81eebfc79f414e98f29502db4e37a1 SHA512 5dc12d8cd893ee61b1935afb09cde83c302a57ef6ecb0cbcad739de75c1202309a25d3f1939c4a708aee9c558933bd9371754ce5b3fa1de5f1a717b92d2cbab9 WHIRLPOOL b893d6e6d982246c8c18c20ce879e889f8e407af36767072ba2bbf55f8ff100d65f8525a63c1bc2b0518d97ffb934492e54539cd7d16d85c1acbea98f8eef62f
+MISC ChangeLog 2102 SHA256 2879da0f86e167835ddea3ad8cf7c344786138d35975afa06f0ef97d4c1b2365 SHA512 819033f3bb42e41376a38051c29eab8dd7a9dd2a66d8dcb229846595ff29e9b873c27105a9b1f9bad93384832844e1d2b1f4ce7478eecebda58a641c82946cbb WHIRLPOOL 6d05be26e6d0cc737237c164d2be1dd82decdd3a5368ed68dccf79a4f09a5d917b6a45264cb214cbae76f8ccba9455faf2a41e33c1abe13e795ebb5c799ec207
 MISC metadata.xml 235 SHA256 d047923f9d3aa96f13975bc782d49534c4330cd458780d515231aedf3c1e3c31 SHA512 79854b7b97f3be0502dd54cf1727b4db2224554cea75b32b202a356f8a0173c4ebf49cdb0a39c647bdbdea2f226e6b88daed09cdfedb85f2e23539ad3fd77b8c WHIRLPOOL 87bb9fbb16fe4e0143ddd084064d9269a45316a65704b2c3bfe131c584b7b457c5cdc7486221f11feb7758fbf64a7670b6c26301c48ae0555aed2a3e9ded59ad
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0
 
-iQIcBAEBCAAGBQJT5RxeAAoJEC7dUkA7aK9HMTIP/0PXMZjhV34BJmGrs3gbZ8I2
-5tdl+/HjZWO6GBa+Z7LgPJZnxWnPmZwUUJtbYaHt/ubxHcvYisxF/NM1meJGXW2S
-g7D2wSGOqJntfdsA/ULgBiP5nIrlIgKeha1p5pcnhCCUHFPglU9wBhSIwsZweu0o
-zkmXyQs/E8G7UpmeFx8ZQQa6pLU+exrwE57DNW2DlXGyFPn4F+kWCe1o13rNSBDq
-yWEioqQ6CtWzSHSXzGpVbuYZyzeIBa8sLq3k4KGd1E27kdfyJsIZv3Gc99/+58Jx
-rXp28PCulpTcgkrVRHrAmiO1Rsi2mCRTbKlWXVhPq/QkVe37LoYPozyl/hGLXaK8
-kE4jL7fKs3StTp0SHqzWe2isfe7IU280y4Xprs4BWhIwwjlurcF/LeWWstYSilLc
-OOzDB90rRnGMJcv46JYDVqLj3x5KY/UWwVKxCVdB5q2x7dmJV0MXaM0q+FpE3AAR
-V19qAww5L39cqoQPCRRqWTbkCU0f7ZZpetzK/AlUoRl3TS8yVlQMLlFEEJf8rMSR
-YJj8SwdC8U4Tx1PX+Hurjr1Bkl0cxUTHpjXN//CPslRYmAxvf3L3rZ/e0b2SrEGp
-c21F7vJIjrjzbKNhYExQN2HuhIVLXMiIVD4aBIodTU68IpWR+AiH0pNJRv1/TVUe
-f6lvQ2oIgkZhrD/bXPJJ
-=uaKr
+iQIcBAEBCAAGBQJT5ngwAAoJEC7dUkA7aK9H9BUP/iAUTWlWKZIxPFJrGiajOmKv
+jcpSeNbtS6LyWQRIkwDA/VWTBrZNhhTPzoQQMLA/OW5GbNeNVaSUoEw/pNo653fX
+3M4XslKrKkQSS88EN6RLyp+SRzZg0p3Q4eS0BlvKmsD6bRBJFDrpTpTVC6bWyzIe
+46zrVsMy/Sley27p8X8mhCc1+yrkuqQxRFB9SdYeQMJF6dhAoCbfoN6LTjgcpSb1
+LNdE/nf2iwBT+oV7yDeQe6rQCW0ar+nFFJElxoz/0VZi7S8PmzNGI0IOmFJiowVb
+6SwwZnYEJ+ExoN0wIqtJkq2u0iDYYiI1AOj4Ie8yJ+Gdq1Z0UOyQYR4YVGA4hRKN
+7rEg8H3WqJD+0VwsuNgcuk6Al6m/uPVeQnAhYfvrXrZExwucEBb7CJUUjZa1K+r/
+upB2Yl77I1g2SkfCsw9ogst8oKCYzFdMhzHYJuS14wZv/N9ubgJJb8dsd9kT65RW
+nWgFswY6cGe+2VBvaAI6OuZ5HaOaVOW/blcM+QvSxzcu6Qr6x/MtYfcv+Gd3rz4q
+EnaS3oqHgmGSeF/og426a2SzW9jguHaBstyIS9/ZQ+8/JR4EbJtotSvGW7BUOVO+
+Xo6UyAPX5BW5fjujnVe9wi7P4nFw62M15Bn82i0bPn4O//4Jth/PVJZKn+7SkfBw
+UeQm4CuWQo43nrTpT8VN
+=T7th
 -----END PGP SIGNATURE-----
diff --git a/sec-policy/selinux-cachefilesd/selinux-cachefilesd-2.20140311-r5.ebuild b/sec-policy/selinux-cachefilesd/selinux-cachefilesd-2.20140311-r5.ebuild
new file mode 100644
index 000000000000..5da068bd9e11
--- /dev/null
+++ b/sec-policy/selinux-cachefilesd/selinux-cachefilesd-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-cachefilesd/selinux-cachefilesd-2.20140311-r5.ebuild,v 1.1 2014/08/09 19:34:16 swift Exp $
+EAPI="5"
+
+IUSE=""
+MODS="cachefilesd"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for cachefilesd"
+
+KEYWORDS="~amd64 ~x86"
diff --git a/sec-policy/selinux-calamaris/ChangeLog b/sec-policy/selinux-calamaris/ChangeLog
index 7786467113f1..d939949a4ea6 100644
--- a/sec-policy/selinux-calamaris/ChangeLog
+++ b/sec-policy/selinux-calamaris/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sec-policy/selinux-calamaris
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-calamaris/ChangeLog,v 1.42 2014/08/08 18:50:07 swift Exp $
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-calamaris/ChangeLog,v 1.43 2014/08/09 19:34:28 swift Exp $
+
+*selinux-calamaris-2.20140311-r5 (09 Aug 2014)
+
+  09 Aug 2014; Sven Vermeulen <swift@gentoo.org>
+  +selinux-calamaris-2.20140311-r5.ebuild:
+  Bump towards r5 (fixes duplicate context for hiawatha)
 
   08 Aug 2014; Sven Vermeulen <swift@gentoo.org> selinux-calamaris-9999.ebuild:
   Make 9999 ebuilds EAPI=5 and transform to make master for version bumps
diff --git a/sec-policy/selinux-calamaris/Manifest b/sec-policy/selinux-calamaris/Manifest
index 9d51992f3066..82b4df945f24 100644
--- a/sec-policy/selinux-calamaris/Manifest
+++ b/sec-policy/selinux-calamaris/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-calamaris-2.20140311-r1.ebuild 399 SHA256 40bee3e4a32122da24310d08625f43c5a02286ba9ab415e2c53b708a38c3b853 SHA512 6625d18efdd01993a8487b111c233addf0eea82767ff1cf3f42ec49d12edff6f2d7c308b63e2d5fc43b4d97787159ecfa6688da02e6c990d4d4bc6b17cf4489e WHIRLPOOL 352a6760862a14c0c99feef78134570f4c3050be90ca56fcda529468c86a2a069f71eebf4afc450fb4324cd941ac25717353046c790f63f1ea953fc4d2b2c776
 EBUILD selinux-calamaris-2.20140311-r2.ebuild 399 SHA256 aae5fcc5e358103df50537cf91b06cf3587afb3a1affca6516e7bfc4655314c3 SHA512 c2865e8bd85518f28ef88ffb3c8d1256de0b1f00568577eb0b3474528dbe7ee09f96b3f796b60c6f7514de4f0beb6a2019d6193e0598d2951f900fff10c7675f WHIRLPOOL 2cf53db2b2413f1e750f8de6c62a27d3d0a91b002b8b97e9a6989b5471757ce09cc8e1d2ae8bc15da5e1c0018353fb0b2cf2bf829132f7f950dccea28b3495ed
 EBUILD selinux-calamaris-2.20140311-r3.ebuild 399 SHA256 b291c73f977d975a258d8e5ba72f3d4e68260bdb3420646630abc22ab1173b12 SHA512 edeab50143c9d29a407e5d565a026465651c9fe42151ddd6bdf427fd9e0b79cba9e757d8cecb2da20547ef63f28652388fbd2dad78263bb4f6435b0e5f1b6c34 WHIRLPOOL 45eb9050e7493476d93d95a7e44cc7cfccf071d261307682f975da53a0ae66348f229b97fe3130e0cddc5e70b3272daccb460aa94af75db6051c89493a7dd2ff
 EBUILD selinux-calamaris-2.20140311-r4.ebuild 401 SHA256 6697d2b49106cd66899c3394cc200f7150112a737238dfbdd2494cc374c9067b SHA512 3aa8bc091ce763b39aeb46808ad831a8c394b53a27fb232730667177adebb4b4035f5ca41ea42bf4087d008a0132670f3a2ad0c476125eb6e4c1c75fa1c269ea WHIRLPOOL f2a64a004019fa508cbcaf9c39fe26db53a017e95fedc000c58b6b58d197e1d1e9f7d4c7563e8ae921743a673a5b08d60016c74abeebb2bc2991a04a3cb8c68b
+EBUILD selinux-calamaris-2.20140311-r5.ebuild 377 SHA256 22ee5dc0b12804a7ad19543aca4e8f24c7b8ab6df54d46f1ffe670dc1d2fb63b SHA512 cbf8d1bcd484924479801dfa1bbcbff4895220ccb8089d06682fb5ac97e7c3e87451c05f4d029c91e2dfa72133586b04c60b909fc7b50762bd459f661192bd37 WHIRLPOOL 5f120dda0ad6d7767c02ee20e6bd0387e101d87d34ddf0c96b95c4daf5fad3f290a210de09dbc0a0a0bcafd721dfff2674576050b73c12a887efa560ced2e0f9
 EBUILD selinux-calamaris-9999.ebuild 357 SHA256 e78d160ed02c4ca258ed8da65180dd379b088b7468a914ab5ef2bd8601834eac SHA512 666713d6ab0a66394e4abe6c311ab0a09b3de042ef5c34e14dc5467d1cb4fb5fea5203a5af55005065fdfd530ccdbffc9a01b811569d5888b8c8ba93ccbb31ff WHIRLPOOL d5410a7a73425fe59f999cce324a8e70907fc8916564f9dbe71b6e0f7a07a4b7eb8dae5382c76dba5c26171c910eb8e7edd8ca456ab972c5e991cff10ccb23e2
-MISC ChangeLog 6750 SHA256 e580f9a1157205f766f846a36cae07156b033418dbbe7446ebaad5162544c7ed SHA512 ee5f307a34a4cd251679aa3da592695b52057edde0e3960cfaf003df22240b94b06a8766227af2edb9e5b495a2cf099022070c6444048b763841ae4a279ab02d WHIRLPOOL 2a135a917a5d30df46c9a7c6960975cde208d27ab53eeff1771ad519ed99a95f9f588b610e07014b634e975409e0ba150bd11f5c082c78badcdd44f35cea5696
+MISC ChangeLog 6948 SHA256 0104cd3e1f0100626d366b696f603be56c4907b3946555ad740690b68430b9b3 SHA512 0dafac484efc36d176c7c20850005d27273f86a0e76429d994c3b3281abb68edc83e02470fd61f9edf0a044d6c410bf4cecf0ede82de98d51ca9df19b7df91b5 WHIRLPOOL e963ce2e2fcc9189955c8e570b8984a39fcb462e466c6cadaaaa0fe739b1f7ae5c73e73a6702b58fccdca72665ab0b070dead88aad3739d336d52e96864a27c8
 MISC metadata.xml 233 SHA256 37e0072e69210c1cede0208034a5cbcc79f39a7ea051f04614b4c71ef1cd0ff3 SHA512 e90d194367c294da652b5ab68713b68d3490dd2421accd4beb9815a368743ba408f0a85caf80b1f4cc90680c46999532ee7234a07491a1b418311a46570f8d4e WHIRLPOOL 7f29d90aa8199b5448cfa35388f32f3e57125620ad94cec27a0c52ab1b0bb7adc9c3d21b494bfb43e13cc6bffa0e7576ed0467f90dc389c168979f2aad3c4c0b
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0
 
-iQIcBAEBCAAGBQJT5RxeAAoJEC7dUkA7aK9HfU4P/jsrjAOmmn6VYbBhn3qUtR5C
-wbsdRm0U+lQpuXdlviM1EFL8AnUWKJFQKdp+2OIkRK0J677hkBEizB7GBAZS7eKw
-N5p3QcrcvTG2N22yROCyhofA6fi6wPRa948LAFlz2OOpLThybA7DUOPPM9XwGXNS
-1+PSZtUAflak1Eyommmz8y9Y4I8d6AkXPmplYuGadgA+rTOZjWjIydfDcVOdmJgz
-Tnt6HnW7+FrGfd85umO7bvBakvf929FPS23mtg15fDlwcQyPj0xUQqPQo1KqJxeQ
-k7BrbP8j/g5JlJTGrlpvIYKE3HJhFwimXCZB6R96FpGu8nANh6WktHcRE7NyAYZS
-FS1oGvKdjreJWaLExyQURzo8B0vVM9rTPk4dNt8fVuBhZUaSHYwDX+6IwzjA79eW
-Cc6AuVIkR8tEn4k6M2g/avEJckul3DmbqwEEjf2WsquoPdlcK69okbPIXP3IguLR
-LMMDXTWChCn+4CKroWhdqYJrMjz/ArpRCQiaq1njATTXROtj4T3hCfNOnvWS7rhE
-KS4rmDFREY0mceqnZ5PIGV/JtL9p4mePoXCigebRvvdDD/OUKjsKoczHy380eTYd
-YfIV5EMvmJrdje8bMhcmwXoqIM/c1lXa1FHTzHF5jl7SxyXvgyI/rNYzNO6smN2/
-RCqwhbIth6lTdYYNoDus
-=Xn9P
+iQIcBAEBCAAGBQJT5ngwAAoJEC7dUkA7aK9H6M8P/Rh0CyG62JjomSA+dtqTe2lQ
+KN9Ng0RUdVUfhfvNRgK7i6bC+uo2oZJMDwYkR7tFSBVjM2+DSaWoFwI1O9S7FdzU
+QRNHVQf1QoudZWDwI9M/dbboZ0zKGflrW58NB0mS84yTORYsRwBrjgAWZD87WDgA
+7HB4tj29Gh+JS7y7G3fUczgBgJ3lU5pbW0/ugpj9HhPKZ2BjoO4AvqzobdVJrWEb
+8mrZYcoJCkVtAXQwUJ55twMQy+gy6mfp6AkaP9gwSk8V4NTqYPzKH9AS62SVpEpe
+wASjDTyhlD70eRVBjV4oTsIGkfIWbSsJTgnRy3ZUkRMCBFbaWJi9XVhM4Ycp9SjU
+Ulp+LXVHgpsAf31+7EWsot8xULCRH0E1X7xg8+pTddZDGavs0tDsO1RTf4NhPLyW
+UiEFCNF6699HoUK+CzjHFNHW7vp4Z5TGbns5rYdxaph9LB0CfZp9G49f7PI04gYh
+q+SvRf9eVFZGL1mEUSEfsn7kYxPaz4OCAiHluE8MCdwYdGGfNObbWRFOZudDofTD
+g+mAxTgQrzsT+OwqJLg6CSh6y6fS+3EQbavjMO/LQb185k7Iv3PWw05+HggV/XhO
+ksRH40lELoDTCLHMDU5MqFAfA82fqTlbkmVUkqIwMUcO2EKVQI82erxl9aufJskv
+hdg0r2b50+o5L/S0hC6r
+=MU6/
 -----END PGP SIGNATURE-----
diff --git a/sec-policy/selinux-calamaris/selinux-calamaris-2.20140311-r5.ebuild b/sec-policy/selinux-calamaris/selinux-calamaris-2.20140311-r5.ebuild
new file mode 100644
index 000000000000..4b7aa7e504ac
--- /dev/null
+++ b/sec-policy/selinux-calamaris/selinux-calamaris-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-calamaris/selinux-calamaris-2.20140311-r5.ebuild,v 1.1 2014/08/09 19:34:28 swift Exp $
+EAPI="5"
+
+IUSE=""
+MODS="calamaris"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for calamaris"
+
+KEYWORDS="~amd64 ~x86"
diff --git a/sec-policy/selinux-canna/ChangeLog b/sec-policy/selinux-canna/ChangeLog
index 68b167156b0c..8aff0a2b8640 100644
--- a/sec-policy/selinux-canna/ChangeLog
+++ b/sec-policy/selinux-canna/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sec-policy/selinux-canna
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-canna/ChangeLog,v 1.42 2014/08/08 18:49:46 swift Exp $
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-canna/ChangeLog,v 1.43 2014/08/09 19:34:31 swift Exp $
+
+*selinux-canna-2.20140311-r5 (09 Aug 2014)
+
+  09 Aug 2014; Sven Vermeulen <swift@gentoo.org>
+  +selinux-canna-2.20140311-r5.ebuild:
+  Bump towards r5 (fixes duplicate context for hiawatha)
 
   08 Aug 2014; Sven Vermeulen <swift@gentoo.org> selinux-canna-9999.ebuild:
   Make 9999 ebuilds EAPI=5 and transform to make master for version bumps
diff --git a/sec-policy/selinux-canna/Manifest b/sec-policy/selinux-canna/Manifest
index dfc42624cb22..b0603e96d05f 100644
--- a/sec-policy/selinux-canna/Manifest
+++ b/sec-policy/selinux-canna/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-canna-2.20140311-r1.ebuild 383 SHA256 b795a7d84888ebb605284a8a2b44a089361e7ec1e30fecbb499f4bcf54cc6418 SHA512 3c908f443a24d8285237953b84b2f9ee5164665933cb7dc3e4e24791f87620ca7468c34db2e430fa6e0d2df1ecfbfebfddedf1191fe07fec5612a43f0c59338f WHIRLPOOL ff22bf64f00f572bbef1daf4e0b5053840bca8b16d17bfa784f45239a45b5e68a9cc8fce585903ef416d45b1bc23967c7f1b43847fa1b2e193484fdcbbd9be20
 EBUILD selinux-canna-2.20140311-r2.ebuild 383 SHA256 a3cd5724e96888c7ce31c73dba941f5d2c1d518c0c7a0bad8533fd9b66afb65b SHA512 2d5b2e5a981419df8b32be1f7b3f1aa6c9626dd6b73112380fe5150434f598ea7f1b807ba7a7c091e73ef28a5fbbe9d78c6fd94ffa3cbcc94ea578dd6c47f6c7 WHIRLPOOL 892f227f2cc0def5d5e8c3d9dcb642bbd0bdd32f94a9ee56fe86b292ba9e26bc03302a388d101503ffe0e8f9495b1a5e19cd24248af1c6541f031c4ea767ebbb
 EBUILD selinux-canna-2.20140311-r3.ebuild 383 SHA256 5981b57f60e4ad22857f87543aa0a36ea7acea2895cc41ab44c9f81a965bf896 SHA512 77e6d5f5accd6112f2f95d6bf08324499179dd913e2303bea891a07864cbc1dc7210d91b88a8cb18671754140882e2db23874234bc44fc55e901027a01ee5379 WHIRLPOOL 9cd457545bd8f18b13014ebc9396c0653c3e249754468f86a3bc5c7011a754148b10df9e08c1fad0cc5a0b579d5868cd24a0f546086cecc7f7dcde597f68da34
 EBUILD selinux-canna-2.20140311-r4.ebuild 385 SHA256 8a38b899cb1e508e4a5c561623c5fe0326cf2bcb2587ed0c400e0ca5e13dcca8 SHA512 37e6fb7234f375f6a995c288684d0944290c858cdaf33f10846a683a5d5a92c61aa972fcbde64f8cdcd451df188020e957825f69fb4edb5b5ad87e5c738e481b WHIRLPOOL bd8b69ea7a5e0c08c57b848229df482fd6479343ed6966e013017891ec2edf4cdf4d5cece2fab00e631b6be60e6ee3220de1e19479497e8f5e1d6342133c4dbb
+EBUILD selinux-canna-2.20140311-r5.ebuild 361 SHA256 d3aeda6574cf8dc969a0ec5a5bd1dc5637d8c513b39523781a45b1e0de808c3b SHA512 8b6927837a0c8ee7f1844385e47fbf75a139e3e482c6a6e14e8baf2f63724bfa55860263c9763d99010b6dd30a3ba2495c4fd540b0077c2c40d654df0e54be71 WHIRLPOOL f08554da74544d69091fa6a3cacf1e9a992fc2803af094d9e3a83451b33ce9cdb11668f98cdc0659afea9ff976d97e249d8df323ebe946841f081afb8f807ef3
 EBUILD selinux-canna-9999.ebuild 341 SHA256 72cca8cd598701c3e4e0d379c1f063ea3ea48d0e453790dc5058969a12df8592 SHA512 c3a3df83a605c2bc5c8c0e933f480ad3d6e549719f5643c6cef6a7980d3011841f8726ded8f12cbaa210e6c4501875362577e6b5fa337bff12c939373b54927f WHIRLPOOL de53f9a81564ddaf47ff567a3de77e86f97fc759ff12b8879873f558ab5ece88bb4cf8da1676b7ab972872bef7f5c2d137b40bc8fd57bbd7f8975f5b884a4ce0
-MISC ChangeLog 6436 SHA256 3a658119976008df74bbc34b01cf08a8215f13c74b236d9a62e1ff27bf1b8f84 SHA512 c9bde34f242957ff99a72310b661b6f76280c87fdb35affad45fc7de93b1489f90177b41608dc7f8b943176656956924f6b2bc49efc784995860a6b5e6dc368c WHIRLPOOL 81f175f9bdf3d60a31e7c1eb9b7f54291b91c16686d67025d10a5bb8140ebcf77da292e035d34e6c1699a5b4f756be262a9d01a423b4a92a2baae24d2be5f095
+MISC ChangeLog 6626 SHA256 5b3a987b50c544cce8d063b7095bcb66e41991a29d9ebdd8e9922d115272f338 SHA512 07639c3a26149e8d04661ee18ea0a24d8e0787e70fa27953fbf49473e2be786c53262ee3b715b401a1d48e4285e9581ea8b2330a8f23177759c1cd1315584c9f WHIRLPOOL 4040bb838b8e3abebac215cd479f3e346a396193016079a981bb9d4aec2fa521156fbf35a9c4a8999131419c57c8115c7746248084b6c7d5622d627f676a74c3
 MISC metadata.xml 229 SHA256 c5f721b2e99a77181035cb3d9e59e5602c9e37074cc2525d3ef4f2c563a2b59d SHA512 8765c9cab6f036ac3e34a178d9dcdd615fa99c2caa492b408070b40a8aad1751bcd89ba9d88e6f8f8cfd51f6302e1ff393441411301d711c6419e6de32f59fb0 WHIRLPOOL 571504cde9bd47c73f88c70bdf2b15190cf7e459c3d6d95b564e88a7f9a2307ab37a9d586cf868d841ed3fd9614df3acd2beb3fa0a658d2eaeb92adad6948d25
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0
 
-iQIcBAEBCAAGBQJT5RxfAAoJEC7dUkA7aK9HBQkP/0RZ2/TSBgF+J7I5rPTAjnGP
-5T2/iaCPIB84TZ2/47z7Ovwrv0IVNXPB3Zw2602NDHCy3INsU+TPh5/Zv2N642BL
-IxLHGKKQKrvEEOhZeRH3RKplLJYymUo7ALm7DKRfx/WvjLR7+1Wuo47pg4rfIf9h
-/c5VGUnByw5QFLsjYstvzhr9YBPBBQh3GroI49PnJZjNDzBZNgGBswWKBBK9nwGQ
-jZsiurC/G8lok6Td6U7Y22GFhx+uTF1sLjPLwgVZ+imr2r/2QlaZsGuWjdyG2jOB
-dBVQn8OLQhlOafNxD6qvZNdA+92vBvR6N6ZgsiePX2+7FOOvtEnBPZ2UUhitCV2H
-3DsLtL3L6cUF5U3Zqt47z3UgtCG/0bx8i9MJVYX/NmvFJdGKZVqXtAOyrDMgQY54
-QtWTSuVkPotbO27fOTfFgTciuyT4ZyzH/GAUTgmfPRGnYnIZ70b7tGTkvys3d0Kn
-55vRISQn3NTYg8aeyBTT9xfpZmpS4pdNTdTl4MIt1l/LZEGvd6PDtsUEpPr+cBhn
-uFB1/gHPHXTGWQso2xcT7TTEk7VRP1Sw/pl3DH9lpfMmboTczqiRA/Oyquannjeg
-HIb9fQzRU9TyqYNM14gNcdSpWC66S6PmJ5vn5J4VwMM2/ZBMp/WWDgyd6xIKy+L2
-A51HimO8gHoq+eDWUN9Q
-=2Ken
+iQIcBAEBCAAGBQJT5ngwAAoJEC7dUkA7aK9HqwEQAJ1XrwXx7BYtVp/95B7kz/yI
+SYBheSQCKk4MrgVcYvi4UgM1WwOTfyhfjrwdkljFU90U32Wg1+15W9RkwL8DHXD0
+FQYnIEMIhfiguEOdViq7NOYYlxiYwm6BrD5EZ+kbOzpdrp/KNkOYioXUP6l98eLf
+lY1MZJOX2hVE+zfHEbj4UWNRcrYsFOS5PoenrTPuWYS14Ed6fc4ydz/T3d7PgoGw
+hNNtx2KwqOrBznsiBtjhEpV9SaWtIAG4AfYpmrKBF8dLpxSrHtdCs44f4rmvmxL5
+iPrF9qbsyhUp65sakPqxgZiL1cJ8JJAoPxn/92AnxH23ni3FoYSa55cvNFoEPqI2
+4wkJQhQgX16HuRF7GicaSrUtMqcDNFBRWBDhcdLOwuuFuzPbA12aoTy86ySzKBs5
+nfGG7hT0t8DNlrBEwhKy6X+Bi5P8d09nYUEpgeOkaIFhoNeaCZ99r4O9ax0CmZhf
+Rot+/Kcrnv37OAhBAJ6m/3nJMUdmplXTfRY6TI/IzsshsD/JbpsCNpVZsM6anhfo
+QdeuHA/0IF9Ve1BXLrnCKye3jUMGDPGumVdvYNzsUFDMeBehEwvrm2L0XiL7y+16
+6nyOxzyYnACRoqtWJiuhR1WcQwUSMbBZ+OBMFYSmK8kwifgOXhPFs560ytC3+nZl
+YoNaI81ZgmMpD4CIjmQ1
+=JWtb
 -----END PGP SIGNATURE-----
diff --git a/sec-policy/selinux-canna/selinux-canna-2.20140311-r5.ebuild b/sec-policy/selinux-canna/selinux-canna-2.20140311-r5.ebuild
new file mode 100644
index 000000000000..ae174a315097
--- /dev/null
+++ b/sec-policy/selinux-canna/selinux-canna-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-canna/selinux-canna-2.20140311-r5.ebuild,v 1.1 2014/08/09 19:34:31 swift Exp $
+EAPI="5"
+
+IUSE=""
+MODS="canna"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for canna"
+
+KEYWORDS="~amd64 ~x86"
diff --git a/sec-policy/selinux-ccs/ChangeLog b/sec-policy/selinux-ccs/ChangeLog
index 7e0e1d64fa9d..801ab9d02d08 100644
--- a/sec-policy/selinux-ccs/ChangeLog
+++ b/sec-policy/selinux-ccs/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sec-policy/selinux-ccs
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-ccs/ChangeLog,v 1.42 2014/08/08 18:49:29 swift Exp $
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-ccs/ChangeLog,v 1.43 2014/08/09 19:34:46 swift Exp $
+
+*selinux-ccs-2.20140311-r5 (09 Aug 2014)
+
+  09 Aug 2014; Sven Vermeulen <swift@gentoo.org>
+  +selinux-ccs-2.20140311-r5.ebuild:
+  Bump towards r5 (fixes duplicate context for hiawatha)
 
   08 Aug 2014; Sven Vermeulen <swift@gentoo.org> selinux-ccs-9999.ebuild:
   Make 9999 ebuilds EAPI=5 and transform to make master for version bumps
diff --git a/sec-policy/selinux-ccs/Manifest b/sec-policy/selinux-ccs/Manifest
index dc069efbd0d8..b1a13028b1ef 100644
--- a/sec-policy/selinux-ccs/Manifest
+++ b/sec-policy/selinux-ccs/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-ccs-2.20140311-r1.ebuild 375 SHA256 25fb7146434eb4035dcef2c86897991105a46af9cf89fb2d906d5dd0f40f0a7f SHA512 9870c5a13eb1b73b25a23531fb360b333924e3bd8ed4dc60eeb1faa8a584ea6a17a8f8ebf58c077a2bbc433be1fbe4b9235bfa8511339259df59683d865c24f6 WHIRLPOOL e48884f74a0066a1d76f472cdbd3bc5bd45d7d6a1614a2b9c30df856595aee65ce9a13dd8fdc73d4bbb7459c565021c3715beb355cf7655b3d825965fc302aa9
 EBUILD selinux-ccs-2.20140311-r2.ebuild 375 SHA256 274e3f8e3cdec1ef2b57202097221f7a41b634f56da8072e2c38008b2dccf6de SHA512 be2eea3b47aef2ae1f2e45191d74edbaec34a78ee27cc84ec8b02a11b5aff9e0750b6a34ce6084b8a09c27ed6c68a5f3dbd1e53d26174a65e8103e439fe9d9d9 WHIRLPOOL 5987ef35d505e2a7d16f3ad022ddea4bebb11118fcedf817240ec3241f1ccae1ead6fbaea0774b10e712b6a7c4b7f8f6bc8770ead5a4d143d1dd13d8fa6b0d2b
 EBUILD selinux-ccs-2.20140311-r3.ebuild 375 SHA256 732564971b97257210bcfea6c9a48145ddff3d83405bb5bd37ffc964b2056d62 SHA512 6f2bce0615737bc7052124a27a5604d71858fc18ce67c33c6090fe3dca637c21bf8b9e5acd425f6395f80118a451b4359136b747b0f12f9c7214570e4684039e WHIRLPOOL 63c056cc706499e97117442e36066ecc53282284d79997eef302cbc9a65309a7bdcd5c8c93e0c3240f704f5a5d22f8293f6f3e715c511e84d216e5e06aeb19de
 EBUILD selinux-ccs-2.20140311-r4.ebuild 377 SHA256 edaebf5e266c59026962ae4b4e5ab4e8bebddc10fc04d8b98c98a7c90c95790d SHA512 876ae4365f7a04d775657dc50473b5f02a063671f45703928fd5e794895b103fdc0ce807df39ae3d84e3a6217eba0855a8b595c9c808727f3664c5f06d496c2b WHIRLPOOL 09da6c9d1ca914b89f8fe05c2388f0bae512d77b2e8629c8e5876fdbfdf95f56ab05308db8378b0689c1fadb57abe8f7a4ab8d93e5f8394dc6f842de1e61ba97
+EBUILD selinux-ccs-2.20140311-r5.ebuild 353 SHA256 0bbc2b6d431d53029c505691d4f533dc1d2bbf3793ea750c6178b996184fafa9 SHA512 195f98e09220f763264b62c6cd9aa3d8ed639b3dd4c7fe1d8180387207c85aea658149b15187123b588abe2f1f8d91dc2bcd6cc17d5bb2313c420ed19b004ac0 WHIRLPOOL 29c9fbbe7be9f3a4e0da7f5f28cb006ceb1ac2263367491ce1f16b08d1ae7ef8fa006e0c68f32a3f7314d488acf7c7e01eefd521d36331566f663d93d97a844a
 EBUILD selinux-ccs-9999.ebuild 333 SHA256 c35a5be9826f1c70d1c4bbffb6e127241b55189adfcc88133a3a62b78750863b SHA512 c56cf890907197953195aa2e8102e5a12bca642f897b588616e5acaa105eb1255068a71a384f9c21a1929e7db4fe9c23e66f208075e2f94c4185da061315bb77 WHIRLPOOL f8d60b986503596c31c30bce6e600bd5a363de65c300fe65cf1249e178b0d65ec37667813414bfd609f9b3bde452f1f68d1fa4e01ab60864432a0cead444245c
-MISC ChangeLog 6286 SHA256 b667b369a5ee83a9e781d2bf329362289274bf9d210041e1ea5a10d5bdc23918 SHA512 1decfabbe9b7dcef185c2d4bbe761154f43296c49fefc8d356f485a2b7e68fe80bce98d5e48db2c0a897491bf80e6ec5fddf5774ba8051abb38e24ff3f1794bb WHIRLPOOL 272ce6d03bc2b249f316288ea741d584eb094dc0307df2c76f587d59107a7f175092a6133a7b48f988bdb026ad1f6673fe9711e3219e467d028a91f8ac7831ef
+MISC ChangeLog 6472 SHA256 52e8777f8670cce02f6e811a901f42815c4e53b35ac29df6564ccb011614c9e6 SHA512 6cc84b4942b9c82db61f9a40df8362f198b5b1f75747aa8f3a8a6e83d3dc8951ac41584e03af0caddccbd068ea75d541ccd4c2a9ef3c01f1df344e30a2c023ad WHIRLPOOL 9f38a6e9621dd6beb6f01d352bfbcf91783fa7d1195c7f9a3a2c71cf4ffcb239929ba07a831ebf6e42c47c828d25c16cb1c2802fe07959be93cb40b0e7a684eb
 MISC metadata.xml 227 SHA256 d3a63bf95980fed07f658ddc4da170affc284839bf4202d212b6eed43d6d7cf9 SHA512 f90e98a80554fbf0d7e6857e70dd0ac366fd3206d6f344ffad4e6eb7088b8fd223794854bb7beacd311a98f96545f86a28212f2ba10257b611d0369b7bccf32e WHIRLPOOL 676eeeb42aaf8ab0d53072e5e6e45149aa16d6c8447af26f1b0b26ee86546850228a0da413ef4541a6b03b71f5316aa91a6c40b770d335a6cbece1fa06a1de65
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0
 
-iQIcBAEBCAAGBQJT5RxfAAoJEC7dUkA7aK9H2SoP/A9vZ8p/wsGyS9l55AypYZom
-0yWw/p3m7ZnNdly6ow36K4yvDuYhosk1VCp58gGrBYQxSLPECGG+5wGA5x77vG9O
-J52fKeXUG6TquPCiaPfJhGE3G5sPGVYNAiO9u9LxHzbgre2BO5zKbS4GencuMQLw
-OASlyLlzqKKMzZ7wUXCx4HFZ2IteiTk5k2fc0+Oh1EaBKjVETAiMRASmNi/jcMs+
-8UYeczxdTjAwxMoqebFqAABDU8rmnavBcC8wU3w1bdTlURpd304JllaqXUzYDoWc
-AtrdS0DPjuIuXrw83eVxVLIWGEaqPcSr3VjQF5yEfz1zUYyO522Yk/4eQMtLDPhq
-hFydUSr6yBGW9rx87dS+t21N1ovTvwO+aEFufmljHqu9bMQGfmozvcf+Na1CdT85
-aNIjy2+vBDT46D4px0poIfm7V4dUNa2ZNkKpJQV7Oi0qocATmP4EHI7UZvyMuOny
-cG2RR1cEHmMKzN3FCDpzzdLYpybBUSrQkNk8AenXtOdHBHfW6t94RLn895ThgEcQ
-FuQStEy1tvpNPpL1/lI5+8CO6LAVXXtPi4m8Z0Ulo55jjBta9opSFn8tMXy365I6
-zgHVtUl8i2CtpVf90+z5decGIhrLiM4qoUuPm0tqiKcX7YBxofmsTmGGZtZ2LEiw
-3kOGCijROcZvkV5yqWKN
-=7yRS
+iQIcBAEBCAAGBQJT5ngxAAoJEC7dUkA7aK9HVVsP/jKerQu+84sFhl7StHdKb3wi
+OtZLjlZ0FfTSwnPAF9j133KjIOTucafmTt6C3ZFD2uk19StfAabaZAySeQnLm60b
+vYVNp4E2PC6lltCwLtt0vSl+hTHoNtbN5XaRseh1Y/AmzFegEnkV0pHBTYFt9Pgq
+TYmKKLIwE2f9ElrxFAcvXLfjbpcQ14jmJf2IudfqRzo1db/Lpxx9fKyo3734figY
+/wfH/ZDoMJpmg53XAscmJw4OgDIXFNK1h4d7f7QGTCbjEEmGmrLI//f+dofTweG1
+2l6LymmYVgPk48wqu6ETlStghmShPoA3cR4t8l41sLSG6r2pUIBroF60y9JkIFOR
+VAifJ2ffcD05nbx0KO42LHcge5QwDS1OnKO9rDBFfBiqgBMrkr4A/CKU4s9e4lX2
+LdM69EDbRb2Ev5dP9DSwgdnnH0mqmTlEliJ++P5QsabwDzwjGNS+jGG6FvPvRxld
+6X8jsayaLyskTJiWt1RL4qd/ArKSLickzluALzy69ngEb57G/RJGCl0fcdRIXWos
+GznFTdPmbky5b8nui/ywlISH7AYoiVenLSTVsTup23YiUV1lE4cSP0VT4MG9Kjkb
+mf6qbl02DKQDHiHcVzL43At+ufDX5Pp0GBDWPafkEeSWQXe/+7XywjhefUDUrBOL
+toHvEImWwkhQqalqdflI
+=1Txw
 -----END PGP SIGNATURE-----
diff --git a/sec-policy/selinux-ccs/selinux-ccs-2.20140311-r5.ebuild b/sec-policy/selinux-ccs/selinux-ccs-2.20140311-r5.ebuild
new file mode 100644
index 000000000000..387380743b7e
--- /dev/null
+++ b/sec-policy/selinux-ccs/selinux-ccs-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-ccs/selinux-ccs-2.20140311-r5.ebuild,v 1.1 2014/08/09 19:34:46 swift Exp $
+EAPI="5"
+
+IUSE=""
+MODS="ccs"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for ccs"
+
+KEYWORDS="~amd64 ~x86"
diff --git a/sec-policy/selinux-cdrecord/ChangeLog b/sec-policy/selinux-cdrecord/ChangeLog
index 6b07c58ea377..4d1464d7325c 100644
--- a/sec-policy/selinux-cdrecord/ChangeLog
+++ b/sec-policy/selinux-cdrecord/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sec-policy/selinux-cdrecord
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-cdrecord/ChangeLog,v 1.42 2014/08/08 18:50:02 swift Exp $
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-cdrecord/ChangeLog,v 1.43 2014/08/09 19:34:09 swift Exp $
+
+*selinux-cdrecord-2.20140311-r5 (09 Aug 2014)
+
+  09 Aug 2014; Sven Vermeulen <swift@gentoo.org>
+  +selinux-cdrecord-2.20140311-r5.ebuild:
+  Bump towards r5 (fixes duplicate context for hiawatha)
 
   08 Aug 2014; Sven Vermeulen <swift@gentoo.org> selinux-cdrecord-9999.ebuild:
   Make 9999 ebuilds EAPI=5 and transform to make master for version bumps
diff --git a/sec-policy/selinux-cdrecord/Manifest b/sec-policy/selinux-cdrecord/Manifest
index e1e15bca43e0..0d82a8cc605f 100644
--- a/sec-policy/selinux-cdrecord/Manifest
+++ b/sec-policy/selinux-cdrecord/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-cdrecord-2.20140311-r1.ebuild 395 SHA256 dae86963d18e8e1378666a8100f69d74afd2481e7642c9dbb444d9951ddb3cfe SHA512 2e42fd9f97f0401e421058fa535fe4fd96eaf780d1ddd39adeb6df09ac3fbe791d6a676eadea740623a54990f29f141d7d821fd91c5407cf16523eea9e23ff9c WHIRLPOOL 9aabb6d58d1b71e36fd827c5f7a3ebcee5af84df7580257589cdd1f87711b1106f4382e84b8639a30e8af83ff60c4591c894711a74c5acc4a460cd9e970cb442
 EBUILD selinux-cdrecord-2.20140311-r2.ebuild 395 SHA256 08f44f8f8826b7a536c775342c31441b54f338847d317fdfb6a15c98618e5769 SHA512 d7aabe1985352d88777fd55c2dba3d52557748a85abeff4e3d20f0b00e64600202284a59d5e296df5679c9644b81edbcd9d3b86196a748883276341b287df27c WHIRLPOOL e1b2464044361611e1454664e667256109dad64b87cbfd5821d367b2c4bc3c710dedd06f97e7c50d8aa929f4de231876b1cecd7ed8d661ff334b33fbda52c73f
 EBUILD selinux-cdrecord-2.20140311-r3.ebuild 395 SHA256 83a84ca9997403b9a67062170f0faeb87fa16a3b0918ac7758406f57f4d20828 SHA512 fb859e2fa52d6da39fcd7697b16db2b9ede113c5e5f2d9d812ffb06e4f20589ba7007dfe4e057928c33d716102d51e767083365bec1594aafc394938a117cf51 WHIRLPOOL 10e11f3d667e2ae8546eab11a9c57fe4b5c52171406a6e5a821e95292b3e927df5ca9e59b00ad7958b6be702af56d68dbe6ce069d7c3449576a7b5869b6f4eef
 EBUILD selinux-cdrecord-2.20140311-r4.ebuild 397 SHA256 5ee2ff8528a2a49f915ed64f012d2edb3ebbe6fdf81db57bd1eabfe3afeb38cd SHA512 fd89851551a824510d697378fcda9acae3a0a74c2a4484159a7f0f65148040463199d6f70041cf9929b4dabc914e58fc30af8309ff11fc40ea167816aedce437 WHIRLPOOL 6e74c057334a2979ff5ea6c65f6a837ce33cadaf10bba0805c858a95d6d1f532df860defc9a4dd6832c1d3338610f0eb5fc887a2bbaff2ebdd0ee28628811a89
+EBUILD selinux-cdrecord-2.20140311-r5.ebuild 373 SHA256 e3aa03c71ba5b2497f7beaa2c94db2eb6468060f97374fe6d95ea970915d55c5 SHA512 c28aec3a9f82cc71b08394be749489746ecc349ba4017b3875a3dbb1544e2572ccbec1eeca363eb0f47d240f2c6b5ab2968a6f76af68d6cf67e4ad121fd3b123 WHIRLPOOL 1026cff2183b78f3a09619c0cca40bbc29418fa1197930fa5664cabf1e3f4a88ea11d58fe7f26f9f3ae02d32402e372076ca51f2544ab9c88e8c8b30bf253a62
 EBUILD selinux-cdrecord-9999.ebuild 353 SHA256 f5a24a3fb83491e0623e0e6b067904c18d5011e2c7fe01bf0431b885afc124db SHA512 fb072d8f51afb40d3afb0fb5e823e06993e1b84abb4fb4264f1e868036900db7cc1bc663bdfc081c1684a520e0a0d0a160996d280173c281779f2187a8041858 WHIRLPOOL 0508f53ae3ce6c93c73428d475eb76daea1c5f90e5616ea6fe3b1c0a831f1489395f46e0ba0e04ca644be8c7bde353b58346e7fb8fa67bc0ad75783e0a864309
-MISC ChangeLog 6671 SHA256 b90f765f50a119f074f40faf93ba7f6a6eabedcc4eef88d9f7ed8caf95a5b983 SHA512 897ca7dc636643a8c899933d0f8150f2db25ee5bbd1d110c5b3483be73cea57bc0d58dda5e6cd774a0c50cc672f4ef66b02d09c537257310da1206dc99133a6e WHIRLPOOL fb86ceb460a2da8e491d5251c33b0f8b591ebc3390e7bbe60f900cbb28af543919647406de3e84f7e3132455a2c813fd92e1f33d9c12600ee3beed80ec52babc
+MISC ChangeLog 6867 SHA256 bfb9e509f5f399b4d6d47168955de962fc734cf9a513064e4f66cad323a324d2 SHA512 85be5c32f2fc174b2b598e0918fb63bb08695d92df8e3deec37ae5ee2f1c31595221cbfa6b428455ecd10440255e549c0f0a6d5e3928874e53651e4da4731420 WHIRLPOOL f47aa2a506df0302bfb1eab78f83944df30ca7e8251d12c6debba80e15f92eeb0fedc47c0548454ee143c91e30bb7d3c9e77c28ee22ef9e82c51984dcf3fc6af
 MISC metadata.xml 232 SHA256 79cd61287f1925ffdb4633b011d30d3d9414f8ff7a9e20bdbe9dca37cc65fe8d SHA512 4290ce6c2f3dee79f49af33ea1b16173bd63900d3c21996cb89425e3a254ff42608f45ac0416a7fd083fcc188ea32451084d1b812e52b9810529cfbf13f15151 WHIRLPOOL e711bd08a6ed8ca935426f0dcb93a225631775860ec9259905472175fdd4ee77cb4a079c0c2db1ccdf7817a5fd9e34698876d5f565fe89b13ef7f4b722061018
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0
 
-iQIcBAEBCAAGBQJT5RxfAAoJEC7dUkA7aK9HmGYP/2u0TBJd4S0zcRxzHgUoQJef
-NzxOzAUS82uUeiolbcd5//8afk+6Y24aECJsErweKBE1Tw2Wq1m9vhT0VE1rULrh
-Mmb5siymo6O5zUXlDgqCK9blyVy5Ja2xY9FWsTaOs91yxTVkr9XGfKhrI+LNKGEg
-ApAT1MBy91S6JRrHRSHS9t9cUMoSGc6UR0Zo10sGGU0JsJ3lOJKzc/sOImrPAPNB
-OdPOnVZuhfQK0+UV8eHg4X7nw10uu50YI8rLFgjR3UF5ujPewC1AUqTZVdQTjA4J
-b1G2dtQuz05bFQdHyOZ31cdJBmeLYbkpgCprZMY8aMiL8ypeyuuxG51ZiuK9rlgW
-xC++pZHlHsiADcTrDO7hi5chjT+p07pfkuYT6V6ymPprHjpVnQfkmv4Rh2KdlS81
-dTrTS2rsizfzyRQnCYEsQVUQD7IklJGSr2bTflrHB7uv98H9IIa/R0Q00QU1Zdvw
-hQKL51VR+0y63mYg4wJV0AXCyfoaKwOeq4QxCdx+ezL21T6cJ5kLi/o8vKsg4L5v
-QMobF7ubMUrNcQ2Ai5VtjwPQcpa/jSrhPPbjmICZg0Idmox9122qseu7Ls67YlBr
-eiW94SQs70vr9Gz/Vg6fc+0Pu9fd+GkKswTQcOTbNjx4comijISDd0ZbtmK/aMbo
-4/cGmw3C0BCRWGlKORHb
-=9aad
+iQIcBAEBCAAGBQJT5ngxAAoJEC7dUkA7aK9HgGYP/R8xehDf8VJUC2U+F6LREkcM
+v1LonZYTbWy3fiReOxrmT6gJfD7uwwKBAOoiNZdHxe1O6saNcFPbtY8aWXFqOopm
+pMtVLR1Zfzes7y/Yfw5spRfdffKOAhR5IVFUVgALlqngPpK5GEKWxvE7Wk9V2UUd
+zxwCQeWDqYS7PHT2v4ADAxxqXj0qm+wVraqtBjj93DXKxiwHzzkhSgPgsQIJ3a/k
+iUaAu428Nt83hrXHF0HR0d7xax6chBfgwdf4ju2PTKz00kUMWVkvpUcHf2cXu3wn
+xNvZuYv5qSk+R8dwJGl0vv+S32tdIVqyICwjr3mzy4VupoDwnVawzr966661UZ3a
+3GU1JFcQtQjYcaCQVMRTnjlAwAphU2JF1TRRWQY0MDmNJ6qOBH04uSsRlpX10Tjo
+tXPdr+7aZnKDLvotf9Akca1z/C/rgeX6nNY7uoYSEH9MPTsqDQhTiEy/IRsvvhZP
+wKHqxdZOvEA7p2GSQNgV9BTWZ+rPt2iJKyTL/3gQFJro3+fEr9jODgqkBKwLOqRy
+L1kGCdffzkZ7xDggVF3x8RqMRP2MzxOXQTxnJhZokkrckla6beH37viqhHIwzZW+
+5r+YzhVeX7n3cXVD8vkssH5xL2WYZfRizSwt4d8hOs/rKBxIxXnMb1loOrRhEfYI
+9lvYNNgMBoVXz4NtWg/e
+=oN4D
 -----END PGP SIGNATURE-----
diff --git a/sec-policy/selinux-cdrecord/selinux-cdrecord-2.20140311-r5.ebuild b/sec-policy/selinux-cdrecord/selinux-cdrecord-2.20140311-r5.ebuild
new file mode 100644
index 000000000000..c20faa4df40d
--- /dev/null
+++ b/sec-policy/selinux-cdrecord/selinux-cdrecord-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-cdrecord/selinux-cdrecord-2.20140311-r5.ebuild,v 1.1 2014/08/09 19:34:09 swift Exp $
+EAPI="5"
+
+IUSE=""
+MODS="cdrecord"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for cdrecord"
+
+KEYWORDS="~amd64 ~x86"
diff --git a/sec-policy/selinux-cgroup/ChangeLog b/sec-policy/selinux-cgroup/ChangeLog
index 5134b83bdfbb..f17768b252da 100644
--- a/sec-policy/selinux-cgroup/ChangeLog
+++ b/sec-policy/selinux-cgroup/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sec-policy/selinux-cgroup
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-cgroup/ChangeLog,v 1.42 2014/08/08 18:49:41 swift Exp $
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-cgroup/ChangeLog,v 1.43 2014/08/09 19:34:18 swift Exp $
+
+*selinux-cgroup-2.20140311-r5 (09 Aug 2014)
+
+  09 Aug 2014; Sven Vermeulen <swift@gentoo.org>
+  +selinux-cgroup-2.20140311-r5.ebuild:
+  Bump towards r5 (fixes duplicate context for hiawatha)
 
   08 Aug 2014; Sven Vermeulen <swift@gentoo.org> selinux-cgroup-9999.ebuild:
   Make 9999 ebuilds EAPI=5 and transform to make master for version bumps
diff --git a/sec-policy/selinux-cgroup/Manifest b/sec-policy/selinux-cgroup/Manifest
index d163dbc27aa0..e775cdc71470 100644
--- a/sec-policy/selinux-cgroup/Manifest
+++ b/sec-policy/selinux-cgroup/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-cgroup-2.20140311-r1.ebuild 387 SHA256 16332e0a9ed8982f22733f8714238513f3564c98428db6bc1fd07e96df55ee9a SHA512 c6d4e36dda409b54838a9a4bbae5bc9f091903f63809b0f07683cc5951b266f25175967af80b8474d7180412724cb440abf218ff6ad3ed612f0dcc7eeed42657 WHIRLPOOL be081afbd8aa1bc756a7ebc46e85ecc32816ef9da8c5dffa05827286feded9301d6745126ea06a11c507f55bdb9b0c38e1d3ce40bcc29123b71d8fcb0cbb09e2
 EBUILD selinux-cgroup-2.20140311-r2.ebuild 387 SHA256 f429e84bdfee7b92816547631b1c24c8f281ea19df4bf020e4edaf4fc764366e SHA512 451e9a4d33c05c2a1a81ca5a72a8c716b45ebc88cdcc560eda1a2b00e35f0677be9e8dc7d275a25c3069e83a37d918afeb096f5d9bfdd7fb906b61e9324ecbd7 WHIRLPOOL 37ffc2d30bbf3f8a13c29aa7465dc223676834ff49a24911b45d2d9e3faad9822d381d62e5a8daca3ae97260ed9e5a430745e33f9fe6de17b1eab7c61ca749b3
 EBUILD selinux-cgroup-2.20140311-r3.ebuild 387 SHA256 b5ba8319d5334d09fb80b64b10f02bd465f406ac25b5a63cabf4aec909499964 SHA512 dcc2a5a3d0ea8ce00b69db372e610045f27232ad73edf53303b9786eae38376074f57b84ec64ed3b4acaa58decb9dff97afded95341d5acfb720fbe33d1abd13 WHIRLPOOL 80d00409aab83e00e2e50306b0c56cbc962b8c9a4b76155877947ccb96fb0910496016f0433f462b378312d031015a77fa5112feebeaab03cb2b2b75902e1f86
 EBUILD selinux-cgroup-2.20140311-r4.ebuild 389 SHA256 c41de855bc9e604c9bb86d5edc8ea653006cc4bb89db7ab665b9007a4efd7785 SHA512 64119740c40a0de2b8fa6c79296674991cef82ffabd714b65f3ff1eacdcd14ff680c50af64136bd0ef589c61e58385e52594323713b8c33867af63e4b08d86eb WHIRLPOOL 4e3ff5534efb34f356e3e63971a39a436d80fd14436d0d9990d7a3596e248630c3920de305e6e6c36d04f8fabb3c35b3cdec96e64a0eb87c6a41d0942d907d31
+EBUILD selinux-cgroup-2.20140311-r5.ebuild 365 SHA256 52fbeb9744aa2a3dda8d353b28385110a2be7def7c9ba3cfe035e4f8d7cb68c0 SHA512 be4157f7bbcb1ff437bb81d0263f88f2b388201531ab7eb99bc21427d2bfdd187d00a20b9a5f06608466f7abda3135612070471d2653e354bffb5e422973abf9 WHIRLPOOL 3a1abbeae00bca3a900700aa5770e65e9379eb2cbc18c2d4c8bed764ff659fbe5a96892501a54f91ced10f4e03249690064b2476209204df6bbe4220bab1eb44
 EBUILD selinux-cgroup-9999.ebuild 345 SHA256 f0e2e9a89d80129911794327f0c446778970f3b5c39ec313ae1af23457070359 SHA512 9c7c55e50fb860f0774f6990a9adc92e14a6f33c904e6342a2e3640c7155bf18267426f2e8ed1f98c9174e378ea6ec86cd9fcddbf1049bf04c1f57f3bac8c60c WHIRLPOOL 90505dbb76ce431e01ea310e74689589a444a127d86dd941cadad2bb61422e643ed1401d4adb535fa72ac5b797a5a9c8426dbe3e41d5e0b3a5c993ed48e74b78
-MISC ChangeLog 6511 SHA256 f61c05b87d79bc9d24e5798440d795a3067eca04f73216fadef0633f1d7c2684 SHA512 088930aec914cc50d23aa366d23198a8c6bff5e3815322018518af529d975a7ce48bc4f7cfbf8a2f1822127b4b540fd294d9beb447c01eacf05ae28e35253ca3 WHIRLPOOL 6be7cdae107a042ef5bc43a7f3db3baca572b23251b1cae2074eac9addaf00999a09f8cae39a1403c1a44be7c223fbbae0e7500cf5e32d16196d4e08c8e307e4
+MISC ChangeLog 6703 SHA256 43c65790e4d58d4587978f5da0174fb15dc0aa5df4015c137132a25a47bf80d5 SHA512 1b962b054365c9961a11978fb4de3a180e20807389d1a352baeb6e39aa7d3d97865847abfc2f168bd05ff70eabe509c56094ad508e7445fc3b22dffe6d2d425e WHIRLPOOL 8020194b386c20b18606144743014d44aef4fd49f7bf436fa723c672cfe07850527d65689253c51e7ffc75756b30f7f4273723d5346852ef863887332af08b78
 MISC metadata.xml 230 SHA256 c7c12daa43a11843943ac4ccf34cf9465dfc811828f1d36259e802068559597e SHA512 1cc9a3c6898093c814a3409f6b7a3a9a5caabc635a168142b23e451119b0c1c2bc02e93a4541eca431772ead64504a055a54bb75771de94da74ea94f4776b753 WHIRLPOOL d30a666d04c3afe1796ed0202eb56a26444da250c8d9064170d2485ad246f15a8bda85858431d74ac0f462aa35b930c9cf5931b8b2eb1ce6b1200fac8e183849
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0
 
-iQIcBAEBCAAGBQJT5RxgAAoJEC7dUkA7aK9HQmcP/2AlxJgFMRJD7XED3i6unSsM
-il7GHz2gA0yz/ZolM/myD/Lot5s9EXENR6tSUne+qE9JsTzgITHmnwVWlrmnTEsu
-1nFkyG+Gy1d+yEZdwGvR7EmYTFEsa+ceduv4cxPEh0jT2EqNBXImKwkUIClYXFA6
-4nIFlmx7O/4tUWmyQ6NGoittQuyjqc4fXT/wSUX3+PBhQDKR/2ZaPgEF9zXuGSaK
-qYZPb0khSOtCNr0Hq9psLBhQeOgP4xFtdIitRTiXfUgna0gX/iLsdmmk3IWA3dmd
-r3+DEWs40A5q/rwKKQBRh7R/wQefKookKUrAv/PqA1HuinF8bMDAKZLLPvLr92BU
-WfzRQ/fdlBQXQm0gK8KH2lnJ0DWQgSQPAVO7MZ6gGTgG0iC3+Rxn5pxWlZu2BzrF
-mxHnj042pA8uIQVKhu1lB98RsiI9qBujKea87/bDj1uQbBM6+wp/Z2Y8YRZTim7M
-G7TJHcJdLmVXpgIigRQmrM/370Cyx6u4WJ3sXRbaJ8U98GjqhOAJUVvn/U8tK5jL
-ftaOjvwZl33lOXbsjkcKrB1oBSVE5Yp9siT8vH1tvsRrSIVi2yQE6YKMVbYzdpdR
-xuxUHYHPRsMmLBZaCmQtPE2v9ipSo1KeXPyYDO8iI+0DZ9sqOby/zTq4KRDXH9i0
-ml27AxWefXvNzlfBg5Ky
-=Srzf
+iQIcBAEBCAAGBQJT5ngxAAoJEC7dUkA7aK9HzM0P/3fwcbRTzIT0304yKbN7lQio
+6eIXzXGjOPC/Y79gu6KbtjMEXEfUlKV4p8pduO+2qlD02IpF6vEWH1tHSFiGJvIm
+pWuKcZa6ZyiU/jqg15V04diC6qXBBe7jOCoO/pHCSd22RVk4yRgw6/aJFXx+jqRX
++SefEDOXXSaTT3w0yIpwEXZPkYBBTblrzPw9Nc9RUOYq42qZcLySV/fgD+FzNPoK
+W/SKioSBpory2GCVtxaoLLq8HG0fasKkWndif+yl8IYCiQSefDtrajyEF23K6K+E
+nyfN3N2gQ75kCT9EsiJhg1CKaH2zbBsMdUzPnBm3Do1Cc7UqshWngCkZ5wwfPk87
+DemW7+fRdTBuKMxQgzos11Ay6Fer47CVjs/kAZWM/U3KNbYBW2peqQZsmjY1oBnS
+dPWI7MVDQTjKJAoYdyMoiutGcbZT00KGuGrXO0wg1+Xx3h40Wy503p/sGUvxdOnv
+I/vclZEwlHxjFdLm1IfDF6TSduj4H5O9WBytweeQeKu6Ji9gFrIP9XiIY7iVNVpt
+3iNkgoEJe9JjRlWlbrK6ufl7hQg4xG2igT07M0/0Y4GlX98R6HHO164qMkTZNMkH
+foAEzQR2ZuplsYA3ZFXs5eCH2lu+OOjbNq10OLPC/S5LpCa9B35epzYEgOIakgiw
+W7qrRVaXaPsuiK3paKEl
+=9vYK
 -----END PGP SIGNATURE-----
diff --git a/sec-policy/selinux-cgroup/selinux-cgroup-2.20140311-r5.ebuild b/sec-policy/selinux-cgroup/selinux-cgroup-2.20140311-r5.ebuild
new file mode 100644
index 000000000000..d78779b580b1
--- /dev/null
+++ b/sec-policy/selinux-cgroup/selinux-cgroup-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-cgroup/selinux-cgroup-2.20140311-r5.ebuild,v 1.1 2014/08/09 19:34:18 swift Exp $
+EAPI="5"
+
+IUSE=""
+MODS="cgroup"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for cgroup"
+
+KEYWORDS="~amd64 ~x86"
diff --git a/sec-policy/selinux-chromium/ChangeLog b/sec-policy/selinux-chromium/ChangeLog
index 7b9a4f8c41fd..d8ee45ba61f3 100644
--- a/sec-policy/selinux-chromium/ChangeLog
+++ b/sec-policy/selinux-chromium/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sec-policy/selinux-chromium
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-chromium/ChangeLog,v 1.31 2014/08/08 18:49:49 swift Exp $
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-chromium/ChangeLog,v 1.32 2014/08/09 19:34:39 swift Exp $
+
+*selinux-chromium-2.20140311-r5 (09 Aug 2014)
+
+  09 Aug 2014; Sven Vermeulen <swift@gentoo.org>
+  +selinux-chromium-2.20140311-r5.ebuild:
+  Bump towards r5 (fixes duplicate context for hiawatha)
 
   08 Aug 2014; Sven Vermeulen <swift@gentoo.org> selinux-chromium-9999.ebuild:
   Make 9999 ebuilds EAPI=5 and transform to make master for version bumps
diff --git a/sec-policy/selinux-chromium/Manifest b/sec-policy/selinux-chromium/Manifest
index d08018431a38..8203f0aeda08 100644
--- a/sec-policy/selinux-chromium/Manifest
+++ b/sec-policy/selinux-chromium/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-chromium-2.20140311-r1.ebuild 395 SHA256 977b566febaa0a193246c3397ff06bdd5ce44331063b51fb473da10ea142db1a SHA512 1431e9b4f6a97a847560dbfd7e0ecadbb72d177f722bc3f0339e587328216441e31158f78769ad03d86e2c60eee34e312071ce53782a89878d8cd18351897176 WHIRLPOOL e217e3db20ac4fd15f40b570cb1e71deba465f2486bbcb3292afe81c0d5b28879824b58620efadf2cb54cca864c7810185a35203915f39db881e6cfab659a271
 EBUILD selinux-chromium-2.20140311-r2.ebuild 399 SHA256 32bed9ddb64711c3a8d5872d9c3748878cbbc1326a0e80878cb8bedf7b287ac2 SHA512 fed149ede565571b77a03445f82e2be02d8548b8f574f5389d27f12d202c1d5501eb0320a40a78f81481aacde1d0221891a36dc2f7478d9ba65ae22e94355777 WHIRLPOOL b44e90d2243333969b308e941f0bfea0223c4ed46aeb933f3cbde2a6f135146ffe99c94df70fd095f57f66145e8647855f2b302a6eb916995d5ad3f1d3c954e0
 EBUILD selinux-chromium-2.20140311-r3.ebuild 399 SHA256 d091eb1a0ff17355ca5a400db6491f17fc0ec4286d36dfa0f15c36e950d72472 SHA512 620c03ba1a4243bc2026d44b09e5e42d172db99685742c250ac765e3cf4f62535b920cf0f371a8901c44923302fdfbedb10dbee7504fd9ac1b26d90473715933 WHIRLPOOL 140b0e7df2b06adfba8bcef3e5f3480d1cb3112e7e23c60e2f4660b5b76d8a77423d677dc66f5390f00c578fa87dd89c9125128bf831c124bfe0265c5b97918d
 EBUILD selinux-chromium-2.20140311-r4.ebuild 401 SHA256 4808d9e2521e08e736684adc79048b7c78a08239d6378e381c1a31171335454c SHA512 95962e524adcfb9fbef5079517540cf49df00fb4bb37a7dfad871c113040017196ccd4b49005601d681a16807f155cd5d0dfc0b46e006739b9c773605dce7549 WHIRLPOOL 624bc517dca32bc147f2c4b6dce882b1869d9eb68a028fa0abb77596575ea62d8b80fb405fea001c0174bea1d6c181e6093a91d68af2a4a570b1ae7b7412623f
+EBUILD selinux-chromium-2.20140311-r5.ebuild 377 SHA256 08600e6c1888dbad87d03d0506122f35a299dbeced1314e4d7e932883f77b992 SHA512 b5cab02f5c0d6384e7fe46b16507b154b90d6b153300f868251debd6060797d6bedceafc65805a4449fd46c718ef42dd22a5bf8bcae82c1bdf56a47c24030088 WHIRLPOOL 119e2b103a6ff72ef4d3678398a543c46370f280cff3bd150e25ed70491da8a8d6d44d4b65fa745ae6a76566861ea69647fb548ed8960b514d83ab2081c0ebbc
 EBUILD selinux-chromium-9999.ebuild 357 SHA256 b7a48e2f197b85b51001f09e132405250ea9028e1f55b4b2eb005939a947dbf6 SHA512 3c925994ec7d7c2c7f88b23a5cbd321435fda7ea9c38255fddc314921471d94f2ab917a575364c708c9a41900425f9ada33118cfd9914783a7b21244ce723825 WHIRLPOOL 92383b5e1b401462c11fc6b10902adf9de64a16bc21012090405d395bd4e6700925ec38337e84ca75c06bc29e93dad8f7fa16d458c32e9ed9bf260920617ec3e
-MISC ChangeLog 5036 SHA256 b9ba458ce60a019c7c6a7823360fc9f94b1a47268eb0737d26ffbe36081b8589 SHA512 9a14f0529f4dfcf441f75e9993d7d91dcea7d6b2cdefdd0e3806c50bbdc74e8011acd7eadcb77fe36db06f9705fb60028681283cbeee14b76cc58ed5b1364de1 WHIRLPOOL 65d14b8365f5263a594c446e7285093ff328715016f078c4f7c71fe5e1b8a5fddfa734c0c3af093a6e10c55c530fe78878ebacc39abc0d22e9d13d56bd4f1c0d
+MISC ChangeLog 5232 SHA256 414fce055da6d09801f722b3001d02e89cbdd5144e552558c88a505ad802f271 SHA512 6f948122bcd1af25cc6a53721e40ae094db1913c1baedd1e4243c52753f034363471d12233f273445e2ac7bc69f169d026ea29a89b92e613baa5a6a4cab446fa WHIRLPOOL e43076390cdcef9b1b85c49013a881eea0a8ddb8d256f2c0be58bc368f837ba27e7bd665b8b0a8478871b0766e266612e414a1287bcaceaa9fe4367765c3dcb7
 MISC metadata.xml 232 SHA256 a85d97471d86a9bd8496f48e4e5efecf67cd8f133071253ae3cb387b4169e0a8 SHA512 b39e274e044c3eb61935d5fb733477f5745d567f5ed1dc4546e7c536bafbbba94664f5515c339db32556f4a20ea67109315c9bee4a1049e476a0ab986476cc13 WHIRLPOOL b519f6d898b2a0c63aef434950b606762bbb7d5a86fa896aed679dd7a772fe941ef8aa91738eb2fbeeaa8327619f4f2be022c2642a9a72b4baaff8f48319b7f8
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0
 
-iQIcBAEBCAAGBQJT5RxgAAoJEC7dUkA7aK9H/LoP/i2qD9wXcsDlfZWLw990+jzy
-tRwXPPx62Z/MhufzZfHCD8FGewDeawSiaszyi8eahyfajmq+YOIj/tyT4JWQa2wP
-ibmgrpvnjBka61unjmUEVCG4ONBlRRNU9zBXqNN4nJD/KBxDUGe6J+2/jTLKl/G9
-grKQMlCD7BrKcFYC+7AJal+C3J4S1h9o2dBndWY9cqhpPeyGqJxdIlF6wkB2XllL
-TU1LhNoHp4oX8PVf0b+JvNiNZCcl0V1SdBjgmUAiGS0wnM6oeTiheahtfAnvCjQ3
-a5d5z81h9LxhzPEHR918qPSGnEKVmrC/wS2KHwjgmo/eQwVoLGqwvW0MTMJHugzb
-sWo91d0QCKYH2iGXLZH4GTZlX4LnSZgwmuSkU36xewN0BAiXNbtqkUTYjhglHMGt
-TvAf1K+ZsvT7R4lY4zF+F0l1dCEePFLe2umUYIQoE2SEfOG7kdfZQ48AaTfitTmZ
-FZjT9suPQ47ExCRcBgzbIbgQGIOekPaCqBsXO28zJTYgDtLZaCeZ07/Mpv2i3xu8
-bUgk99Rud36+2HHA8crH6a+XYuAIFAuXfq/eOruybDkMnMi35s+pvsyk1df+4kjP
-hGjekS5nK7+/8jBa2aTGGulDsivEcLTExT8JHaL/ptIEiP8QtFLBsesSbrCqK/lR
-M2lVk4jG5sz6ZDt4RI7h
-=aB+x
+iQIcBAEBCAAGBQJT5ngyAAoJEC7dUkA7aK9HO0UQAIpaEmyl9MJ8VZpPnr9wn7xp
+yjyhDu4UnYlBavRdwp5ZrcwR1QO/SuTaacqHDCLoqJL2TFG6Rdy5rA69Rx94NsJz
+tv8CEfzRpvT66Qi4+mbvhA7FKiOhLkafUDCL/n1cTyBl7K6eA5ZT6oRSVR6uri6W
+HeLHMiVUJBrfr415O2jLQTG1ArXOcIKfs+5HGONSgNjzUD+Kcv4y6Ws3JE7IH0Mo
+nV+vTGyOce1gPCFKAQV7XDZG3YHOQTV8WkwUo3xH+hoBeMGMcz/Sy5MQyV0GwJkT
+Z12gdSdV2X3Wu/1P07gZIgMTKbj8auBkazRm5NS5w111vAVQCI5lQXtzNaJDUNnQ
+Z/oucxylfjyTPu7jiG1n0Jk/0fEexRoBP0nOii+D1XcPi+TxUCFaTmYpUx3X0m8R
+YIUqhZXezN+D5/VAKYa/KJ+NZg/RuFm7Rri7aqPY038c2ggMhFZtuew1Z5B3PDDW
+I4V44t+Lo+TTprznKAfaH0PebcxlNjDZVMJx4sTMp77D1soiVv0bytkBQWYH7s4c
+tC+BOruAp+lSe40H1Hvl+2udWHDx7o1/KPIY1Lx+6o3kpILkV3iIAyRzghSJKdY7
+9r//QlHlMMXgvtTZIa1pgbPqLiVDfFKpd0deADHSdsAwdGMJwnFo0sxGYPbOKbsM
+z/4KA59YJMWD37yih5s/
+=d/xY
 -----END PGP SIGNATURE-----
diff --git a/sec-policy/selinux-chromium/selinux-chromium-2.20140311-r5.ebuild b/sec-policy/selinux-chromium/selinux-chromium-2.20140311-r5.ebuild
new file mode 100644
index 000000000000..027ea254d82e
--- /dev/null
+++ b/sec-policy/selinux-chromium/selinux-chromium-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-chromium/selinux-chromium-2.20140311-r5.ebuild,v 1.1 2014/08/09 19:34:39 swift Exp $
+EAPI="5"
+
+IUSE="alsa"
+MODS="chromium"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for chromium"
+
+KEYWORDS="~amd64 ~x86"
diff --git a/sec-policy/selinux-chronyd/ChangeLog b/sec-policy/selinux-chronyd/ChangeLog
index 37fdd12e020a..e3d3aebf5ccb 100644
--- a/sec-policy/selinux-chronyd/ChangeLog
+++ b/sec-policy/selinux-chronyd/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sec-policy/selinux-chronyd
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-chronyd/ChangeLog,v 1.42 2014/08/08 18:49:31 swift Exp $
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-chronyd/ChangeLog,v 1.43 2014/08/09 19:34:24 swift Exp $
+
+*selinux-chronyd-2.20140311-r5 (09 Aug 2014)
+
+  09 Aug 2014; Sven Vermeulen <swift@gentoo.org>
+  +selinux-chronyd-2.20140311-r5.ebuild:
+  Bump towards r5 (fixes duplicate context for hiawatha)
 
   08 Aug 2014; Sven Vermeulen <swift@gentoo.org> selinux-chronyd-9999.ebuild:
   Make 9999 ebuilds EAPI=5 and transform to make master for version bumps
diff --git a/sec-policy/selinux-chronyd/Manifest b/sec-policy/selinux-chronyd/Manifest
index 069bbc1b0faa..e0acc3c8429d 100644
--- a/sec-policy/selinux-chronyd/Manifest
+++ b/sec-policy/selinux-chronyd/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-chronyd-2.20140311-r1.ebuild 391 SHA256 25bdd1e67c24568c79583474bf7f930682cf0c172861253899e708263acca219 SHA512 5e04103bf22f1e8ecc89e7445d526d6cc83e12f44ee3e923ecc492be9d32edcd6b5c63db89e05f510a94b962b99bad5aa5927b631d0e34a6a190c0afb50c00cd WHIRLPOOL 923a2f40e98cfad35c3b2b6c8780166782808e9083dd2eb672b7c494859a5eddfd2820426509dfe8460890b96fc726d95f52d2320ea10166088e0c1cb1d07196
 EBUILD selinux-chronyd-2.20140311-r2.ebuild 391 SHA256 57d68b9a7784b9d368dd0abd726fd7b8f5d45574c13c6610fefe5a4cb6354c7f SHA512 4792bc77a62540837e5e630b701ad895567503b84a6720472e4d8681e9277b609bcfd6d1ca5d25c1a62a9af6f3a166d12b4a53460866d069b269eea85d43cb7b WHIRLPOOL 1026c75d23ed77498c2df373795dce9342234b2b1802225296490cabcfbbdfd14b8e1c75432fe0b86e5862de64035ecc2c5b471f52bf61f93dd312ca0cb6282d
 EBUILD selinux-chronyd-2.20140311-r3.ebuild 391 SHA256 789b5709b1d4988f476ab4617451c3dbe6a9883fd1f7f90236ecdffc0e743dff SHA512 26461aab33738112a01f56fadad43e53ca15eeae5b423793f0bbdb387e590950ee8e9f991de035e728082127087cba30502f3fab6175e5e89583371c2ced1dba WHIRLPOOL 9c54a277bb9a00e640510003a69548732e8425e825db2265a046a5be361148273897995c740d9ccad26143e3ef693ef7e6f5b1ca1e360b0aa4b7adc3e944774a
 EBUILD selinux-chronyd-2.20140311-r4.ebuild 393 SHA256 b3996ed14d914040a0bb365da7f07a2b3a9aeb15453b79b6a283010c62266863 SHA512 a00e7ce6e2861909db062f8730c935f5f0842a4888ca2b24aaf82588ea3f40ed0326cd6d82588cde8dcae48a230e27337e5e6a57a9e97d9fd56cbec268b33cb6 WHIRLPOOL 7ade31d3b87328752cb544f386578f529fa2a3bae87c23c1e812a144ea02e3c170bba356cc5fa5cca814690969816e621b85bc7ff00e1976ead9c3e4e6232da6
+EBUILD selinux-chronyd-2.20140311-r5.ebuild 369 SHA256 291e0e57941eefbaa6bfa316e20985e58a90f93f9ffafce74e9c39146e35de7e SHA512 ae763b71fa5856b18abd315e6148a9d7c29e6ade5b67ba7d2eba0a2e38f011b37709b56086ce866c6cd3f137ddfaf77ec776af2e49ee33bf94d90e92878c2a67 WHIRLPOOL fd90c12e9d035a7967e19b225a31b10c82bc4fb42beac61836ac97b10dac9bb1518c84807fbc3a7ab4254b0d878aeca6d86302a70a616a3ddbbc19baceb3cf0a
 EBUILD selinux-chronyd-9999.ebuild 349 SHA256 59b899f456388b5024d1a4f026509f4847a18596a4e795360d79f3849a500daf SHA512 5d2ae98127017b6b9877cbd88b03f97b4d4a9e02fe255fc7bc4542a37d0bcec9c5b7afdf0ef3d1a10f40a38bfc53406b8bb815d9ae95f6b34b2774e7e8975ef9 WHIRLPOOL 9f4a0acfa2e61156bd143e7610ad88d67efdac8768bc42cdeef53bfe53286373f747ab2b28cb0a5faef3ad8b5bad94da7addaaf2b6138b8719d4bca48a0d2bbd
-MISC ChangeLog 6588 SHA256 af20cba4bc7b11f2d015e7c9da431ac6b6d855396e88967382e7f2178d527c2d SHA512 9c74140a8dfd79f6a0351f604878d34f76930c6ef3f5a01ea3f0514c3ef7dc6837d7ba6a1a2003c2fea359cfe14d5393de803839b5113cbb597dd421927c1845 WHIRLPOOL 663fa7297cb5bb5e58e92b6d471c41f600607bb89cfd3dac79ddfa6f71b276ea42b4795d71e88778a564aa84b1ff3b4b427f851038d1a00c047737cc7754e78e
+MISC ChangeLog 6782 SHA256 a8d9c08b331a515edf83f2503dadc20e777eabb522f41bffbc4502921290ee61 SHA512 f768fa17f502726e1c54c1f1662c67a3ac089df9e17a216b914f816e983ec6e3b922cf440fa0b78f56297051298158b2f2853b2c73b3a596416b7385d39fc378 WHIRLPOOL f6d08f6ffbdc7f572c154ac6103f5e648bd7e3f9bf84385fc052d4f045cca6fec17c87dd1a14ca23af3c18ace253620a97a80dbb10384a6414cfd6c96aaddf41
 MISC metadata.xml 231 SHA256 5c893bd6f3fa4ee7b5a147303975ccd57e9afb19ca3ff1dbfe7f9ffb6bd4d2b8 SHA512 38e48412db683a0b42388b7f98ede80b3c3b0a5d80098ae4e4b35af64adb73132835fa664009f798bb55f74c8c6efb8f60ce5659a1606144704c62ff3d6383fa WHIRLPOOL 120d0061b150652ec8709529ecf75ba715f4adad306c7a3d6796a0fe9efc4e00b8d65310da1e63aca1eb8cecdffd591e284301f81d19062a7fdb40d62b6673f9
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0
 
-iQIcBAEBCAAGBQJT5RxgAAoJEC7dUkA7aK9HgmwP/0w5vQfS5mYQPKbBR7h34tuo
-mU0ZxiMMepVVRGg94qrvOv8mSpJf6lZaRgrtZTR+CYaH24qxkfrtzRyao9EiPgIQ
-Plk7ObbWVBckg04nOI9SqUQ5+BVzF/U78+mTZ+eT2Stb5+F6glWoVkHF9V/aTrcR
-cAeXJ+gILcZHHXWxAELye91h53EiNndlYcz8linTckO2mT6KCxnWg8J04IiNPt1j
-v5lepWE5k4bjOA3bx6mHeCvc2TXeFGwfaP45QeX2gGpZ9oUC0xZq5akfyrTzgiIm
-xaHVWo1+wxaTcyz12d7DetDGnD8fSYWHO+po79FD6jE//bDi2IRBwz1WkytXTAQx
-eELT/9x51CjBO9274Wy/1sMtm+PmNRpaXx3+9DO58ln4JlmjnK7414HLk06/okvW
-7W9mpNqq0cNfWU1ktAaQGq1HXfWB6sq2dLmBDpZ1yVJDcMcnlg9ieXrK+h77Egsm
-VFVD8alFx0GBkFacKwN9IS/DSFpSF/s1l3bikxI/3XMfJZJVdy2QlQvzm0dTm9EN
-5nAKBTX04HkaS9ALDqT8RnR0PTEWghGDRcpT+2SSzL5Nk4jucV0zul656x7lIURu
-0zjXE4uFn2Qx8TXb3zl8Yj9/ta/SdYZzXJ7ivRj2sGP/yZubN8HFOEi/HbNONFAC
-b8Et12OwCUh7OgYb8k6X
-=aTQV
+iQIcBAEBCAAGBQJT5ngyAAoJEC7dUkA7aK9H3tAP/jfSyrYgGIYE0+Nqe6E+4DH6
+ga3nsxmtK8UZ/rl/BczsG/wCoWDpaqyu17HNEm9tW1IkbhoYHGihPFN8AUew+xaF
+IpwgZIdoiGceP7eSnyghyZxir3zDjK/ZyyJn4x3c//ImjiogdbTcI2dhnyHtylvB
+pg51k63bKTqSovVTVjmlMMKTYRfoyvp/lCiCrbRAMW7HH8WDlABRGSDcdME/kgAe
+bPQx1Sx6oQJmP3bMP2iA9gNocodAlm2h634PgyP5+EBBLLGXzShSK1SEFrb44B+F
+bd7mF3xOfCWOdT5p7nWl7lQrnsOWgy1oI30tl3q0xVkbj/tl0K4QgDGr8IiLKc1l
+6z0fuWczTP9TjYrzNIfGMTczUxjcA2C3KIxxxn2n9UM06yKyjRkDHQ8I+UxTCQO9
+QjEm87Z5UyCLCbNRqANrZkAxnM82r+sEyJDlx0kVOjuDjLkTNbOyHm0Dqj0Q5Bi1
+7p+QpsS8ieK+GLVClT4mmBD/fec31u0EQZR6k+kkZdyv+PX9jbq+2pcdg5ULQWep
+aiXlWlr9F9wrT6CwPDJinVRlRcqxJO+47RNFWQax2o+rddhvhuoYl/3tJymSzpKl
+oO30wrTXON64mlYPJ3DPPvyX6o7p1VCIrLNZ27xnch5U8dE2BDgd9hi6VEaYJlj3
+5+UdJW98Xo3aTiUvBxLr
+=S/tu
 -----END PGP SIGNATURE-----
diff --git a/sec-policy/selinux-chronyd/selinux-chronyd-2.20140311-r5.ebuild b/sec-policy/selinux-chronyd/selinux-chronyd-2.20140311-r5.ebuild
new file mode 100644
index 000000000000..2f67ef07ce69
--- /dev/null
+++ b/sec-policy/selinux-chronyd/selinux-chronyd-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-chronyd/selinux-chronyd-2.20140311-r5.ebuild,v 1.1 2014/08/09 19:34:24 swift Exp $
+EAPI="5"
+
+IUSE=""
+MODS="chronyd"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for chronyd"
+
+KEYWORDS="~amd64 ~x86"
diff --git a/sec-policy/selinux-clamav/ChangeLog b/sec-policy/selinux-clamav/ChangeLog
index 61c23d1a74d5..0f0536f22af7 100644
--- a/sec-policy/selinux-clamav/ChangeLog
+++ b/sec-policy/selinux-clamav/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sec-policy/selinux-clamav
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-clamav/ChangeLog,v 1.65 2014/08/08 18:49:31 swift Exp $
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-clamav/ChangeLog,v 1.66 2014/08/09 19:34:10 swift Exp $
+
+*selinux-clamav-2.20140311-r5 (09 Aug 2014)
+
+  09 Aug 2014; Sven Vermeulen <swift@gentoo.org>
+  +selinux-clamav-2.20140311-r5.ebuild:
+  Bump towards r5 (fixes duplicate context for hiawatha)
 
   08 Aug 2014; Sven Vermeulen <swift@gentoo.org> selinux-clamav-9999.ebuild:
   Make 9999 ebuilds EAPI=5 and transform to make master for version bumps
diff --git a/sec-policy/selinux-clamav/Manifest b/sec-policy/selinux-clamav/Manifest
index b9b208ec9cd7..2200a69e8838 100644
--- a/sec-policy/selinux-clamav/Manifest
+++ b/sec-policy/selinux-clamav/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-clamav-2.20140311-r1.ebuild 387 SHA256 8a1ca95ccd19b2d4abe0a55d1f47bdb6c1b01396f35693381cacb5677af0ed4c SHA512 945dc1730d6918939f359a244c02c78e5d1dcd1250bd62abca05a5bd2c9f94cf3207a1305af8b8789bdd0246280bc7055e013c4251de11b8e0bc66330cfd1ca6 WHIRLPOOL 7395e6b699f21623aafa5ca30a301512bb96a0759155ccef2b4899419b64db1200fb033820bd40ee410489d784789eb825117e6c5dd8b42273227d0ac0a09908
 EBUILD selinux-clamav-2.20140311-r2.ebuild 387 SHA256 ea6d73a808126c607815d84e92cd0fd305503a351da5ba502e6dc80874b9bb17 SHA512 86a806ac9c03a3f49cb6a59fa75c16cf260852f1a94f7951de34c17f1685f4ed6442ffde213478ceb09791f11d19fc8315a7d14ce210786a84773feac895287e WHIRLPOOL 16f99b1b429d2c199731dd410156f3eb1e20c9d5fdb6a8c803e9c83f0bac87050ab0350687b535c037e6b50369e7a995b1c46e42b20919d349a7cd4195e70c4c
 EBUILD selinux-clamav-2.20140311-r3.ebuild 387 SHA256 c3217edbc0acf68f93c18deb16b732b09e28fba2b23c8e0200e2212037223c18 SHA512 2f154dc3313681d6b4ce67f2a0b4583c0b7a6684c6f07cd624ce4308064b0ca1d2c4b4febe2cf820ff1dc56b8f961bc498edd4f429db92d3bfa1c0ef49c018d5 WHIRLPOOL 2a0cbad19bd19e94bd4a62d7393a5b3dc3b677671a194636678a23ff2b78ad5f485e278ba824dfadd051418f5b1ae166f341408419c8cef55c1d1d08f3eb4ba5
 EBUILD selinux-clamav-2.20140311-r4.ebuild 389 SHA256 e3547ff9d524c3f6b768f677bdc92273de89131b26bc907cd28e84bb872d61a0 SHA512 aff2c95f2f2568d54b0238ceea1934763f35e06ad82b97b593d8754d6bbc219d11ff41960fcd72960d81f59a23d4e7b7643eaaa9051ceeb4a05a6ca7bdcb8bc0 WHIRLPOOL 56aca0846bdf103286a69391195a671daa378afda320e89e2946cafe506eca2f48fb7f166776038dac499b17f3e15f738e1c0a6227ec1baa3e9620bc0954d3d8
+EBUILD selinux-clamav-2.20140311-r5.ebuild 365 SHA256 e13a9be5cdf581ca599ce5b326c36066a6ccb1f60ce86b61b79677bfaab27f49 SHA512 a94989e07c8b811cec91991d675bb54025f1b23691efdb4f5b9710b5e50df8b87d4e029df2f3e7d18809bb5e366051c5513950e64b5f630d0fe57d01a8ee338a WHIRLPOOL b506e756485e427c881a03c8e283863617df4efc6a1dbd52a81d88474b6ab3af27f3f45f37499eb4d47b1595e7703c5bb232f2e72423c0798eff7f4c24040d05
 EBUILD selinux-clamav-9999.ebuild 345 SHA256 332101291c2f322b31123878b9a738ada82634564f855d67fd2d88ef371c0ed8 SHA512 0594716d7075e1741db18395679d75a55c4718665374623ec1012cf90d6d013fb76c56f6c689c2dd32a5a0d17c528882ad1f9f9413e8b419902678474821948f WHIRLPOOL a924baa6dd1516f4c95c3842f35d8fcf43a555da5ce46180885d1f7bc9196af012d57f72043627a881d6bd392a083d201a48b988436a95f1b553a6d85c75a2a3
-MISC ChangeLog 10085 SHA256 d3715a0c8e6f44b296c9e2eaefcfd7a732e8fb4431028be76151fa1f09fa0c29 SHA512 111cf51a932a2cfcdc7644ffba41dc0574cffe2ecfdeec8a497f56fd4e404ceb2593e4cbe9b8c8594dc4c74828afbefc2b2544ae289c6a63da079952ca984087 WHIRLPOOL a3abb359766564f38413eab8d0178e1fa95ea70c519b06a949c649488c8a0b7b9785ce892a8e15ce9024adf973ebbd992ffaa39f8d27c929cbc85b78b2d0e7cb
+MISC ChangeLog 10277 SHA256 6d3249d3b03f609f5519accff549f847b017b2bc3978335c7cfbae8c21ac9b8c SHA512 c9edfa2efa160f5bb0bc2bb184fc742005cf800e519dbb75749a981586cf2c70292bd7955c0ee1d5274a10976d6d18d1205e8b2aaf0cc518cd2f0500548b1f60 WHIRLPOOL c06fac2ce679c15e510c8b0c85c10f61ba714ff56466045e837e7a535807d987569434d3cdc809cbf161a5c64d7366f733c3061052198ba22dd37a147070eeb8
 MISC metadata.xml 230 SHA256 d65df5ce5b999bb86cf30a2b28bb996d82f51f280d532878b06eab1ccfa987bd SHA512 b9913827b4f69987429fe65ae935df5f317071f5d368d985f310f351d96af65fe98d94f784b1c9f1a5db7e7d0735296ab645e6e81d4b36aeea366d6eaca75571 WHIRLPOOL cc1564e5f3047623e987b1d75ebdd2bc77ac53b6ff39a4e77db2cd9985d487452a60acef2d80049247396e054c1f34e8f16f34b1392959e22da4288868096c09
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0
 
-iQIcBAEBCAAGBQJT5RxhAAoJEC7dUkA7aK9HnhcP/2LEheL6DmYj2B3k6KI1lrIK
-ytmevHnpUnN+L5kdlD8rewgBE/XclnilMs+BCE6Tc4cpIQC+L499AUHdgM3QpfNT
-izqEx9cuYtadaoYnB6u++gioF/lP5pKeUTwuudcJtaYOSOvF5fYIp9MG5C7D4Vxf
-sQlb6WBHCLBktrbSA5wPE64MDvvYW6ms0b+uaMN5Qzu/IFelrEaTgelH+KGsRCZO
-MY9bbtvHAUnPRmeAoUplonzl5Y93S/9ntXSS6/ULyyqiI98UX/IeAJEH0s7bUlRE
-O5zCbTnhHm+aEBZm4lg4J2eryGbd8F7IzqBa4Vmi+2XmbxtYchR99jcD/Bj/OPVk
-UQGE0OO05pHw5GlIfygTWylAFcHKM4Po/BtBdXZsvOw8qPwqIW/mnIJQuelMI8th
-vWIaJ6sM5i/Na1cNJuZpNPEKhYDw8uZThxEAmUWKzjhnodGTgku4UxO+swjNwuT8
-l63TlMZQFN7ECtR94TQkbbZ3SXeOnFNNelPcNAr67YgaEZ9b+dGmSwLoeu4MVcYk
-Y5SHaSWtQCpa2n0dLo2ySv+4pVhHt4ycV8H6WBn60C0KLuIaLePScqJLUrz1DKc6
-30+z7HVCO1S3G6gc1VpTD7a0KPQcVYTNiAH3Yq0pCIFPabYoRiMAXgbMRP96bWnM
-sa913X0n+F1rO+C0gK1B
-=Hx1+
+iQIcBAEBCAAGBQJT5ngzAAoJEC7dUkA7aK9HKTkP/24BfnFdcm7nYt5tiuvD9ZGR
+ptGjqFKW+91/FP/lLGH/9Untjpx69V+mC3DJue0xK4EH9aW+S/x8KtSQZfwpVskr
+Bn1ayqrsaGypYKboEfOl7Tvw2atYLMxf9LQEm1v8Suz7fpFOnIuNng8zYE6MSz/s
+auBd69JVZc9h3J25U4IgL4pJodwRTnupL+ToDg2GTUIX67no9aGRoN/Uvp70xrUD
+C6KPkDzVa5EQytrpLGeKX7kwkmGiBOFA03eiokJ4b65Yohsqt2RTNXTVGw+iERbh
+y8HeavZPJrg3X24T9m2FZYow6gJPy4CcnGK3qO7ZjG2eGigb0C60gNvpuAsXllvY
+Gsot4B2tZyC9Xvj9Vx2xR47T9HcraGSabEEWq/88MDjVlVp1t8r0lntRQHYFvEh5
+kLUQpbTicAAKLHXN4dc8n+rugqncVx8wtIZAVaesL74oDj2/7AXNMXqZo/wpgK50
+JenojKclvW3wVOQaFmChqHzE9JNwMpkc4FiOIpamtfW/ktiVymtBOHfiei5PdzCv
+Zg1Rx5wyldsdngnZx5D7aAWQK41Vuyvwfavys9/3JHgu3NK6V7GQH5W3Vgpkz9uZ
+UbyIW9n0P3pksEeLqqcfIrC5Fu8IZZgh22j8pJ2iQh52NzUXNqbxGpEIrYqPI+aU
+VGtCYaEHQIkMswI63s0q
+=AbLW
 -----END PGP SIGNATURE-----
diff --git a/sec-policy/selinux-clamav/selinux-clamav-2.20140311-r5.ebuild b/sec-policy/selinux-clamav/selinux-clamav-2.20140311-r5.ebuild
new file mode 100644
index 000000000000..b557ff6e1de9
--- /dev/null
+++ b/sec-policy/selinux-clamav/selinux-clamav-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-clamav/selinux-clamav-2.20140311-r5.ebuild,v 1.1 2014/08/09 19:34:10 swift Exp $
+EAPI="5"
+
+IUSE=""
+MODS="clamav"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for clamav"
+
+KEYWORDS="~amd64 ~x86"
diff --git a/sec-policy/selinux-clockspeed/ChangeLog b/sec-policy/selinux-clockspeed/ChangeLog
index 210660b5a3d9..878efe92af8d 100644
--- a/sec-policy/selinux-clockspeed/ChangeLog
+++ b/sec-policy/selinux-clockspeed/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sec-policy/selinux-clockspeed
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-clockspeed/ChangeLog,v 1.69 2014/08/08 18:49:57 swift Exp $
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-clockspeed/ChangeLog,v 1.70 2014/08/09 19:34:37 swift Exp $
+
+*selinux-clockspeed-2.20140311-r5 (09 Aug 2014)
+
+  09 Aug 2014; Sven Vermeulen <swift@gentoo.org>
+  +selinux-clockspeed-2.20140311-r5.ebuild:
+  Bump towards r5 (fixes duplicate context for hiawatha)
 
   08 Aug 2014; Sven Vermeulen <swift@gentoo.org> selinux-clockspeed-9999.ebuild:
   Make 9999 ebuilds EAPI=5 and transform to make master for version bumps
diff --git a/sec-policy/selinux-clockspeed/Manifest b/sec-policy/selinux-clockspeed/Manifest
index 38538d960847..878b8714c3c2 100644
--- a/sec-policy/selinux-clockspeed/Manifest
+++ b/sec-policy/selinux-clockspeed/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-clockspeed-2.20140311-r1.ebuild 403 SHA256 20292cee58145223a31f2f27b19c8e5cdb886957f0a132cc931211afabd864dd SHA512 e41ac7056948e402a850c0e2acdfda814f2ecb669e128e8c50dc81d90ba901ee1f4c834b1a537898adc61196c58412f5164d720541bdef460ebe60fc87c7a7f3 WHIRLPOOL 41e918bf3961d3f58acc590caca875e79bc85b008eca5dff094c1f16b40db5229e82a70ce925c4aa49ad9a5c7ac22ec03abca4559976252fbf974cd1e27f393d
 EBUILD selinux-clockspeed-2.20140311-r2.ebuild 403 SHA256 9251d9918736079ea9acc7169f53c060d608364f5a496f30c1db56add3b38c7c SHA512 885a4708849faad765579bd884ec3d57cc3f38629281eaafffc2b3e526bbfac674558095ae73cf8b5c6929ed4e66a57cd60b00f7e2be72662fd032cbf987d094 WHIRLPOOL 6bbd5d3853d31aa0358cdff08293a6245f7a68248efd1b0bb026b0f4e9c5be1569f1c9b02136d49c828e8e4372eb6b17164cd69fa849e284b3589c721bc81614
 EBUILD selinux-clockspeed-2.20140311-r3.ebuild 403 SHA256 2285d78fdc4dba1c590089e414041f432524e60b42fe6266230044a4648cf969 SHA512 1d0375b924f54963f363d8ea999ea150baa72a3e08aa28b7e569afae8d5fb73a04bf3e49ab7f36e1c8da386ef5611d4337eb1f1cf80f274a4972f00572a6a110 WHIRLPOOL ca24f9736cb126a632d0601e3165c46e8c11c1eb1d1281790db6487127881cf3be6c00931ec9bec49a113abfd2e48983839e3f90bb7de819c4b9f060e5e062b5
 EBUILD selinux-clockspeed-2.20140311-r4.ebuild 405 SHA256 1d201487e45206f35c10071d7e93b960cae2f7ce7a9fbcaf2f735700a0e41210 SHA512 63f6d0c39b9e0ab58bc536515a4917432236f4905b44570848e2b24352d5de29c4043fcff5f54d1363ce3502e34adb4309782043157987bc09e7f41744e2896e WHIRLPOOL 6eb60bb0745456560db3bd783a1f0f1a16594dc465e13f948b9391ccd0f29c848e919deee34c949e85a9ffbc7311768035f7e9d498696183f0ea6a45dff5fac7
+EBUILD selinux-clockspeed-2.20140311-r5.ebuild 381 SHA256 9b1db995a15401b96f4318cb34168e302649fd80c351f25de6a2e68fe698c901 SHA512 1f5fc55e45e713bae8bf18897e98a2533cd7ef055d62531fb6911198753e155ff487f1abcf1d3f0ff12a16624c063f0f8eb3909e6742ca8354f3b08daccac45c WHIRLPOOL 33ab4a15c6abea8ff8d29c00acbe9dc705a7161461e90a2f03fcb06aa632e79b2341c2346da4ed2be8d247d0b7d6631c87e6cdb97da3fb117ded44ae731cdfde
 EBUILD selinux-clockspeed-9999.ebuild 361 SHA256 89f4ab9e40c85297a13edcdd5db4d70ada7773f41f62a1f86fedb8b61fd4592e SHA512 3beb954372c51d8e57eaac92faa6a36451bfac2b64547febc0075bc08b89500fee28b7aeeca4905c644fac85f524fef6b696913e8fc491c0f4ceda1436615982 WHIRLPOOL 69bb3c75e5952c275e73cd35638331fab2bc85419f34dd643e60e89ac781c9ae767f1bf297fd89fcf3fd107d85576165028faca8e79d31a272abfe094340c502
-MISC ChangeLog 10746 SHA256 200705ba8fcccba0d9bb282e8af450976ed913ed4b4270b69454995bf7a2ec70 SHA512 fdd63bd1b4ce54ab9bf224e26baba365ea5952d29502524503fed76b57a4a45be03825f2b53e499680a61cc050eef852cc58419450aa5c32ba585ef1e145b60d WHIRLPOOL b6f0b00e33525d3c3cd5919201e7ba56ca364799bc4b614fc06fb0d9d62089012857fa0330073bb2e8afe89fdb8c0d03f4ae99a65e3ba950feb96ae6eef9cf3d
+MISC ChangeLog 10946 SHA256 fe577f831948093685e84710e72306f7999933eed0ffe9c20266012cb966ee4e SHA512 ffeed684301fe21f7aea95b6259c5f1063c43c60d0c52781e6d8a37fd05f54c98a0756419dc3a407221d40e4c957439f1bf9d0b3a0ae5999e858694e9999c903 WHIRLPOOL 6845192e34be9556f1d58c8632ee250cefbb676e8be8980d26387dc769b0449a6775e94548a72911091ec53d83eacc2c0353131d5b3312e796ca718c586c7630
 MISC metadata.xml 234 SHA256 7946aac4a1fa9582fe452e354382ec869a3dd6be35fe4f24faac41c03c87cf4e SHA512 2e213f185d22da943b2609145cbe2463373a73d8ffc910054434298a1967da7fa8426b54bf828c200a3f76138b2aef1b293ba401a8e1339508f9cca581ff0eed WHIRLPOOL 88c5726f5f6afe93e0a79d1b1e3605b8ba953d1e2492b0229cdecc70398c6a1eb3c45e3a99cd9eaeb27894761de886bce6c876d75945eaf2a2cde80258fa116c
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0
 
-iQIcBAEBCAAGBQJT5RxhAAoJEC7dUkA7aK9HMCUP/jml/M1de4i8SV/77Pbfxyup
-JUcQaCSTByLiAD/yLkgis76JSwCP9gkD8MvhJBq+cpmBHPgZgux+9SdtkcvpqN2L
-Gim07gwdbcPk0ciTv7N34Dna5wqYP+QNWXQGdJOTssk+29yggfDgngpVLysImWcw
-kak/znOGzdlGSNrEpulooqacxMACex2fJ+Q3wC+Bq/6bImJrqoAtx3NRVpQmcisk
-Rr1UiSmmxpRveCuTGj1/dL8PFXjWx9QTmracUk5yeOyHBeArVwKDWfG0qyWDg1yB
-vdOJpvpPK2U/qLu5ae5OwNmUH3zni8pFtY80hY0P6y/S8SmSiI4y04nd+84fAYnt
-dUhtA0BTLOb2Jfbj5IcsUzmgps9aP2SKQi76TgxSm8WnR6wPVMufW4ns/PQySNXm
-l21fFta883pIdfq+pZoBor21sCIi2uxjJc20zlf5MY0lYinKY8MU93BaH/qOzS7u
-mk9hnqIFsloIhvmpQakVacyHYBnDOYDD4YfRYPKzVite9BBNraiNxeUftaBVHUyk
-dsvk4S+HFPtfSswJwZrGwY95pSSLf0UalOJ/egp9mnA2kHfqZrl4I5L3bD7hnRAW
-l6kSNZwXwgSMUBjuZSglo6TxCX1vBQfMNTKqL68Q2AGQavtp5rScbgc2tfxBVa+T
-O+9t3xF6GIPFSKDutGXI
-=C0a6
+iQIcBAEBCAAGBQJT5ngzAAoJEC7dUkA7aK9HriQP/AkpirOBb/2RQMC8MlFzFFQp
+RawKW4a7LDuNy1YQZyQLOLzfQLq4AcyDv8oLZqZZ3Iv9PEr+u5nNXA7rvHt851Wz
+OIr7Yu+qiKNae1lebxX+zdFqh69IDzSgo7cht8ERjkltkaod7opCJkjt0t7HwzO7
+3N4X9JcI61jSLMCM8uqh0Vr0CVIp+wxeMF8aq1ZG4A8vlnu+UAbLZa+K723MkyJj
+Aoze6PSepJJqI/mtHpUEdz1kbEITnlIsxkPYPylkqbAK+OYcP4Gq6KXyRT50vGoS
+shQykKpVadmINnSs0fCpHByL2PPFYDSAqbf7akzKkKgWGLm4xxqUNxeWghSSsVXQ
+E8SrgYU1Rvz2FTGLXlKd8aePXIw77D7q48YDXKXgnSKRYQ3v+wY0vxJW5Ke64FnM
+zrEeyinHgbBI7BahVaSnNXhKqLoX4RToZp5L4w9P1HnLKCO0GaBkmk7PjHvC/fi7
+qgYW6T29lTnaR7WyS1WodSSs3KpJYW0jTyT0co8pVFPU/NPaOAAgK2skoYVcnni+
+qb1AOEJ8VBKGb97Ex3PVdSxNdexcGz0ju1uJS9DSRkuHU611BK60aRKwubEaiVzE
+65Em3/3lpdWHaKTyXOOfQcxQQ1NnKRf3YcWKQvkNGWPZQGPA0R2gmeLMJVhE/uNd
+REOzM1J5sf1F4fMDYhre
+=NfQ1
 -----END PGP SIGNATURE-----
diff --git a/sec-policy/selinux-clockspeed/selinux-clockspeed-2.20140311-r5.ebuild b/sec-policy/selinux-clockspeed/selinux-clockspeed-2.20140311-r5.ebuild
new file mode 100644
index 000000000000..2994cf442195
--- /dev/null
+++ b/sec-policy/selinux-clockspeed/selinux-clockspeed-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-clockspeed/selinux-clockspeed-2.20140311-r5.ebuild,v 1.1 2014/08/09 19:34:37 swift Exp $
+EAPI="5"
+
+IUSE=""
+MODS="clockspeed"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for clockspeed"
+
+KEYWORDS="~amd64 ~x86"
diff --git a/sec-policy/selinux-collectd/ChangeLog b/sec-policy/selinux-collectd/ChangeLog
index 4cc347805608..aee28ecdd2ae 100644
--- a/sec-policy/selinux-collectd/ChangeLog
+++ b/sec-policy/selinux-collectd/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sec-policy/selinux-collectd
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-collectd/ChangeLog,v 1.4 2014/08/08 18:49:32 swift Exp $
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-collectd/ChangeLog,v 1.5 2014/08/09 19:34:40 swift Exp $
+
+*selinux-collectd-2.20140311-r5 (09 Aug 2014)
+
+  09 Aug 2014; Sven Vermeulen <swift@gentoo.org>
+  +selinux-collectd-2.20140311-r5.ebuild:
+  Bump towards r5 (fixes duplicate context for hiawatha)
 
   08 Aug 2014; Sven Vermeulen <swift@gentoo.org> selinux-collectd-9999.ebuild:
   Make 9999 ebuilds EAPI=5 and transform to make master for version bumps
diff --git a/sec-policy/selinux-collectd/Manifest b/sec-policy/selinux-collectd/Manifest
index 3652a3fe0e75..03aab8e8a1a8 100644
--- a/sec-policy/selinux-collectd/Manifest
+++ b/sec-policy/selinux-collectd/Manifest
@@ -4,27 +4,29 @@ Hash: SHA256
 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-collectd-2.20140311-r2.ebuild 395 SHA256 43e1751e139a6e0d039a59b0a22488463140b8cd6ebf4e8992d7401cd86cb33b SHA512 e46880945e651f572dbc5eda7462c8cd8dd0bae97f7de93f777a35a0886a0f884548462ba8de181d16bd1b251b7f5f0f38a9f69aa908b3b5efb756c2436b55ed WHIRLPOOL c47312c3f88b96995e5f9ea656ed533ca86a4a076e0a16598afe1333190b62f8a455f4e38252394cfcdd0996110564728e3dd0952b2dfe4e83245a8c01510f37
 EBUILD selinux-collectd-2.20140311-r3.ebuild 395 SHA256 7fb425b6034bf5a06f8ae7baee058502cdfe92a9e14c9082e240435a2b23d5fb SHA512 9e84105d7b13bc395841c1572981fc86dcab8191a27c295d54f084be748d332090ae79adfa7a024d4076f843e77ce0006ba680426f7cbed9d459b7c77e7f5be5 WHIRLPOOL 03dded2445b628561ad4bae808cdeaa436976a933777a6731a029e0249cdc01b1bee0c909feab9ee89dab8aa4864587c6507dac499fa339152b9b6e498ebcac9
 EBUILD selinux-collectd-2.20140311-r4.ebuild 397 SHA256 1565f8fe013aa4297a88aead75b2c968be10f2e6d65261d27726e568d79399e0 SHA512 1d1bd781a51cce0c6a4549e88646ca1e22e2988da432ce729367f5e1dd73169e634fa1d2a852f56a369bdf140a4036930787683a5d35d14cf07194974c6dca37 WHIRLPOOL 8e9e375a2c6eabc976b40739d2c3106772e47897522b82574cc898888ea517c1bb042b24b487325d5e8576ed4816a5fbc877c45860e5b9a2d1d73bb0718a8217
+EBUILD selinux-collectd-2.20140311-r5.ebuild 373 SHA256 12d678ee4394c97184f09ff0ed83b3e0747818173b59fbe8149feee5fe16f58e SHA512 ebfa63a659ca099215e2d933907d52eb86e22de50cf6bfbddb253dcfa04c23255f2b5638091dadf4cf491bd790c532d4ce105593a8da9facfce2322348e23ccb WHIRLPOOL 60b678ed2e81daf848c8fea3556dd7bfbdce916b1db704bfb972692d244c43ae864f041f337d19b950d5f87d014c4c690f100254cb35e4c64dc86a44c329a41c
 EBUILD selinux-collectd-9999.ebuild 353 SHA256 ee7ddbdc229f4316a04c3003a769f933350a6b6624d4fe73b30528ecf4c52a07 SHA512 319644a5e3c134db6196b05f2b49c0e7f0b39b28fc286b7de1c4b250d3e7cd3584c797fb10dbbc1848152516d147a7a58fb77e8378ee9b4a7a91da2bb2195722 WHIRLPOOL d0ffaa9fda85170d825e55e32457d0c93570224b88ff7e8194437044ce5b7e95fb870a912cdaf03f9eba9d729a8197bb0fb49502ff27cffe18e048165ac67b9a
-MISC ChangeLog 1090 SHA256 1d2ed32e3460313734f870ced68f5de5a1cb1b480cfc14218440e2b52c6fd320 SHA512 dda9958d76070a8e6dd7d929ed772611400f499dc0a5b5f8d7d1227b2b3be15ae6a3b9eb42426679398da5993ce305a25c9cbfae6ce0a05538d62ac3efee62a9 WHIRLPOOL 1d29110590c407bd467e2eeb6e211326c530e72db62168c53686b80bd0cc6f52f078a0a42a3da59e80ad6c2f349e8867e796e57c0c8e9edfdf9e3b705471e005
+MISC ChangeLog 1286 SHA256 fc516a22f9c46fe05d4a126e28bf199ed0a7bac792897267d3b869bcd6e6c0b9 SHA512 0f2d48c178c76189dd749077baab04617902f202a8b1ee79021236619d4c6609d72327f608531c315ad98866b2b8b0aad3da8b6f0cb1325416e975f1b0915fce WHIRLPOOL a4ff8b2e70b32c9aafdf277fdcd6160a7ac771998bc2014eb08d08ccd088af8bf93f8d1f9bd3c0dd563e31026ba1c714d63469c33b97e978965dbc324ac93292
 MISC metadata.xml 232 SHA256 145a7ce6b0e22cceac660dd407cea1f7dc35452ca7152bc9e2538897ea1393c0 SHA512 4341da8cf5f07a62d4323e62d8e8c8e721addc2ef6cd72ab3fb57e372962e7aac911c2662e8cb9e0e7a226d670b7342f48507804bedc9fc390b9aa1a2e0bdfa9 WHIRLPOOL 7459824f5c109762a053d7f5b829c2790cfa7d986a6b9247755dfabda4a9a2a7802cfe0e4101faf1fa0c833a08de0df5d3b36e25b283a4149c46b86e318ca611
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0
 
-iQIcBAEBCAAGBQJT5RxhAAoJEC7dUkA7aK9HrTgQAKSeLAMND8MJrX2L2Dc3mclQ
-qnaPQAYVwGHrvSlByXM41S19O+YP7AzeR1M4+3jggFGe9Jhalh5FC7b1h2/KdAGp
-uGK/2xJhQ2LgQMfeMbdGCbrO+mD7WiZwFB/oj7MZg7xZvXAfu8A6sRem/jaVAPec
-pZN/SHXamsA1WviLilcgwJQg74gIp2AuQAG9Nv549ugpOQhmYDPteQXpJi3jkoQV
-OPqHjemJjDqz6xwDgZx+yMt/nQtF5M/EjLWrmpxfFNw9eqdXIMgGqQk5zxxBgL03
-aWi32VSJvVKZeMwvU6Bz1WO6rWxVSQCoOd5DBhoxnp+MFYXSWKjo2G60GnAvkNS8
-YlRl05u+JEaypWX45yTaIr/8UjTJp+Nzc8Z+nsf2nVtNYae34rBfWHMNJ1lZYG7c
-Y0QjQPuxin00bYFyhpFChrW75fzcz+zzRmKx67HpiKS1wcjfUk4YwfrR89gQzvYT
-mZR0DcWZapY8r8OnY8uqePD2c4VJhw+xF5pQZMo4unT1vXXZ07Z7sOlIzDBUq9PQ
-ENQTLtB1Cg8dbcdqFmjQnu95XKgH5wJDZhxARiWQbwi+yhw6g8pMxHSLZaPostni
-G0cf4bU6Nhbs8s67pG+YJZiwx5YaNVdij5rPn/haUU9gtUKcmjqt9pCuCv0Au5BO
-NyOjhrDMNyne8t1+ymyu
-=CuHT
+iQIcBAEBCAAGBQJT5ngzAAoJEC7dUkA7aK9HuHIQAI9p69zWK1fiz8cZD/A4qUO1
+GdfO39rlrNlMetcZ5a3bTa2MAj4DLR6jm1uYjgxeMvbLvw+llRZjutkNsFkNVQSp
+8MF63smiA56slCA72YdlNNZJdP811NrtIoCbt8hc09sAsVyS7NV40FwqJUYLlR/H
+LB7KKFJOLpIi2RQ46kgRxgg69xfU1UOS8kHX9aXU9Ae5nGf5ILqVLxs3VOFp9Lg9
+zPTUrPogtf6Gd5Cw+6kwQvicMPdH7RgGsCpexqWOBg3cwDisovGzcVk7cIcqGUuM
+UwNMAfcNaJlQ2cXJDsCTAIeOBhc3bgv+VGQHJeC6aD/7j+4IAzDWYwMur85t1Vhs
+7r+0G1hTNF5fDNHvw0aVSwd4CybzwD2lBr0yeI318Ri9qk2wJmUWoOfyJAxioZ5j
+Vw49M2eAGqX/8l+VzkEjp6dfW7DBrKHMkg67m7jt5HwxLzcwZu9plD1ntRPUceQx
+xiOCn3g/+JJKEsBki9UqKWwYutYcFgXPS1y5TUj5Ts8FABtKWxTnl/Gf8PIdONud
+vHhfz0pJ89tZnouIqLPKsdw79iWgD1TCANlT9MJnsEwjBlvF/KUaeqBykPlJ2+Vl
+FKBuHCtWrDfbpeeldX9UDAcBgF0lHAd/xaHd5tcV8fMJumWGiL1OhOI0S+a6tlSy
+WNQev4CNVmPsdFnl8Y1i
+=zi2n
 -----END PGP SIGNATURE-----
diff --git a/sec-policy/selinux-collectd/selinux-collectd-2.20140311-r5.ebuild b/sec-policy/selinux-collectd/selinux-collectd-2.20140311-r5.ebuild
new file mode 100644
index 000000000000..5d5560bd34e5
--- /dev/null
+++ b/sec-policy/selinux-collectd/selinux-collectd-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-collectd/selinux-collectd-2.20140311-r5.ebuild,v 1.1 2014/08/09 19:34:40 swift Exp $
+EAPI="5"
+
+IUSE=""
+MODS="collectd"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for collectd"
+
+KEYWORDS="~amd64 ~x86"
diff --git a/sec-policy/selinux-consolekit/ChangeLog b/sec-policy/selinux-consolekit/ChangeLog
index 4c53335a4c6e..346ab2ff4128 100644
--- a/sec-policy/selinux-consolekit/ChangeLog
+++ b/sec-policy/selinux-consolekit/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sec-policy/selinux-consolekit
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-consolekit/ChangeLog,v 1.42 2014/08/08 18:49:32 swift Exp $
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-consolekit/ChangeLog,v 1.43 2014/08/09 19:34:14 swift Exp $
+
+*selinux-consolekit-2.20140311-r5 (09 Aug 2014)
+
+  09 Aug 2014; Sven Vermeulen <swift@gentoo.org>
+  +selinux-consolekit-2.20140311-r5.ebuild:
+  Bump towards r5 (fixes duplicate context for hiawatha)
 
   08 Aug 2014; Sven Vermeulen <swift@gentoo.org> selinux-consolekit-9999.ebuild:
   Make 9999 ebuilds EAPI=5 and transform to make master for version bumps
diff --git a/sec-policy/selinux-consolekit/Manifest b/sec-policy/selinux-consolekit/Manifest
index 17e43756bb1b..d920531e93bd 100644
--- a/sec-policy/selinux-consolekit/Manifest
+++ b/sec-policy/selinux-consolekit/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-consolekit-2.20140311-r1.ebuild 403 SHA256 8cf4f86f1ac6442fa0c126bc5acb7df44b9dacaa11ae25fa48ce0fc0da2425d0 SHA512 632996380d9aafb7319ebd278b31044f400832c99cde7aab5862439aa64ded05c1c599f6763299a450cfd73fcd04a742a8dd34bb76e78d05430a47263eedec72 WHIRLPOOL 3e88840a6c6ec1a3352b585e9a7dfe7ac579111c9bbad28e9449530ee33ab5e0a001c2ac2992eb4967acd715fdb4bd94e6977114bfddd9759cd4518c4ca24590
 EBUILD selinux-consolekit-2.20140311-r2.ebuild 403 SHA256 4dfa22677593a3e1a236ef60d7f55ddfafe1ea26a48b6d5e55142cbca1d2c916 SHA512 9927d24fbd780cc8cdc3e2cee9f793fea3c2dde77740ee341ca03c72fab83bfc6bad6291428736ef43db49461ce1b9fa5f5248fed5dc403464ceddff0adaa932 WHIRLPOOL 1aedc90e3412b6489db2a461e7f3703b73bce1512ad3268dead670322bec50c2e8c08bb36f0c6834450a15b90170b37444a48a11c91fd12f0a9c4967ebd958cc
 EBUILD selinux-consolekit-2.20140311-r3.ebuild 403 SHA256 1e7a08ce2b30fcd14b5f6edb2408963e73739db1e1b25e9287865bda80f10d49 SHA512 1362465437f2025cc9c564d231d7ff4850a7f9d2da5b601d6bc26072e507978fbd2d67d74712ec6b7915bad0a358111d6882e0b2cf58b6160f2f2e7be90c651b WHIRLPOOL dbadb6ea4e66d782107c9b5c7956112db7c5b7bf02db3276bae3ff815bb520209132dad4422d391ae40fb1bae9444b26334538865fcbe1c6ccd1de3bd9d9e71b
 EBUILD selinux-consolekit-2.20140311-r4.ebuild 405 SHA256 fedc3a55b4a8ef0dbc03f20c869ac0373b4611691fdf5eb5dd4f081208fd1460 SHA512 fdf699846a220bb630d70ce173add75b5218fe73f65b4b8a7c37f29238cd0ae9f4619fe4b690a1f8b55e0b1d2621ff0182142f2c4224271f0431baf9e89ea76c WHIRLPOOL 9ae0c10ee82d74efd151bfa4c8e0357822f4945634dbf616d5c21d0a6026232975d594707c361049de9d21ff12d716b72fdfaf42b1c4072e963f4dff151250c7
+EBUILD selinux-consolekit-2.20140311-r5.ebuild 381 SHA256 732100c8cb5994d40c9ff0685b7ad3cd069140e9913a39a1eee673a9cd1e178e SHA512 a3360b5a3ac9b2a93da1803e45bf445308462afa250e745e94fd233676f648f58df7078e4f3290d2a3211619d8ae7a6bf2a0a70181910e825f332113aea09775 WHIRLPOOL 19eea11b4be14f4d4b7449a7aab78db248d08a9c0e6b5c76426a7b851c5cb6a150af8887d8565cf775628e1d2921f822939f2ae5aaa62fefbbc7c103ea3207fd
 EBUILD selinux-consolekit-9999.ebuild 361 SHA256 c8fde6b6acc7d0395c814b24921452f0bb0314ca8e7d89a8a939637aa01757f9 SHA512 a32819d261370191c155f3d949c41427c4c8822761a44ac5379bc3f2ee9134908b52f71d6143dbc7e24f3c9834c0f9ed39e0752db7b3917014a4dc2404319d2c WHIRLPOOL 942c9925c4789cc586e58f52cf7fe581b3951adcca451a7a9590d1e515d9b434ffcc1b56bd57239043e78a0dc74f7d886926e82ae00fd8bd917e278d62137912
-MISC ChangeLog 6837 SHA256 a157c919bf00e37904b5d50fa406441d20cbffff5a51dfe04b88f3030c3d248e SHA512 272996a2cc9505d191cf737e93f0ae58c22375749d5a520daff44b7a3da7d4b68bf512e786689bded19d45a4fab6c2e9761f0b7d9bbb9cc4d672221dcf430ff1 WHIRLPOOL 2f03bbca80142acc0f20d678862312201687c891a0289ad31d8ed0bdebdb9dd30fd28bc0970b7d055be91d8c0369efe2bf6448cd57a420898775da8868ba5414
+MISC ChangeLog 7037 SHA256 9bca63f0a311fc69a8cd3d1542d514f07b60f672c42e760902286c7e28f8a75b SHA512 cbb8e4f7b510cdec8caa4d21e4acb35a5c0eb301702e91e798c01d93461890510177da0a4e40d357e653e70f95bc3e4b6b17791339df1f89a917a4f40ef15d7b WHIRLPOOL e531dda0203dfac887b285da1eb07b84d370eb8300068eeeaf929d883cd7ef068ace75af89df9201e7ce35fd8834b949e047cdc6272a9f9f87197bdd0eb965c4
 MISC metadata.xml 234 SHA256 e24a8801c64479da295eba58b6a3ac8f7e2bf05b447213ad0ce206bcfc6a438f SHA512 ef1132c87382c591f90be50d871cdf18c090d0268ee809b64b675aed4f552f974871ff6187e9b8f07594eff68ac163d89baab8616c9c29ff4bc730d97b89be87 WHIRLPOOL 8b59915585ccfa81f3557a4756c36167a8820a5d14736145ab6bb1933a63602c845c21d97832896f183c368f3f212af7a26a73fa95a5562f0e35af465c470dba
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0
 
-iQIcBAEBCAAGBQJT5RxiAAoJEC7dUkA7aK9HK3YP/iqMIDMelmxHOy6r5WId1Ogh
-kiRVfo9ta4/4rqdGP5OMido9TgYmtBdkBJrGLXmUT+EYCvqMRhe6/3B1WnXnjU7o
-rCyArXJaDrWO9/icVqW5sJzlf9m0obK5Ity1/WKDavDymVEESKcw7YT9V3eOwmvX
-ZAiUYXCAZmjIgL/CACOjIY7EH2UslIuK1Y4hndQpLGl//Sy51Rw0GrwkQzjxJhUV
-TtWBbMKTvUk5zyLmR/5fmcNLXoHRXcyyW+LCYS3eHoeQAYSZYZJW+cxcJulf9f/7
-YGR0+qDyMGPniwoPXbaITfQNxgrL9k7hUo/KkwdrVXTSKClknIrZS096g1L4hxFk
-+1lb7W/x1lGxK70hSuBzNPaBfRd/M13GtbQU9YbWSzYb/0TcVRvQz2K4rHmBTAKi
-MmEkc3G9xBoIQfKfcQDgqxjr61PjgrHjjSwX7hie2wxFfzySkwqLLntQOZkB3Nhd
-LwKd5VF+bWNni8vfBPBacx1FvVfTtnSvZxPoLIABldIHMkG57ImRRQBAfjmnBrfv
-WAhNcnJlPm2cSqRlz4fh1v21qEi5mOlkHpxURHdlZf0z0WSnAuiSHheGHO0sBncZ
-hVeIkr5nnlDAC0XxOocPc0lXyZQpqTbicIVJvEQsBXQhwo90v7qxiWXSb5+J94Jm
-diB630aizUVucNqiN+gw
-=u3Lb
+iQIcBAEBCAAGBQJT5ng0AAoJEC7dUkA7aK9HFP4P/3ptXUIudWMFcdw9jueLGv5Z
+2IokGR4djfB3E2VFVwGCTjAgsm1CZ/vn1G38wynuwMgVVQi3HENDY2Tzl1Q6OSB2
+opciOaOndB/coX8bFnPJFDMQJ0df4v6q8mMpGmBC4kDgpV6a8FmmXJWBWDpyoHLl
+0EWblgrHEpjvTuGMMFcxtnqvwbUONLWz6iAnoc+2TmqDVdjVMg2Xw4CzoEvOyZ39
+uwwmsmX8NCX5GP0vardVCLZo47nBuoA7p8EHpPsJd2SSoQnveku0J9kp/NWPjH87
+qBYY/eucmZBisKCzmR7EowUcC4xAeYfLzuEseOYHdt/HiiPDv7Rf6tWipqfMAFPR
+28CQwgAbqR+uKVgaHvNxy3DUlLPkQ/rIxrPEJGnKC0qR6IE/wxewqjsgyqeiopHY
+x0TKTKrQpTLvnLJR7ymQN28tPw+604xwgWz9Emp684opJHMObjw+dClGo1XqOnmD
+4tetZzAmCA4c4v8XpC+FgbnXn/aT7Eu/D2fG6cJdJgzBxvenuOJUvACrgO/fEK3H
+EvQ/7EEjB8oqhMq+Ipfnlu03XQXSABGVDDfSg+bxNSc+4hQ7N4k4Bx1O/uZqRYE3
+sMZ3J0FC3FpvJDEJcea3gOCfP8F95utD5laBVB3AKn3BlWtkOZ961Jhpa4WRVEJH
+SBVUM5Au8ZIRxGGXuru9
+=7UpE
 -----END PGP SIGNATURE-----
diff --git a/sec-policy/selinux-consolekit/selinux-consolekit-2.20140311-r5.ebuild b/sec-policy/selinux-consolekit/selinux-consolekit-2.20140311-r5.ebuild
new file mode 100644
index 000000000000..5fca6f01cb05
--- /dev/null
+++ b/sec-policy/selinux-consolekit/selinux-consolekit-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-consolekit/selinux-consolekit-2.20140311-r5.ebuild,v 1.1 2014/08/09 19:34:14 swift Exp $
+EAPI="5"
+
+IUSE=""
+MODS="consolekit"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for consolekit"
+
+KEYWORDS="~amd64 ~x86"
diff --git a/sec-policy/selinux-corosync/ChangeLog b/sec-policy/selinux-corosync/ChangeLog
index 591314807fad..758532e9e7aa 100644
--- a/sec-policy/selinux-corosync/ChangeLog
+++ b/sec-policy/selinux-corosync/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sec-policy/selinux-corosync
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-corosync/ChangeLog,v 1.42 2014/08/08 18:49:44 swift Exp $
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-corosync/ChangeLog,v 1.43 2014/08/09 19:34:36 swift Exp $
+
+*selinux-corosync-2.20140311-r5 (09 Aug 2014)
+
+  09 Aug 2014; Sven Vermeulen <swift@gentoo.org>
+  +selinux-corosync-2.20140311-r5.ebuild:
+  Bump towards r5 (fixes duplicate context for hiawatha)
 
   08 Aug 2014; Sven Vermeulen <swift@gentoo.org> selinux-corosync-9999.ebuild:
   Make 9999 ebuilds EAPI=5 and transform to make master for version bumps
diff --git a/sec-policy/selinux-corosync/Manifest b/sec-policy/selinux-corosync/Manifest
index 5550c31ada54..ac80630c0dc8 100644
--- a/sec-policy/selinux-corosync/Manifest
+++ b/sec-policy/selinux-corosync/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-corosync-2.20140311-r1.ebuild 395 SHA256 450565f2cdd6b6a0150299bb2c759dbd0ba4ffdbef05e427a37a50cb440fa3f5 SHA512 dfc35ed1688214ee13022ba693f85723a878cec467444157cc14cef7695f90080416b1eb244da327d89364d14cf37b7045ffbc7a516b18197d951156a906c6d5 WHIRLPOOL 2221dddd364194843c4259b2b09cd52bee0cc0e6284da16af375789a7580f0ecae03f516f1f363be2af14a7c3dd70123d6e37ed0a311afe69d27f69577b4e8c2
 EBUILD selinux-corosync-2.20140311-r2.ebuild 395 SHA256 60c6c2f85ede1e91b742cf4621d84c57be82f8ba630135705e4f9e1e512bc72c SHA512 fd51a640553d3120fcefeb48f89da9acd9c6fa8eefa7d5ce48628b9e9ef97800cd195b8635eeb0c15920f0167cb3a5c8e72c1eca5cafe9b45732b306e242519a WHIRLPOOL a22b442f99431bfaffba3ea586b3a93e10fa94de1df2ab35b3e131d491ae7653d7e0e875e10b48167112eec5444bf9f3a0522e891b45134b815325642cd2cbd0
 EBUILD selinux-corosync-2.20140311-r3.ebuild 395 SHA256 0fb75d564279eb5e289cf4f22642946360e421655eae4da62f20f33f84f237ab SHA512 dd9c090d8d716d91e64110f7108773a1745a183ef3ce7ad7d336da245d60dd5fda33cf43452d100c221b455dd2e8ad94026b090e1ee33138b8be577200d15a96 WHIRLPOOL 2345e9c5d6cf7a1fab1fa81c4ac7ad228ea0fb3ea90d62806c1c268b4df4b99fe08c24e1f5d316d5b08b32d54b3c5039fba47d44963cd278804b0c2fa714d0ed
 EBUILD selinux-corosync-2.20140311-r4.ebuild 397 SHA256 d77f0f794ca09a0a437bea54fb1eb2e1c1decca2095d9c56cfae7728f11cb80b SHA512 fe5241696cc03b70a661c713d31f417b88ea57009aa1ded85f76d8153ab8674eae1ef782c7449c881ab0ec2821e3538e5a1fa3a9a89efbbdc7737522e917aa8e WHIRLPOOL dc43e6732b8176eac0e0711e530619423c59d7995286dbf3ce84769d8f0667f9b4e5e73c57bde9e40ddf3bf4c8d10e694de05bd795a2e2d18ec6ddbf774440d0
+EBUILD selinux-corosync-2.20140311-r5.ebuild 373 SHA256 638c0c5ea738fb588508b8fd6c2c81939a2c06ce88907ef4f4570437342b3dfe SHA512 c4139ab405bbdfca9f8f56998686ac80c3ccb0ec08db189b34f9ad03dd953e0e8a5bd3fbcd52561abd36e0a785ab3ece198a0da3bf3ea5c803a2a40409d151aa WHIRLPOOL c2936717424f4241acec339aa078a7ea0c94feb88ba3a5945fb3ef2c3adacc170688d6a8b10269aad243cbb0fe409ce7278a27cfc88c1cc2b44453a20ad8cc70
 EBUILD selinux-corosync-9999.ebuild 353 SHA256 d3c0342ec72e9b16e046b7fd3365db6297aa4b9e37d8205dd67ab22ff1840cbb SHA512 dbdab082f7f9c8e8a1a11e3776efa32012b5c90fc1142f591021c0ba4e2f556c02160efb78ebd8e5e91a5120bed74459f2f88565a2c01ee41f3271f6b7ff4d59 WHIRLPOOL f61d76593b27a6ed6b248139d30239faab7040193dcb6d3576410c59fe8f1ee30261c7194ae595171c5467c54552ea40b42038785fd7f43fce31783a8cf1750f
-MISC ChangeLog 6671 SHA256 7ec919e3ba487909bbf2f33014164b5abc7feeba1bf0e6301efb5d7768ee8800 SHA512 e9b164eb362ff57a660b5ddf6bb40a219dbfa69b881e1cbe419f6220b764eac54ef25d90a4a5437feb17ed69f2f24aa9e7daf3381613c268cfcb96c470a5fe9c WHIRLPOOL d31fb7a3fd6a1280e46194cf34b46bd7d16eb59897dda4211b918952e028b9f6693ac73035d461b33211330c976376c65aa0bdfef722afc6fa054b3eca4c018d
+MISC ChangeLog 6867 SHA256 29e39742edb2a78f41f17db58db4b9dabe7f0f63d692eccf3d9da58984f76ebc SHA512 59f52408bb1895a8c9cf023f2a4fb9b7663691bd15e7761e9426ff16a15c8a576926284d441bba99a8b64c1a553c74133a4e7e9131f04d7b1c953d34a8f3cf07 WHIRLPOOL 2929a8115ea136190de0b299c57eabfaf41fff62d6fcae51fd21de5eff77ef1213666ca22f6d9aeead8babee818d8da3c1309b4900cc48ca7070ca52a505f26a
 MISC metadata.xml 232 SHA256 3b8fc6c42505c19fded901c454c9ffc374a8a55be5f28f7d013247f49a07a92f SHA512 ffa206eaac1e8ab34c02baf901a7dc16305b93bbe37c151868f139d87ac343e39168d2ce43f5aa93b799cb25c6624682b73ba254183a03f98ca88e4cb31a8125 WHIRLPOOL 5b980a082b0b4262298083031409c4614fca88d364b8c152ebf4878c007a75c6fe43bf2e24c6183d2c3310e7eb51af5c3718cca5682e29425bd8343777764bb4
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0
 
-iQIcBAEBCAAGBQJT5RxiAAoJEC7dUkA7aK9HyCwP/1PsUS6hj6Fk+sm3ekY3zjR8
-ghjtu9iutqifCjX1KbRrhot53ehENG/Wv7z+V57p+jbCbXazS+EttpiDeW/06Gha
-U0RJJegZVUGfwy5Kc6CCONv5XrAnIThZzAdKczjfrAYPnMAJsg9qMk/msmUtRk/a
-S9yuhNntySsFomCGCsvMqRTVq/3MLGCngIQ5ihW+R9ZSfIieBnPJSFWVm2tqXyqA
-MMF5PiC6RNJHKX33qOL2s7PrXll4jU6+v1bUs72XNKyDGC5I/m8cxLLKg93LxZjB
-kVCUyPExYA19zzYcMJ4qSrMo5VrtU6gBxotz9VvkRFR7EovNYp4L0eaveAZFyBoG
-/O6OYWTv13UNo+FOmQlcPYl3b5P/IQxYh0zFyhCRQIZPYwoEhLG6BJWmInN9bsyA
-t8I/gpsQ2J5cxaqODvOq+XMiDfa4jHzFBjKdjt90/QlvIJtbj1cejibCAumrG7eR
-wMVq0DEqrEqgIhQ+vJUb8TdMI6PqJWK3+GR+3eXoRFzUmo6T8YzjM2JnjaAo2Q8g
-5+pZCowpjxfJgrcJwtXpdzaD7eJvXa5vBrmALiMsbMnTHGEEnYVO2kJZc7yTTTNF
-CHTA7rQhSWhAgz8g3l7lJh4/couj4woZ3bWY0odF3nx4FQgUiQUWlR/68JMQUmmB
-oC3pQjXDI8vnwp/qanu7
-=pHSr
+iQIcBAEBCAAGBQJT5ng0AAoJEC7dUkA7aK9HGp0P/RvxVIyuT8FsZ2PRD6D9TlfU
+/hV6NwSBxUkjBb+LEugEO85NPQnxgWbk6wJMzY/lsjo4haKlHdMeJNZhJ9haLNmm
+O4KNi2ElsfKVpmcmuqKXaLpdSrQqdTSzv6NiObhl0Ej7voLqwHnnRfyj4BVOJ5Tu
+LRiaM42runTzK0/D3V6bTWp6PBpR1dWbHcpwFGkH+phQp2aVYGoxmavNGWAORPmB
+QEYVMJpZiInWnq5Zg67RT/qqqVV0FYbCFvi9OxL9pIIIgUQ2VcnNEdqfVfRclnji
+AEDEmAz93JBjiVrAfLTkQGpnZfFbHgKbkY7wE+cCdYuN5iQClidf4JIp5mFerzVv
++WWSD5a7dbaHlgwpKAdDvd8nfaiPyB1+W0e17e0hodqQ/FE0ArHI3OtsiW/AH7CM
+lncPGxc1gJk415DGcPa7qB3FJo0jDvY2sHetzh6v3Tuyfehp8mfh0wxWNma2OnNt
+IuSMd9efg9xupNGLVi0eG+Q4of+5DJZUwe8f4jEu/qKlkyf7KNKfSQuKRZDksxGB
+yS067mg1UFoEVfJ92lCp9Ib+yA5gX6+U8h0UYws0HrQpS0r3DUepTlUSTG1PA5sK
+krTo21Ik/sx62Ft8Rd5gH+LHZpynrMj7yW8B7rSFZc3TXuhp+Ia82AxAjuL/Y5+R
+Puf4pUq4X6myT3bY5ymZ
+=9Bgt
 -----END PGP SIGNATURE-----
diff --git a/sec-policy/selinux-corosync/selinux-corosync-2.20140311-r5.ebuild b/sec-policy/selinux-corosync/selinux-corosync-2.20140311-r5.ebuild
new file mode 100644
index 000000000000..b19fda230e08
--- /dev/null
+++ b/sec-policy/selinux-corosync/selinux-corosync-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-corosync/selinux-corosync-2.20140311-r5.ebuild,v 1.1 2014/08/09 19:34:36 swift Exp $
+EAPI="5"
+
+IUSE=""
+MODS="corosync"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for corosync"
+
+KEYWORDS="~amd64 ~x86"
diff --git a/sec-policy/selinux-couchdb/ChangeLog b/sec-policy/selinux-couchdb/ChangeLog
index b12b562fb473..7699bfe4a96a 100644
--- a/sec-policy/selinux-couchdb/ChangeLog
+++ b/sec-policy/selinux-couchdb/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sec-policy/selinux-couchdb
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-couchdb/ChangeLog,v 1.10 2014/08/08 18:49:25 swift Exp $
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-couchdb/ChangeLog,v 1.11 2014/08/09 19:34:15 swift Exp $
+
+*selinux-couchdb-2.20140311-r5 (09 Aug 2014)
+
+  09 Aug 2014; Sven Vermeulen <swift@gentoo.org>
+  +selinux-couchdb-2.20140311-r5.ebuild:
+  Bump towards r5 (fixes duplicate context for hiawatha)
 
   08 Aug 2014; Sven Vermeulen <swift@gentoo.org> selinux-couchdb-9999.ebuild:
   Make 9999 ebuilds EAPI=5 and transform to make master for version bumps
diff --git a/sec-policy/selinux-couchdb/Manifest b/sec-policy/selinux-couchdb/Manifest
index b8d5a8a4a0d2..cd1d67dec8c0 100644
--- a/sec-policy/selinux-couchdb/Manifest
+++ b/sec-policy/selinux-couchdb/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-couchdb-2.20140311-r1.ebuild 391 SHA256 d00451247511f73e4e9ea8b822e2a6bdb02269be68dcbe0b3709498b025d4eb4 SHA512 af4d284ddd3535ed716bf79c52c2ac209475ea1d11a40a5defa92e7695c6dc1bc3271adb99044ec75dedd0b772d483e79d1891f1ef662372391c3600013c76e2 WHIRLPOOL 3ddde55cf891b56c06413e86fdd4588944f96fefd9894ed7fb5d921cf8573b0244b09c26918bce9d6b3e8416d08200ce70e6c656e8523e12ac7390d942015515
 EBUILD selinux-couchdb-2.20140311-r2.ebuild 391 SHA256 bd00895acb51eaf056b8ba0ece0211f8dcfdae938f76c27e105ecd6ced69d31a SHA512 bfb327685551264e326872d53467555e3cd1c54ecfc2aa771dfd0492516aa75fee3d81801c4d34b30119be43a153f24caf321f3d173248b81fa015a89fade68f WHIRLPOOL 24c4dcdd381702819e67bce39a010eb32d3010597321123544d3b7904a6bcf1d3de4e47b1234c1fdf0ca160406837176013b915b48e55882c5d592ac1cbdd4d4
 EBUILD selinux-couchdb-2.20140311-r3.ebuild 391 SHA256 ff4062c74b01444d5a0dd2c337ee63a6c8dfc60f8ae16cbb95e9c3f9b36c8656 SHA512 658575d8856f56896620da7dcdd5f86c506fd9d290604d5065ca43fe05af36bc77a78cfa836be9b6c1683ad73980f9f10bb04872864bb31f2bdd0a03cdce86fa WHIRLPOOL 880f3b66789225410cd95ba6675ff0d72ce1cd73507ac1a5b06f78409a38ca09b65646064a97de8ce6c78eba5749f055969eb90febbf83a83b3a4badfa2e9f68
 EBUILD selinux-couchdb-2.20140311-r4.ebuild 393 SHA256 dbf295d3268ea44eac489d65be6d947e9bf15becb13b10c68c07a941e4796c6b SHA512 1e4853c44eda09a9fccca5123be4dc737fb3dcc68ca1162bf3d4497b8edc8bb2bdab282860810e36ddd03193647533c18a6819461f51dee0401edc3695e74534 WHIRLPOOL 54f0a0f41ec1832b1d99622150bfb31bdb6bb6d82afe9cbd7e86685ebcb2f27c74a07680c069784e4aa2250befb3d471b9a59aa9415364f9eee258796dbdd7ce
+EBUILD selinux-couchdb-2.20140311-r5.ebuild 369 SHA256 fa4712668aee82845ecaf00009a84783bd822224050e6b343ff68914adf75d0e SHA512 f5f46c35cebbdfbaba4f32fc3d8529ddf8f78efd951ded6fbee3be75943d0d1fd35773b7a4e82f0014a3ad86327a3a3f91d7207ff92e1e3636f353bb8361a1f8 WHIRLPOOL 1a36cca88fd1e9a50bd84a3dcf7b363b8ff3801aca8bc6adb37e64d029959d873e54b5777f01d77de389aa9d156942ae8ef8844fdc127849c178fc9643d37f00
 EBUILD selinux-couchdb-9999.ebuild 349 SHA256 46861bcef3b4550454bb873dc0a5cacb00944dcb064d7605cb33fb2721f57643 SHA512 9b4f9474a8df49d9272e6dcc7016b259bfcf9a318440895d082c5da9bfbd9787f780c603896ed132d9f44c51deeab6eef70af3d6225732847f80f4cd65239288 WHIRLPOOL 4d2fbc82bcf01ba96d088be895eb043c1fa545563fe9a09cc7664fb5240cb8c48e9ab29460f71a6963c87826bea22f72d341a560dab243304ef69393e50b97ba
-MISC ChangeLog 1833 SHA256 361a58a346ced03d433738c65dcd4987ac2124c63db5d09c65564e7d52757b26 SHA512 50ea118c83206cddd76df35846b9bbb86f2e38da92cfd4899186f63dd83c219d793e2c5f7ae1a8b5e731bd5c4fbc7e696ab2bff5f1a27d544739c55695311d4b WHIRLPOOL 15972feaa239c8c1d7a3dc2c51c8d59e08eee7fcc9a234617bc110a4c0c85b2bab3e34bdf7dbaf168955bb5be364d68a61bce30774ecf39679fdd958d9886307
+MISC ChangeLog 2027 SHA256 05dc02834b5fe293599222c87eb4ed80a9b711a63c0c4797dc399eb8b39bdcf2 SHA512 f84514e89181f0fb8f82b56d435bdbd20959c1c35c9829d3f8771b78cbf7bdd8b9927a60d9bcc9e4463b8ca15598435e3f20f828e57cd53b9ea94cbc0c973471 WHIRLPOOL a13da31bcabbe1d0f874c78726839108fc80104e926cf1561495186233d39d29cc0a7592ded653a19cfd0241e7d70248a67509b08abda9f669414e884384e054
 MISC metadata.xml 231 SHA256 c7a335ae3c887314d072cddc7ab4bedb1edc36693107c6d7364fbced6f9d1369 SHA512 83d67fb75a6b829930801ae4dbb6b03b01dcf3c37bf7c7f521371284ae8b83dc90507612ebe957dd0c06a91e76ca9af264f83068ff0cf6d9296eda0d8ea1afb5 WHIRLPOOL 26cc952c20a5da40273abed5aae35a9ac8f365bffee0a2d48a0494fbe8e9aa81cc149013c82531673c401fbd9f3949d69ed4af3b5b0d670b3367d959bca4fa07
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0
 
-iQIcBAEBCAAGBQJT5RxjAAoJEC7dUkA7aK9HAmQP/1ApggJr7A5wCNdh7pS2u6jW
-hGEgksPbH3gNrJasyLYmDRFTUUHdXjyRY3t114gf8vVWNoUTeUnjT7ezoNu/Givi
-AJD+jsn+0EvqN68jU2+GCUHf9Dt1amLhe2tUuD5/sKVpZCX29WoehNNxuxOhs51J
-RqdX1scMHfbaGbcKCqkADNoEsrqCg6TiXudNZqJzKDfR8zALY6MNjPYyzRzvIbUL
-wDDvUbmgMMebFVTL5k7sYDY7rvSnG8bQYZ4i4NpaAVxAFwKblDC3jN/BWBsjl49Z
-61WoUFj1k3ILXupGrFQp0AEhdBklQlpit6aEKHiVkpUf8iP123P+0Y6zTujXjxa8
-9jZu2XBCGh3giXuVG9/v3HPp1P5xkfWVUhOiA7JvEuJLFTGFfswGxPTPBVcauaCP
-bQVZ2388DJ3sNvM9bWAnql8+Ij9Qdn3i95kJ/RXpK9yp7ww3/+kI8ykey1sqYyW5
-dNnNXaNk+is1YehyxuxFKvWv48TUZBBJ9/N8RPeyKOtoPUEIhTq2n8IserLEyW+M
-HK/09s1NS3jO1m5H2uyHNNom8/ZJFmkAtiN0yQE6pl/bym3914ekcZmVYxjHa2EJ
-tBnKBLjqBKA1Uqo3v3lRwmQAc7TNCB4wnFP0W+oWWbu2qWqoEab3V254XhK2RQIw
-Bp0Yyk4ExWxdDxfuRnj3
-=vF9y
+iQIcBAEBCAAGBQJT5ng0AAoJEC7dUkA7aK9HRGsP/j54mG8dDOCEbcPAzvIm68sN
+69AoEZkDT9aGlq/cqHmf2F5vUGvFRYXKatnLwTc/jtl/+r8cmREuHO4l5PTDia+u
+77uijhEy+OKKl7zV3WtVzt7G+d7zMEJajj4NdJfawADxf9IkkYx2J9Lz3N8v9HoC
+tHljL1wg1bGLNrBUo56Z1ZF+5IlGhsZZyl7bQMnoBLtc6eTrxrW1NWkJLfR5xAVJ
+l3KyVo+J0rvlMU2k+DK112ZjDNAJYcnE1BBWxa11i1yyRyg/y3cKqpny8LI83c2M
+lDCybkzhyYQ5djy8mfptGLmFe0FemrjBkLDUhcTAYZ4qAtzs0pH+mCI84hPTqTe8
+8Qx/no5O+aWRZZpqG/Fgramu9kIq9v+VJLaS8D44HbyjM0QWZk4DupL6F5edJLD1
+cWQRJ+NT/NkVtlLAin7a0GX7lHYuKzzlx9/h4tz28+KVwklWfEQOy1fA/ovobi4u
+p3oGckbRHkcSYA9cfw5PrO+Imw9xEkBInUqt51PgOE61gD0x0q0I6/5nv9hgnpkM
+A3TFNKQhWhMmn5NjJxIIqyhSLvySUoQ2jqX9sFFHoPyJ6DPFf53fAaDkB6F5+jLk
+mr8agUjjDHzp2VfELcpVICksukRcEVjd4g9FvAlVSZYSEVN0DIyu0ZqKFyd+xtfC
+uKJTJgNbKXbrr9zsaEc/
+=Kuwk
 -----END PGP SIGNATURE-----
diff --git a/sec-policy/selinux-couchdb/selinux-couchdb-2.20140311-r5.ebuild b/sec-policy/selinux-couchdb/selinux-couchdb-2.20140311-r5.ebuild
new file mode 100644
index 000000000000..69f60a32e476
--- /dev/null
+++ b/sec-policy/selinux-couchdb/selinux-couchdb-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-couchdb/selinux-couchdb-2.20140311-r5.ebuild,v 1.1 2014/08/09 19:34:15 swift Exp $
+EAPI="5"
+
+IUSE=""
+MODS="couchdb"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for couchdb"
+
+KEYWORDS="~amd64 ~x86"
diff --git a/sec-policy/selinux-courier/ChangeLog b/sec-policy/selinux-courier/ChangeLog
index f4ed4189855f..9a0bcaec3beb 100644
--- a/sec-policy/selinux-courier/ChangeLog
+++ b/sec-policy/selinux-courier/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sec-policy/selinux-courier
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-courier/ChangeLog,v 1.46 2014/08/08 18:49:51 swift Exp $
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-courier/ChangeLog,v 1.47 2014/08/09 19:34:33 swift Exp $
+
+*selinux-courier-2.20140311-r5 (09 Aug 2014)
+
+  09 Aug 2014; Sven Vermeulen <swift@gentoo.org>
+  +selinux-courier-2.20140311-r5.ebuild:
+  Bump towards r5 (fixes duplicate context for hiawatha)
 
   08 Aug 2014; Sven Vermeulen <swift@gentoo.org> selinux-courier-9999.ebuild:
   Make 9999 ebuilds EAPI=5 and transform to make master for version bumps
diff --git a/sec-policy/selinux-courier/Manifest b/sec-policy/selinux-courier/Manifest
index 5191cd344377..e8b59ecd7645 100644
--- a/sec-policy/selinux-courier/Manifest
+++ b/sec-policy/selinux-courier/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-courier-2.20140311-r1.ebuild 391 SHA256 fc81cdcfe73d6106ddd38c46f3cc1ad316b5bdc7a01848d7a99886628d18fa39 SHA512 d8ec2ba86212d2f3aa1ea41364f892ee6426e0c1b4e539d33156a2a33ccd2e51c61ec2e6e5b7046c1b0587028a56721e66341a61009792408f9383c8c44af40f WHIRLPOOL 6cfa1058460b8d92404b11c906399826f19b4f69b41e34079566780ea18423a6292873025a411fb50891c598ffca6e855c46b60e3ec6128dd5202802e00f9f19
 EBUILD selinux-courier-2.20140311-r2.ebuild 391 SHA256 9b614edf74c2a38078feb1ff8be8000f9d22ccb7af597b43e913298a1c13d6c0 SHA512 33366e4e3cc1f587252715624f6c77729ed778d313c448687b8b8e3a1fb2b859ccfd662179e215f4a37445b6090fc0fcaec8b1df35a8e2dc224761ee32332cbd WHIRLPOOL d317faa1fdf486a83ba8a87ab2c3c1b8702ff15b0aec6b1b10ce0db1b600c0334666f32c92a711fc0df7c6a21cff2e068a41ac53673dc3955e42fc8289f99a1a
 EBUILD selinux-courier-2.20140311-r3.ebuild 391 SHA256 ef280856608ecf28a6532c2fbf6b31441f9387ce416b343c1a3a60e3fe17ec09 SHA512 cca9d7a090747d0d0dc22f73bfd0a29064bea065124bcdc24d4d5b47473e1350383d55beec640b6577490394a512a562dc7a2ad902dc1f821a8c0097d311c679 WHIRLPOOL 1583bab7ebb191315c30eae98750b4049ba938f69f972f6fe682cedc4eb1f1b4597b05c1c95233254a80358fedc422188c80fbd556348234787a4ec6cf3a7f5c
 EBUILD selinux-courier-2.20140311-r4.ebuild 393 SHA256 9c3ac1b619ddba84f05d8f547bbd98c798e20246cecbf4f0a7a95a5bee7d32cd SHA512 aef471cf4caad258a66578e2154fd4f6868d9c9290e559776ccc214ae0ac605a230f69d67ac86a67b301bb99a4f882bc76b3e43d7f75f55ae7e53c4d68534e53 WHIRLPOOL 4687c750bdb3c48287a120fa3d67375575524b3b1f673c27bd4068a1f726bfd515aab387d537b20456cf78a32246dd53c3870b677b23db01b6c6305f62298d8d
+EBUILD selinux-courier-2.20140311-r5.ebuild 369 SHA256 bdbf7b52357d0c06292933f795e61ba04c203285f1ccd569514e7be427d48d5a SHA512 b323a4ab6d6888e56d4aef6de2589b1cf1452236c409fc7d5543db6360ab9e6230d59f4347e196498c98a3f74a76565a3c558368b70642384890aab1d66368f6 WHIRLPOOL 6df7905f2559be8dc8cb5d38477932a15ff4545dd8c862401c3485cdcabe64ea8015a18c6077281b2515de73cc54447996dbfcfa96ee147563c233289932fe38
 EBUILD selinux-courier-9999.ebuild 349 SHA256 bdde3e7194043ca621c92500a941dd80f3db4894e6c6a63dc9b61dda4f029007 SHA512 835f8b2b2a69230ad50777b12333cfc09ea9b0d298f07652beea477af8abc1b47e7dd3284ef6dfc175c3d5d1f03fe7fb23a671d1a10f7f09d801e53d02812eaa WHIRLPOOL 1887f3a69ced82dcfc1199b5a160cef34cc0f003995b86fa6ace840bc7d47441dfef66b1d03b457af611d2a28900791040b6f6663741ad4cbb7a065451eb638c
-MISC ChangeLog 12745 SHA256 4b0903c78789af6ee9419d138edf69d6bfe2d8388aa7bacfcca6bfc54bb4b1b9 SHA512 53d596a9db558fb016c7faf9c9d7ae5ee38192c12215a6dcaf271c103e193129c84abf28da88a8d6b25fc05fccd7d66c7bd53d983c755c50612fe129c8f03c23 WHIRLPOOL 7b71f818b9d76dbe8cec9bd32d2246deefc97b04c4caaacd705a3a7a229b68081a5c8f1dd00edd20f95b702223e8921b6de79753348e7b460cd0c16aff776875
+MISC ChangeLog 12939 SHA256 262f356fbff1952501878a6ea47afb79db835a974e342ccb4f794cc453b38188 SHA512 c27adf133752464dfd384089fa30a850219b969723e6a9bb3238672e1667aea8adc8ec9d75f45a12233b918af66e7f49e752d881d554685a10197fb493ca87c6 WHIRLPOOL 36bab06f306ce8b3a05f42a588cb7475eacae7e70e45fbb08c3b3944e3715b78efce81aae95e4fdca196a9b51880881c9b27c5d6870cbf0e698d9b221cbf55dc
 MISC metadata.xml 231 SHA256 24e517a12858d48c4c1885b602b0dd991eb2beadd3fc693e6b00ad89a93f46b7 SHA512 64af2400a19d2e3802b5fe7130f26347072a996c4eb6dca15431ffeb0aa48058a90eaf2ae4328a045245f2e73ab9a9cbd0ee254a77852f7b409bf5e002c03425 WHIRLPOOL 33abf59cb4bbd9bf327eb4aff398fe7ce227a3421aadb09fc7c1b5b482a5dea974e13248584c6d2acf1a6494c4ab5007af8168d6164b4d6f5a1077a76da011be
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0
 
-iQIcBAEBCAAGBQJT5RxjAAoJEC7dUkA7aK9HeKkP/0jkw/sKDqZ+Ur0ruyAlZ7K8
-nYxu8G7TzOeHpajG3GdUdQzzQRdmpb2GO46a7Tef6bBcD0JJgNuvrnBAeZoSFuEz
-ZbJXf3th5zvFgzKpzoVmKaQBsn6jMB6VkELeBwKt00aGMZaDI/BJNhcm9Iu9WhBH
-KN9504CrFEkXk3F9inQk3er7iNZd/9eXrNIiGIjFzD/9bsD3YuTHDcvdx5DiiE3B
-fDEifFztR/D+7dj1UFF73DSTLH1d4pkgPjpnW22clNX/ZnqBTG7C7HGD1SvX30bj
-fN6Tixaoz1DFCUH4IJqJ7ugxuUC/OMPL/mUsYwjG3zpMY9i7G9960c3lyoTGCKSe
-OSGC7XMb2DqgghStHif3PnvfFEJ359JE8wteQCymokI1ijWmwLivaScDLJWKYKc5
-9YyE7KRGrUglsyXSE22zYo4aHqiyRf2y5kwcZpKljZp5wOjMS0XVJ+2gikLJXIIJ
-TYafuMCaFQZ9T/qyB7ayRINW5jWs7+roOw1Vy2liqQrLQo40DuZMbF6UdG4fbtCk
-eYtKAHXjBwASvZmkl53r8byPEGLfpc5Iz3YGLbZd55S0L4b33I4cevm3POemgMHy
-Fl6GmW9Wnn6EfQdnNzqvz0glgzpLM6MTDOzhy58+9uhN3tJpHrClih0dRWy56E0b
-KXPIr2a7WGNFzthiOOPK
-=tPAw
+iQIcBAEBCAAGBQJT5ng1AAoJEC7dUkA7aK9HKmQP/RiMAT14U43utWxi8CDpnnWq
+48057lGw1x4ujn74xICGubmxju7DO7v0THBCMRaCgfGAvihti81TiM0PHS80AZMb
+lmp7oU8pCTOxnNkFKIP0f0zvwyO/Jvbxk7msMEROR1kshAibKHsTBnmMvOFZW+f9
+ZSc9oYy/xz99UYUOT0rCfQUnDFKoLuswfEiHvuF3CNISujc/U9W1oFWH02WEwLiY
+zVanJ4qlgxIKhTksDiKwE11yVUVzf/xuzB3hd6C3tXpinrLbSDGnWZGEwYLDH1Ld
+MHyxPzhpqCn0s+krZxTwitlctr0GnH9yOmG8F7HcSGNBTAmsqfpEqynWb7KB2pHr
+opRAi10eFotG3pDuHHu1wFbRdGvr4f1LS3Sb6o1ZZ0ulJqLHxx4+5SKc6usxp759
+H7+PBBtcEaIGALGI0XdltgXy/ki4ueJLrNkOtdGnCuTwR+c9gLYXkFoWUzrakHH0
+1yW0Po70/l95eOv224cxoovs5nppNhi3VjxherZaOWHvvAWs+hCCwmkuW471X0Vm
+xOkaraYR5XqOt1gHC6Pci7JIqJiCsigGHn5jfD/m39rT6wZJzHX5EUAiUOzoqa6g
+JWUmGEjPdEfun2Px6ELhdmoClkFIMYFBJk8peCwvHA7agQyYBUYmJIH5W3DJzND0
+2dAcgQMRV8GleGX9RPpK
+=Hi3e
 -----END PGP SIGNATURE-----
diff --git a/sec-policy/selinux-courier/selinux-courier-2.20140311-r5.ebuild b/sec-policy/selinux-courier/selinux-courier-2.20140311-r5.ebuild
new file mode 100644
index 000000000000..a5e541acedbe
--- /dev/null
+++ b/sec-policy/selinux-courier/selinux-courier-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-courier/selinux-courier-2.20140311-r5.ebuild,v 1.1 2014/08/09 19:34:33 swift Exp $
+EAPI="5"
+
+IUSE=""
+MODS="courier"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for courier"
+
+KEYWORDS="~amd64 ~x86"
diff --git a/sec-policy/selinux-cpucontrol/ChangeLog b/sec-policy/selinux-cpucontrol/ChangeLog
index ff1279eae6e6..c0853a32f1ff 100644
--- a/sec-policy/selinux-cpucontrol/ChangeLog
+++ b/sec-policy/selinux-cpucontrol/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sec-policy/selinux-cpucontrol
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-cpucontrol/ChangeLog,v 1.42 2014/08/08 18:49:21 swift Exp $
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-cpucontrol/ChangeLog,v 1.43 2014/08/09 19:34:22 swift Exp $
+
+*selinux-cpucontrol-2.20140311-r5 (09 Aug 2014)
+
+  09 Aug 2014; Sven Vermeulen <swift@gentoo.org>
+  +selinux-cpucontrol-2.20140311-r5.ebuild:
+  Bump towards r5 (fixes duplicate context for hiawatha)
 
   08 Aug 2014; Sven Vermeulen <swift@gentoo.org> selinux-cpucontrol-9999.ebuild:
   Make 9999 ebuilds EAPI=5 and transform to make master for version bumps
diff --git a/sec-policy/selinux-cpucontrol/Manifest b/sec-policy/selinux-cpucontrol/Manifest
index 465d38191931..c0f7cbc3742e 100644
--- a/sec-policy/selinux-cpucontrol/Manifest
+++ b/sec-policy/selinux-cpucontrol/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-cpucontrol-2.20140311-r1.ebuild 403 SHA256 070cd651a09b62e93616a49f6f751d1871b2ee7da16c46fdfa7d08ba2a689d3f SHA512 7bda204c276affd7caf4a879802b2418fe92d28f7ff36e3a728381891c151180e0c95a2d1b66d55e5085aa57df10e85daa266c841dd9da445b79d645b3f478ea WHIRLPOOL c5661ef8f6ea0e66fba08f5823c9c39edabd1a61a68887c16821760729e1b04b974d0f51f98560b4f04c958d7ac5b5e569d2f33c4f2056d032d104759384ab9a
 EBUILD selinux-cpucontrol-2.20140311-r2.ebuild 403 SHA256 06410f277535c4cfe151c50ddf53af28439a3605e0bd04f1c51faea1a1af00f4 SHA512 e000bf1a0aa480a9a8bdcc87be0129f092236a41823aa980429369c4d4b4786259ddaeb77685342aa3c8ca8212d816dec9080a1a5996afb1c1163c44b474627f WHIRLPOOL 60ab5dab5c879c62626f6a468d6c99bc811732d09041fa5706a4eea980e6bb2f0e56fd4418bd60bdb62d91c4acddd54a2bbd1e66bcefcfdbde758632aee59fea
 EBUILD selinux-cpucontrol-2.20140311-r3.ebuild 403 SHA256 fbe0c1d56ca86c008a059799d24c5bb0fe4b5adf726ee426111b06988ebe27e9 SHA512 e02b84d360f491e28f2c861ca34ef42bebbad4d5c4cb7aafcef63adaa4c9f07acd64feecc5f681b92c242ec1650d63446af297ca9771a3f9bdd2f40512329fe0 WHIRLPOOL 2f48bf785707fcc1e34e47249d9216d3c2ab23668ee8c3d24a922d944277e6b3aea2dd4cd5918146c529e47db0a33c8b5299ddd14c62206fa9271e346d55c72e
 EBUILD selinux-cpucontrol-2.20140311-r4.ebuild 405 SHA256 28077dbb58202442db6afd109a864514f149507c64a134982fb34429ece62875 SHA512 3a82bfac0631931c82d3e2eedac0bccade8076cbb49018f593faf79c40ca271d5292b28a33cd51d59cfa9f3e19aff63265309beec154dbb1cd97d0baa67533f9 WHIRLPOOL c7e1fbf5e32ea02094d7034ca486c23da6dc952ee7b1c76d26605131db138aa9815706cc20ba3ab7fe0d40f73b1ba44cc9bf5da9f9bc88f9fc5cd3f80722ef85
+EBUILD selinux-cpucontrol-2.20140311-r5.ebuild 381 SHA256 9e5a6ec517fc81793baf507a0d908ed7c79b5ffce798796b6810bfdc26f96928 SHA512 dc2cd6d2ece7a13dfe2fb3245b987cf8102b4452fa0afcebca4f11a43c1824415cbbabb313a145004634a4914313fa3ea97810a9b249468aa4c721c141c3cff6 WHIRLPOOL 8953d9d6bcb986b010029295cbf14da2158009dd8837fa219706575e390d0018713207bd8f24356ec2cbb3fa101cdfcbb18d00fdac0514bbd82e12288a2d1735
 EBUILD selinux-cpucontrol-9999.ebuild 361 SHA256 94b56a3049902f21997f1bce03df7c0bf7120e6b4f931a98f62c599d70bb26af SHA512 3a9be25770c64e3f734d756f0739a2b30aa85b20840994e1c74e64e341a94e697bb7abc8206491fbdf98fa235855b35c3a8f615c7ec1aacf27690009cc97c7b0 WHIRLPOOL 5d89b7b6a839bb31a76509b3c3776444069c54694a85c18840644d3bd708cbe8fdd541028af7f25c37fe202b54f42613f9c2859f06c7c90506cd2bb9fe645013
-MISC ChangeLog 6825 SHA256 0c5e09f56c16d8f32fec6faa375e222c5b747cc3c25eefe9a8c68688e7d5980f SHA512 e84fd9d9a2034288e37708e7959abe2cdcc523cc0ad1ab1c67e8f98ca3978d7b8b14e3a165a2e933f68e68893b3f0c592f27dd70797074158f3ed36ebf0518ac WHIRLPOOL 98c1eb9c558d3097cfe0d64bb054c08a3d2f651bab68153d47e5c95f3205914373fd0a21c12cd6df06f06a536441c251ea7447ade2635be751a13969bec0c1cd
+MISC ChangeLog 7025 SHA256 47708bfbf9379eda6d7966a015e1df2f7222321e614c39290297b3a495d2ca17 SHA512 1c6679f2b9b9c67eb7185f14607edd96793391c3b8d7efbaa979cbb0e0cd1aa82a75e997701091f371d70d5ce03ddf03a8cff1042eec7ddca2c90cc9df7524fa WHIRLPOOL eec7030149cf8b1252391fa6f9bf70b8db63627f377a9dc2b1762dd8d829e6e15a28e89b30e6b2b8ff73dbdbf283256d1dfc63a6dc345a73f5d2f467b2259176
 MISC metadata.xml 234 SHA256 f1b6e8eea9b8e5ecf45e2ee6eaab54cb10e13a377b5c839b4e0c619ae68b5a81 SHA512 b687cf350f61085a7ec1a37ba4d351acabbf4c697e8ee70d2d2182b2919e05cb7164e61a542a374ebf7e4cf55cb4d14d2feabd61263ba4795429b6731beaedc3 WHIRLPOOL 0da5c612a4e45dabbed3060293bab0c9ed4392e0a6f027ae57a3f22293e46a362237d040c1fb5031b83cfcc3d9c0bd2a5a94ead9f607f4d9fcfde12426d3d744
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0
 
-iQIcBAEBCAAGBQJT5RxjAAoJEC7dUkA7aK9HZGEP/AyTZvrOYFK7+EnUoUfYx2Zx
-297J/YdHMYFNK/qKthEXuwzCdTEFTa0YHdxwzXIMN9ri48Yr3NQfcYQuXKsIE2oX
-DKkOlDuiNDAk14PWoa+lSobDb3JsFN70YD7+3JI7QqQ6chi3TcuvKDemXr1i0LTl
-xpdLqXLPJjOvArY7Drbd1ZWSLZh/D4Lgbcd+bKQxmEgFF6g9LqThXHuR+9ryP5D8
-1RAA7+5l4iqclijNTEGK2+xdD870kBJJlgO7P6R2nW+DaU2g1a4BA9qYbaS4sejw
-mNRi8T+f6rdLMT4yh5pMbWKh8iaYYmdG5suNhvFQOaRw1gaTdFLL9HzPGUBbkj0S
-UbvUMSdhTIkjHh157MjiBjq7RscCBXZ8gzFRheKPPAfeW24h1EsNtKifA/ivN77K
-l25icF0zYMrYA+qJcLkpNai2eJOdS3FIdt/2LegzuycXr+kP7+qPBcrVC1HYulf2
-H/mQk7H4U1pLukMcmSUhDdFtCGX5norU6ZjUCym6sSoIbdj1KKKDUmLCaDb3mOnB
-TREJB3zFE3IFUQHznR3A9opcD4GPJQWYwgO3sJvgaVIEOmJB2DFbZAL4bQIw/PB3
-iiWMappGMaabIwoqXmsYcjLKHNQXq3pr5esN0bjCgAgY28ByRP97wI2D1M6BpdzJ
-aR5nr3Xo75/xfg97Xz3o
-=trWl
+iQIcBAEBCAAGBQJT5ng1AAoJEC7dUkA7aK9HSBsP/3LnB2Eccu6IJo29SxJRNedn
+KqDRo86KaQljYaCA4gyUFNNru+KNRrcAp6O3I8jgZNgJalOndoIEnCIwiTLHdBgg
+tnU1Cta6ziQpmIC6RuNBrpTRJNODnNUVOASy++Hg1pmDdNuhTbrdTkSkacE/KmdZ
+mUynMrQ9KcUI6c0duurRnBhAY0ZY5mCnp0ZsZ6+5OROpUWAzTSgRnbyiXYROn/5f
+b45UEkE67FXLEhW0wBv9EuzpK6zSU86ADiWsyfAfNi1FNYmuSdZ4etsasMcc+EcX
+3NQKksjjwmyFHx25n3Ygde5MkXAPuYnZUh5LKRvVhzXTaeyWjH6JhSqlbsZXM1Sg
+GJagvt00ad/TQ9JeA9K3I0RxAdRVnb3prRzBwAteuLO46S/5CnwZ7Yw/BUBVUVZE
+CgLbtw6xxT33Vtukam6OlxQVAlJneLMdnLxEojr4t78r75ru9SoBaSm8jQZD8jEa
+HxMa7ABcvERfVo12ChpSBw6mbP5MaQ9Smw5YAu1mM1PQ3Rt0qNKRFOVTlfVAoJVm
+WjvHzyPQbDg2l//HBl/JkzSuFwV5U/ikplYWZZzDa3TPGrE06rjGWp2rcutVuzlJ
+RXMAjviEW3Y/tKXjphFEOczkcW6xKAe1ShIQZ1kseu099abJFij5VczfKNLPR+Bz
+fhpghPXZQF086qbRNAEO
+=+qDu
 -----END PGP SIGNATURE-----
diff --git a/sec-policy/selinux-cpucontrol/selinux-cpucontrol-2.20140311-r5.ebuild b/sec-policy/selinux-cpucontrol/selinux-cpucontrol-2.20140311-r5.ebuild
new file mode 100644
index 000000000000..1d810935713c
--- /dev/null
+++ b/sec-policy/selinux-cpucontrol/selinux-cpucontrol-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-cpucontrol/selinux-cpucontrol-2.20140311-r5.ebuild,v 1.1 2014/08/09 19:34:22 swift Exp $
+EAPI="5"
+
+IUSE=""
+MODS="cpucontrol"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for cpucontrol"
+
+KEYWORDS="~amd64 ~x86"
diff --git a/sec-policy/selinux-cpufreqselector/ChangeLog b/sec-policy/selinux-cpufreqselector/ChangeLog
index e8e5f791ae72..e5c7a6e1e27b 100644
--- a/sec-policy/selinux-cpufreqselector/ChangeLog
+++ b/sec-policy/selinux-cpufreqselector/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sec-policy/selinux-cpufreqselector
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-cpufreqselector/ChangeLog,v 1.42 2014/08/08 18:49:36 swift Exp $
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-cpufreqselector/ChangeLog,v 1.43 2014/08/09 19:34:41 swift Exp $
+
+*selinux-cpufreqselector-2.20140311-r5 (09 Aug 2014)
+
+  09 Aug 2014; Sven Vermeulen <swift@gentoo.org>
+  +selinux-cpufreqselector-2.20140311-r5.ebuild:
+  Bump towards r5 (fixes duplicate context for hiawatha)
 
   08 Aug 2014; Sven Vermeulen <swift@gentoo.org>
   selinux-cpufreqselector-9999.ebuild:
diff --git a/sec-policy/selinux-cpufreqselector/Manifest b/sec-policy/selinux-cpufreqselector/Manifest
index b76eabe1af44..d7793ec9ce48 100644
--- a/sec-policy/selinux-cpufreqselector/Manifest
+++ b/sec-policy/selinux-cpufreqselector/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-cpufreqselector-2.20140311-r1.ebuild 423 SHA256 5b5690497f52a9da9dd569737324d71ac7d9693c041c9e7013d0037ffd82a523 SHA512 503c2cd47448b5d3504eec8619013511cca45ec8aa7c13fd36449aedb9622713dbe97e51db91e52cf9d113d33237a49ca6d76bf0403270018c95e7ef05854206 WHIRLPOOL ecc28e9dbadd7801cff26e5c362b68a48380412838a9a51401db0984ba877acd75ff0ceef492570a67efd35842b18c55b2de309755b416fa2c049fb8254816a7
 EBUILD selinux-cpufreqselector-2.20140311-r2.ebuild 423 SHA256 5086e4abdc64e75c9d75a356e3793a1dfc3a0570a892e7644866526fefb8a370 SHA512 96a71c5ceca71be022bc92de895a90ee00ace1dc06a30c183164cfa9639553018d73286caea8eb10745137f9a62876c09d92190e4c2cb8c07f819e5a449ce281 WHIRLPOOL 85ec2049c1c4d496d9109543a490d3fd2573f07e73cdf93aa41bffb61edc8376c5181c6f40925a70ef54f18df2c4e7ea74cdd56bd6e1859e32b8a4fcab0d689e
 EBUILD selinux-cpufreqselector-2.20140311-r3.ebuild 423 SHA256 2d0d708b118975b8f03f1d3ac5d47db7992b354644a253f3a3b56899c3c84da5 SHA512 71c1672e3f4e0764e10ba7d3713913491f19949712b5d626b01fa07e6c331de698f22ace8427ab6c84f3cc8eb7eed87edef59f98a20f01fb6e1d5a8503e17d93 WHIRLPOOL 7c8cb2e37f6775b69f24954844bc28aa9a8c75a4e52b8101c24d82850a4906f533dc588c97d93762ed0f2677ec2ce39a26c28862b81c6b904b25725fd4c8a695
 EBUILD selinux-cpufreqselector-2.20140311-r4.ebuild 425 SHA256 b88a03309eefa6701bb8608eaf3319cad4d70107bba636edd48d23147d5fbb0a SHA512 2515e617748ac95cd24d4b7565c641a17da01763244beb90eba9968ecc4540b47321e7630b1c538b0c8e0720c4d0890c55a25ece4996f53aaccc528dff118904 WHIRLPOOL 12dfdf2bf00622207acb59514b721b5516fcbe7a43a7c10a3c6b29ed2c8bac8a7f1cd697e96e88baef5a29b4f806652395394ae60a11b188e3eb6313733513a9
+EBUILD selinux-cpufreqselector-2.20140311-r5.ebuild 401 SHA256 2d7507eb0fed3331def754432969e44597317a84ce25483b8104b1644de9954f SHA512 5a32e4ac3228f79be5336ffcde3bcf2b847a814c7e5cf525097402d4bca952515bd37a8bd5a1aeb5c33d6a8f3e49aaec9b22272c90f7794e32ee3a1f18e6b383 WHIRLPOOL 6c884c2e1081846896a42c6a53af0bcbb433a885bfcbd8aa165fc4795aa78627e13d9d32ed5dcc5acbc18858bbe2a3d4f8b59d71b313439f9d6400a1e155b47a
 EBUILD selinux-cpufreqselector-9999.ebuild 381 SHA256 d1060518a33cd774924ba44c38978528c44224602e6b629522cca6fa63ad845f SHA512 2ad570ffef28c975b6075e3ffe847b9cf2bdf6301b74c2f5d600ea5724a361d90df5ea53361269a4b6b22249c2dd70548df8389cc33c7ec90c26d499e6c81f4e WHIRLPOOL 423307d0acef9a7d8e8482301256e172c9eeb7df7d282bcd0e1143a9e4eb8655e8ebae353242411027947f5bf149c61a77362d3f0639cd9b72fd70244f7e660a
-MISC ChangeLog 7214 SHA256 30cec44eca7b41a6fa27861014f999626b7420f3ff3c55f9516461609fe36284 SHA512 15efad28b3b6822719378e16da0c880aba75ef7d954ee36a85cc7a12540f6acbc525190709dff02e764b7142f90501fd6e5eb138d36c9e568416747495880750 WHIRLPOOL d25181c6903a20d6aef5ace16b625eddfde69bbc9e2063a29b4360832326d74e957eb4d62b2e02c6b4f14b7ed3116bba4d3e27991a04a979394518fe90db19ac
+MISC ChangeLog 7424 SHA256 914d3fbf901729e5bddaa1bab58bf6d68e4b427a5c10b11ff5f809f4f592d2cf SHA512 b0d8a221aa139c75fd4db4a500a4956960e57f953a22db10e270f96bfc9c6b8e7601f6099d731981589077956ac3f95f41ae0d97b3c11b28eb37bc5a33d20b15 WHIRLPOOL f40cb7360f86c724d9e3e98690ec5464c5a51b453bda0d82916a0e02f6a71186b149dfaa5adaa0779df8b94431fca890cc3add788ebec35455b165e47d3d4363
 MISC metadata.xml 239 SHA256 0e71543fea738874545789feb0f70f816bc6678c62c2f9796eb25b0c6600d02f SHA512 2d6469d3654b2762ec4cb7bd0e7624456f987457568c8fd55576ef804f00a6ca1a69021eca5e126df372bb779ec099cf50a7472de90cd2cbde6227e38cc78999 WHIRLPOOL 9162fd901e284ea6c12004865647da73ddcde897e334ca221068e66a6cde0c09987325fcc2757e8b8a4198713c1d4c06ac96c9dece11b627cad7be20da315cc0
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0
 
-iQIcBAEBCAAGBQJT5RxkAAoJEC7dUkA7aK9HFt4P/RtjOTEpswM+vXf9SmzZl+cr
-ehSRJ2dvvfJe8oTdoUOf5IDdFcnn5IlzQO0b0yuwKAScGIQ7+HcKZaF3feFJpoIz
-ePwdFKFv6CttDvIWDMuAQqL5NI501Q7HAXLbldz+SAUutPgS8cai8aj0+GlOt660
-mswwtg5Xj0jieD1Hnw0TbjVyiXFU+/zH10ULkxQrstPbX1YxBVdOo0AvTtfMT5Yd
-nGvJGiY3RwOJi60PPKzXJ6aT7SP3btO90Jq/evrTazLJJc0p71QZ8s/Co9IwJ6gE
-XDPGTLiy7t9x5OT+q4JVHzisZWuXVCfDX4gZgAKnNzb8laICWYqjV5niC6l9ZQFY
-OutLYY3jDVbkG6uABa17hEJ0mCzSDPitRUP/Bou33I7rC/E7Dt1/hrd6EkJvTu44
-GuEu7RvvC9BiC/U0aM2lbuWkEFp8mrDx8L2lNmzO2gVbmgNSVksqBd9pHEML688O
-6pq2+zwxhOtZKIHHUvfz+VpSsna6r/3STq/DIYc7gGHXShvkncO1fpU8DF9/kCqw
-Atks/JyAzw9cdESthA9Dc7CDuQsJVOmyVbhs4W0elH/WaNhN65OuQ1SduYcO+I2E
-7NhiCXNQ67tJJSNj2bJwNxi1RSN4+8+x8QsfiKa6m1O7Y7slLJghIzYEHiYH4HNv
-LPbSGrWtG6OrcCBg9YuA
-=UL26
+iQIcBAEBCAAGBQJT5ng1AAoJEC7dUkA7aK9HvfIP/juHrK8pfIXfu6pQwz8ffrYl
+aHC5HIYD59jzb9/UX++haK1DhIuKQGA/E3hTeM41GJ3rNG7C/jDckNvb+f3JESxE
+1tCZHHsZWmBlCRJEMYIXkzxDo2TVG5wpNNtGQimqtnUHqYK0M2Lg9C5TYPkD0Y7c
+Yllwx/cFFs8H4WZ0fwyb9XwAryeFphgQr8o2GEuKSMh+MfrcLpKxfa+EDMtatk7x
+Lpns+uRfApB1xmtupbUigqqLo8FkFzVUfd5za5XZPg8gCyOUhLLLoZX3TKavGp07
+hLSuSFkIipO1GHGsCQJEXmef2GpSndU3s5MXFIgTzp7NvwLVGi6P1tM3PqcZcBBP
+ZpPl8IXSnZY1dQicHYpYXCmg5DTuOtT5j23eONahv55cGN/wxO+nnUmKL1F4dDyh
+zNoexwutTguf1CwsGUGKibSU5Ppbzj6vAQOj6OKcXDrXo9IQC5faYl5+BO1MPMOY
+kK6g7GPp4IoeGOFJjnYE+swBGX7oWk3JXVPrPILHEzJD5J1bnZz8ZFl7qeq9nGNP
+MxKWYrT0esdJovqSqI9poFTaHvv+MObNly9369HzPVAHf0HwJFt+SfWf9j14KyLd
+x/hjfYfgw2AxCBdDICrJipCAZPeclcxruay47ptTOgcxFD7uDUal1cSa1irFc75M
+YwRejv6EIrN1hlhG/7y7
+=xc5A
 -----END PGP SIGNATURE-----
diff --git a/sec-policy/selinux-cpufreqselector/selinux-cpufreqselector-2.20140311-r5.ebuild b/sec-policy/selinux-cpufreqselector/selinux-cpufreqselector-2.20140311-r5.ebuild
new file mode 100644
index 000000000000..b3458034177a
--- /dev/null
+++ b/sec-policy/selinux-cpufreqselector/selinux-cpufreqselector-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-cpufreqselector/selinux-cpufreqselector-2.20140311-r5.ebuild,v 1.1 2014/08/09 19:34:41 swift Exp $
+EAPI="5"
+
+IUSE=""
+MODS="cpufreqselector"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for cpufreqselector"
+
+KEYWORDS="~amd64 ~x86"
diff --git a/sec-policy/selinux-cups/ChangeLog b/sec-policy/selinux-cups/ChangeLog
index 1b534b1fb768..bc1eab25a191 100644
--- a/sec-policy/selinux-cups/ChangeLog
+++ b/sec-policy/selinux-cups/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sec-policy/selinux-cups
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-cups/ChangeLog,v 1.53 2014/08/08 18:49:19 swift Exp $
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-cups/ChangeLog,v 1.54 2014/08/09 19:34:33 swift Exp $
+
+*selinux-cups-2.20140311-r5 (09 Aug 2014)
+
+  09 Aug 2014; Sven Vermeulen <swift@gentoo.org>
+  +selinux-cups-2.20140311-r5.ebuild:
+  Bump towards r5 (fixes duplicate context for hiawatha)
 
   08 Aug 2014; Sven Vermeulen <swift@gentoo.org> selinux-cups-9999.ebuild:
   Make 9999 ebuilds EAPI=5 and transform to make master for version bumps
diff --git a/sec-policy/selinux-cups/Manifest b/sec-policy/selinux-cups/Manifest
index 140400180622..112f3da83d1f 100644
--- a/sec-policy/selinux-cups/Manifest
+++ b/sec-policy/selinux-cups/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-cups-2.20140311-r1.ebuild 443 SHA256 6e6ea8043c7a3ab6b1a59af13023b2a7d0b7c3a3e87cd74e05c206fe63413d1b SHA512 d24a0e4147b3249846600683d200f86215d3ad691fd2149d8d4253db90affe551d077291ce704757f007556b41bbd5e1918274506c4bc4038b5115f3e531b4fb WHIRLPOOL 3df1b5478e93bf320aa09e953f452016161dac9361ba8b8a46ce46e324be8fd7046996ff04c273a0ba88fcd5d77d4cb12370e7a28d8dd64cd3173196556a6452
 EBUILD selinux-cups-2.20140311-r2.ebuild 443 SHA256 7439aa8b592ba51b088a6195511340ef4606eb1fd17c1ae3677d1fa36f429f28 SHA512 4c7d8efd59eabbd52fda15a6f550febf8d6e60601b0e3e818afb2acae898e20bf553bd2452f8a287a0087ae2a31ffcf7e6c49e5ebaa4690f2870a9c440183e5d WHIRLPOOL e9afb067855a624da24e17071a79f73c5dc638c170d51208eec9f6a2512d9b0512469cce5cdf4960a6fdfe5db3f32f03997e6971ce1af0af8d4e26d90416a24d
 EBUILD selinux-cups-2.20140311-r3.ebuild 443 SHA256 d32d9a2d4e91fed2fface3d16c9126102603e650df2500e599be6aa53384c990 SHA512 6bd57a001397634390f3bc437ef47346a027766839379f516178eab8333bde43e9afc33d3ed53517d2efc92331cb2b2f2c85c43e1b8dfe93757399b92a674ba5 WHIRLPOOL bd9f2bed9677f166e466ae2bed0b956f2462a77427f18e181c2ad4647f12240b6c2dffa7f0c95ea2123c85cb5722dceea365f58997a51cb63ebd909ee81cf0c2
 EBUILD selinux-cups-2.20140311-r4.ebuild 445 SHA256 d0067aa4de13d3d2a0b920c57e83d8548e6e03953b9cd5ba6542553e54a6ee5d SHA512 7b67a64a74d3493606454ed587a81f2743ed6733b1e6cf56df8257f0b8aeaca1893db4dacb34eb7667c7743abc6b16b35575fa8f679924a3e3acfa0b8be43b6c WHIRLPOOL 84e86c93507ec08ab47d68c9a2f94c1067726dafed2f81727fa9ca63eb7549eb7beb6c6c3040ec10a2e6e443b2f75397574bb1ace8f668e47aa55d0077511280
+EBUILD selinux-cups-2.20140311-r5.ebuild 421 SHA256 51e5bb721dd4414835f93316744cc5c3abed256c28d4147f7c82bf61ec3a6bc5 SHA512 bb6e0003e15e2c0ab4994a5bffb97ecc4a7c88c42e846f336c6c736a8f173ada2f0ddeb981de503f2500130683ce985f46d5b4ddc31f51e7a699c4ccf1706223 WHIRLPOOL 1b6469ff1028732c8f79b93323339c68669f9911a67b9180f5507c0bb02db7b707c1867e76a6cf3c4367838383b6c3f7b1ac2c5082434c59032ec86293e11dc7
 EBUILD selinux-cups-9999.ebuild 401 SHA256 c423e2d998768b1eff0e5f088a94597527f5f788ba0d5cbefa4269cd89785623 SHA512 97f35e22e30e33f6e38b2d1da8aea76e17fc580dcc2f45a683208b400e1b4626dada89756fdc8c02c6a3b7d91377f11c71b8669e0759e1d431907139e88a2276 WHIRLPOOL 18d89c2e597bb4480d225695ba01c7d3eab34c4f9a4d5aad84c80944db557df4732fa86d890ea1f0f98a0b345f27ab206d583822ff606c6fa9f1840c3685fa23
-MISC ChangeLog 8179 SHA256 d8c29f5fc03ad815808b4673a5f2a9a08db667ae6704494f330731399f2e6623 SHA512 9f8def58fc1f3e7202e40ee7dffb9167ad80ba2d90d7bec41b3364cc71fdbc7bbc13c375af3908cd2ba7aed0be81d72d3076b7733d28ca8b909f54e60b0d46a4 WHIRLPOOL 1091c91328b77a4c4f0a011ab6dadea8e3354745a9dfee9c7e1e84fbb0bf07cceb5c670f81e2d365ddeea3517c2900f71490a18cb8c9c0ff4c5356eef43f7146
+MISC ChangeLog 8367 SHA256 980085f2d405aea61efc5ab01ea54ce2be013bac810e00f2d448174adde342c6 SHA512 4ad381658d4651c4e400bfd021f940e325372009ee9b6b0b3be4110f29b6a4f6b696f1f826223521f1774556a5419b0eede7a1422165110adebaf4ed7c369762 WHIRLPOOL 5c1c832908e8a863de8acf4d8de4b1f5382400b38ae263122dc66b40af7216edb8547c93fd275b3fef85a916760d3eefec29466b35c9c915229fafe3947b9f05
 MISC metadata.xml 228 SHA256 fd6bba05ec2d2a0e570a86e43ee5ab182e28d5a7b388165a37e0a52e75c9fd35 SHA512 5af2cb0102e38661f4de566caf5eefe1e8e6577410e3c81d1633c46e61340eb9b48787873279c82be3b189ebd5e913993fc4c513d83ff80f1ad1ca75898f35ec WHIRLPOOL e8cd687d4ef11f8c568558213ac32b59adfada419565e6d018975e58cb7943efe6fa2cd41377f825adb9d8872c89512c89c06d2f69ee991f1c79593e9a02f79a
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0
 
-iQIcBAEBCAAGBQJT5RxkAAoJEC7dUkA7aK9HHhIP/RkujFI4pk7opITdV7I8cTvw
-G97nyaMzF1U6lmJKGwAUYIC2qahIwMFdieVZ1YMc2gHkoP7nPDwiB0/wXALEXa6b
-wytUV2NXmboGuXx2ezI7kGGHNi1jYdMvqTKBAEqx3LsS4x4mFm/qLFQRHaymVMld
-+UxsQicX+aGEnXkv666QkvdbJFGIpDaiFNVVaTOOJGZKkH+MplzATKU9eDFGOVoJ
-qgWiI6V2N3YCfajLdWx/NumEx762QG32qF43yNMAliEiM9efuk4Eb0xrtvv//2Qt
-FviIfpsnB4vukhLzfwWTXhKTWOPSlkE9IzCKf2CXXio9hYZ80oMsaPxFGwaViQ6U
-09aAcb9Up3vHuji5tLkD8haYqduAhroMqYdbdq3KJnD5OI2ysG3dCFPdTN2u2vP0
-lJr2xFE4Zza1ZzLTS449qqq1ZjVwnXBLo5/Q+41gOAhTrmN/NV+izJLv/KEy9qM1
-NJc3yVpwNYe54vwE+69DxU7A0X2mXxQPLGzRO76b3BTrHtVq8lTZVuD6n+IgVuqm
-6XJtyZBBT9pEBADriRu36l4AGuZW8MmwdM9gSt91RtoxMY7PjorYfQSPR7Qepp1L
-euZD2Rq2h9eE9f0YuSqVdDcqdlzzAQDxXzL7mW3Hmh5MiNWYzfQyh7ZKcpzHKxgH
-CFoetXwSOFwxKQfOlcCp
-=8AQs
+iQIcBAEBCAAGBQJT5ng2AAoJEC7dUkA7aK9HW3oP/Aif/TefdU3IqK5xt87Gcsgz
+Dk9FJIs8nGEHZ3o9jx8ZPMOJSRQaBAY78NpZL7J30rjjc77aVDRs7TZ2Ee6dJ1vH
+OnKzPuU4gYcbWnvVeslYg4/Z6PcXQOTAV4ua5dgULZW7Iyi/tsppJgDFlysRlcU0
+BdUnSJaTEqkH6okS5UlX/DyyzllwMRXg6/LTzmhoETpLvCNcW9V5wu7/aFAmzBZI
+BY/6HgXq6/2bYoIx4vDlI6/3fe1KF2n7KCgMXL5bTpC+9SYEX1m2/M0eZX88No7D
+26bWzjefQzi/pjAyYb2vKhjMWbWPT5odCvJneye/chJvat28CF58HS18dwI7urG/
+nIqSRcuFT08KqIWF+XyC9zE1H7IKzBT0OAEtzUXvjzveAxH8Cg7Oqtgt0hYWHY50
+16RcRMi/gvo5IzBhiSWGDtGqlxXapjVqSeW0+wcdvqf7InU7DyNT+dBx7HJyAh+v
+Kn8SeNoXQ0YLFbrk2VJsekKXUCcihsqSui065l5Y2kUvS/H78CkoyuMvneKTzip9
+p1kraU3aslAQ19UsuG4DK9r25k4wbVnHqYoXExLT5NJzxfnU7cLJbxgBZnnCsgcl
+F4MqbN2xkJ/xCbCK3pGqikmicfRV4U65U/tDh/AC6hZX/FOFFXun76CFXt5NBSuN
+Uu9ltenn2EVRdyzYcT4v
+=jPqa
 -----END PGP SIGNATURE-----
diff --git a/sec-policy/selinux-cups/selinux-cups-2.20140311-r5.ebuild b/sec-policy/selinux-cups/selinux-cups-2.20140311-r5.ebuild
new file mode 100644
index 000000000000..4314c2b99b59
--- /dev/null
+++ b/sec-policy/selinux-cups/selinux-cups-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-cups/selinux-cups-2.20140311-r5.ebuild,v 1.1 2014/08/09 19:34:33 swift Exp $
+EAPI="5"
+
+IUSE=""
+MODS="cups"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for cups"
+
+KEYWORDS="~amd64 ~x86"
+DEPEND="${DEPEND}
+	sec-policy/selinux-lpd
+"
+RDEPEND="${DEPEND}"
diff --git a/sec-policy/selinux-cvs/ChangeLog b/sec-policy/selinux-cvs/ChangeLog
index e688739d3f55..6c689b9e001b 100644
--- a/sec-policy/selinux-cvs/ChangeLog
+++ b/sec-policy/selinux-cvs/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sec-policy/selinux-cvs
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-cvs/ChangeLog,v 1.42 2014/08/08 18:49:41 swift Exp $
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-cvs/ChangeLog,v 1.43 2014/08/09 19:34:15 swift Exp $
+
+*selinux-cvs-2.20140311-r5 (09 Aug 2014)
+
+  09 Aug 2014; Sven Vermeulen <swift@gentoo.org>
+  +selinux-cvs-2.20140311-r5.ebuild:
+  Bump towards r5 (fixes duplicate context for hiawatha)
 
   08 Aug 2014; Sven Vermeulen <swift@gentoo.org> selinux-cvs-9999.ebuild:
   Make 9999 ebuilds EAPI=5 and transform to make master for version bumps
diff --git a/sec-policy/selinux-cvs/Manifest b/sec-policy/selinux-cvs/Manifest
index a18932489819..13e39d8a6520 100644
--- a/sec-policy/selinux-cvs/Manifest
+++ b/sec-policy/selinux-cvs/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-cvs-2.20140311-r1.ebuild 468 SHA256 cae1f2bbacfc4c75f5dbedd377b63b05ef503709256084a3f4688cbadbcb03ce SHA512 237a02afdbedf7fa4f1e3f92e3fc0283160ae2c1378d6136ad6120e201c422f2474017add9a2fcbd58e0d6caeb4a8551015fd6ed062f3b416ab0a3a9834f9c52 WHIRLPOOL edf98a91d01ac343541f8e8a30e4ae3021434eaf39f16d16db1d0a4265f0b7b45041cb5ff273d952dbaabe3c56655ac84a21c21f562c350895d233734a1d8896
 EBUILD selinux-cvs-2.20140311-r2.ebuild 468 SHA256 b9d2f21f94feb9ca1940c0bcc1dcf64e1376e00d3b7fd5d762f94830974d7b36 SHA512 478af3fa42e8947b7b3be7d12ca551a939f1f1344a3049228b21f4acdfb7d6ed03d89da3f559ca7e14e7e07a7f8cb4595047bf81ba45678c8ee7b92ae1df3d58 WHIRLPOOL 936203bfb7d6894710e73a65fc5e7fe70acd8780a9009c67cdd3c1d4d0e7ad729e9bc0740f982894c31ff410f70c547f3506f69df1a7f77daea9d8a0ceb05b36
 EBUILD selinux-cvs-2.20140311-r3.ebuild 468 SHA256 7cd98e50701f7e302960da664d1d942eba37ae8557ff1498d9fb1b084e1729c7 SHA512 f776967dab28f9099439c1007baf179f2cda5ed1c9d595e58ca6fa64d86dd69d0977021a8dddefa5d2a4d30a44cc0ecfa5a7e8af56fe8b5330f457e44ccdf779 WHIRLPOOL bea1da63b3fa8248b5bdb7e190d0ef775972551a377ef7f23d0e52d093ef41b297b7b1ec853b5a5e3de177398bd375bde70d87207dfa1fd49ef41a369d15ec32
 EBUILD selinux-cvs-2.20140311-r4.ebuild 470 SHA256 77ed6706573eaf1db9e715f658796b8da4927884d5c1e5abd47545124a6e7309 SHA512 181e8f7910b3246cfcfbfb08fabe2ca0a3fddd49bf05708aa20cacf01578121d110e4e61812ec80e4403b09be69b16a9cfc978e82c43bda2f6de7a40e4f4eee6 WHIRLPOOL 1959630ca2e599281d1d44e6d658886148ba2a85d26c6b1cfbe337e78f429780f7762c7513fc1e57bb6f6799ba87d682464f4cf099cd35f2645cbc7360a876d2
+EBUILD selinux-cvs-2.20140311-r5.ebuild 420 SHA256 1a396cb266d649d0b4e0f0c821daef777f0a3c01c817d09dcc0c81868138221f SHA512 71d52113084f21e729fbaa9f92ce2a30ad42fbbd269702dbb861898f290da1b68942e29efd39fb0657c45ebe4573ec55b0b72973834e25eef184a0c1b2cc9243 WHIRLPOOL cb2b68dba3a5983d07f4e746eb3b507e042c245b96d6341b77423141b566269d2e94ff5ade54984f739759f206da653b7543ebc92db21e5f0e091ab3d4e67edb
 EBUILD selinux-cvs-9999.ebuild 400 SHA256 ad34c4bdf71774f9bd1fe43229e1a59b994200250d6801d6f055b756cde24152 SHA512 4b354fe0db6c9d8e5457b5d1057c101fa6859662e86b647f01c97708cd37eb4f65b78db7b0bca69437bc293f17c726fc996b3e85e2d4947a105942cc25fdc8f5 WHIRLPOOL 46fcd7d3ff8573e03ae1c235923b96734e41a73006591d621a992e0fba385cedd8e9acf2632d8c78eba3928c83dd0ae26ba4ca7f8521fab6d84715f60d0f648e
-MISC ChangeLog 6286 SHA256 2a11d1dae2ba1da346f18b75ab90509651ae4cd8950e402a9281e1f603eb369e SHA512 dc6bc122e5d44bfab834bd157f9d59035df4f75791f84aa850617d2d86dd71717659741845e43b433f6b7aa8b1d1352699c5bfb18649e851f019e729762f4f3e WHIRLPOOL cc131a610d316252bc9b370e52008216aae2eb9da793450394daece37066bf1a5fe9b339b1e3020341bdb0791aaf5bc749aea2c83033f26b00d1d2ce3ecde4ab
+MISC ChangeLog 6472 SHA256 32516fae65cf589e8a40a20a9fadac5fb5a1a0fa679813c2aeb42c9793813a3d SHA512 4160dde7c4478a1132457eb70630a854d12c74402ffebbe45bee7d03c8f037b33f456d81f8a9951c346b58147848ffcac152531f4695b68805485fa6e1005c21 WHIRLPOOL 6841dadb20845c939f93807c754f6f23a55bffa1bd3409e9286a3f0724bd5289e2f977397e0f2757064bd4092588bc37b17fe72b3150450063f3ead8e942a579
 MISC metadata.xml 227 SHA256 9d7fb4e431b13826debf7ce4c02298f4ded2c72df7268ec12088c3fff234f464 SHA512 9db488426b58d4776473f4935b9bcf9a158f967c70a5c614e9ad0a0cd2e88a10d7adc9c8003c269f9df32f564c9b5a30e90a9f3ea196cf6ae8b0d56f79ad877d WHIRLPOOL 1e10ce8c96126e1122d1fd2fbfdbdbb09a67fa81bce5fedb5caf90915364fa217104ea8f5efb7b2624b138cf0983f3cdfa123b37e0e63b7947ec3f21c12470a9
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0
 
-iQIcBAEBCAAGBQJT5RxkAAoJEC7dUkA7aK9Hvz4QAIXDy9yCI5bbs3oUTC9ZdeR1
-8Bf2qQCN6qHMA0zFchlFSjVAKcNKx8KhBKkoHb51JdQGEk+gdI6l510cTVzIudGg
-j+c8R2s86v3qJ3rvNXAUiFVdxPb0L8zO53ZXS/WBpwFmS4QG9FOLzrrVYkMXXIqV
-ovc0AAfTzsLSBnt+ocuIchgHNP996gFIQ7WLmQ7c3Hx0gagRTC29g567L6/20kaa
-wBcNU9bQqOFC4UyL0Cd4TrCwCJAPNtmW/e86VD/RhhKQ9bUQ83N89ck8b8YTkeqk
-u4xVK2Kr4xDWtbuZcmYDtZiniWlxnyeerohjo4J5mImASnN9LSjbXCMXySB21l85
-lvAzfyMNAPVT99lc3ChadEVdoE/gPpZoZM116P6K2xq7w5KFEo62HWIKFY6+wfTf
-zncQmNWkAiLr3Mv1cLjNECTjLaLMVcCxLLCyqy7aXkWncozmyR1FIMVg11cNk4Ux
-FfCc28SKs6t5m4GcAOl8VN2DgjnzebKQb1ft5SSo07TUEMwMlppilv3ewoiw/a+r
-2c3oc4glWTlbgKdewDyPannxMllDpZbtMrV4fel/d/JG6d/YcCGblpQ5/X8fpYlU
-nQ1qfLith7B7SxUGZAeyQD9aY3opthKO0XRSZ3cV5JB58ADOvuVkV133igWHvMsZ
-X+ceZdoofHZYizlI0Rhm
-=rtZe
+iQIcBAEBCAAGBQJT5ng2AAoJEC7dUkA7aK9HOvEP/AteglswQOTW5IVqChveClxR
+Tq11H6aLdftVshUzKj2qPe+bGQjLUK5qhfBUm54RQstwxMXm7EfhDh5D9dCGoTmY
+R2LKZKC7G+cDnMKfo4gZ5Gqtf/1UpyBpDMU6J/87WPIQxAzb7Vkheq6erpdzzGEV
+b5I1Hptn3cQMPqncw85yfT9oPd6fnkotow+mAXMyIE5LFaCAcyWU582Nf23UVfy9
+JvL2+mb0qv+0JzU82nNtjkVS/zOjNpG/hKPT5juBzyofiWjmdGCuDya8fWHizdQ9
+JsjgFgk22F9zEPJ+k7uq5z2Wqq6SsY2ZGEfnbBsSQwE8+uVyHbjpVE55auVXPDCe
+0b8Xtv4XY3HzZab1rBIubYLvPlc/JwN0uiMpbXw8f3lTUWUIZPaBe0pjrrbvcun9
+quSDWectir9GupSLwacuzGvFF9/j7FX/9xkph2voFUqPwK40kl4tPjcgd6MZV886
+J9w6PcqUSlYCwFFVVpLAVNPzG/YHRlbPjYZUkxo6aFhN8I+rpjv2aDksQN5ynJLe
+q44dqcEPg1sDb1VF9HYqw67CQw14iwSBRrAuuPHotpIa8lce35/RUK7/IbUqZjGC
+PcAl03XrMft9EFSnpg27DJg9gHCj9gPl7BLQ9dTRaWOSlzk+aCVPocKwRo57QyR5
+/zbEHve4524fA1nqsxyn
+=rGMb
 -----END PGP SIGNATURE-----
diff --git a/sec-policy/selinux-cvs/selinux-cvs-2.20140311-r5.ebuild b/sec-policy/selinux-cvs/selinux-cvs-2.20140311-r5.ebuild
new file mode 100644
index 000000000000..20e84f8e0f05
--- /dev/null
+++ b/sec-policy/selinux-cvs/selinux-cvs-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-cvs/selinux-cvs-2.20140311-r5.ebuild,v 1.1 2014/08/09 19:34:15 swift Exp $
+EAPI="5"
+
+IUSE=""
+MODS="cvs"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for cvs"
+
+KEYWORDS="~amd64 ~x86"
+DEPEND="${DEPEND}
+	sec-policy/selinux-apache
+"
+RDEPEND="${DEPEND}"
diff --git a/sec-policy/selinux-cyphesis/ChangeLog b/sec-policy/selinux-cyphesis/ChangeLog
index 3342e3347fc9..eaceb257f363 100644
--- a/sec-policy/selinux-cyphesis/ChangeLog
+++ b/sec-policy/selinux-cyphesis/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sec-policy/selinux-cyphesis
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-cyphesis/ChangeLog,v 1.42 2014/08/08 18:49:35 swift Exp $
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-cyphesis/ChangeLog,v 1.43 2014/08/09 19:34:48 swift Exp $
+
+*selinux-cyphesis-2.20140311-r5 (09 Aug 2014)
+
+  09 Aug 2014; Sven Vermeulen <swift@gentoo.org>
+  +selinux-cyphesis-2.20140311-r5.ebuild:
+  Bump towards r5 (fixes duplicate context for hiawatha)
 
   08 Aug 2014; Sven Vermeulen <swift@gentoo.org> selinux-cyphesis-9999.ebuild:
   Make 9999 ebuilds EAPI=5 and transform to make master for version bumps
diff --git a/sec-policy/selinux-cyphesis/Manifest b/sec-policy/selinux-cyphesis/Manifest
index 6b5fb54df554..f30493cf7d97 100644
--- a/sec-policy/selinux-cyphesis/Manifest
+++ b/sec-policy/selinux-cyphesis/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-cyphesis-2.20140311-r1.ebuild 395 SHA256 bf00966142c47ed0cc13cfd69921229afadba72d32a6b61176c1f78956540e23 SHA512 430d5ec5f1a6fa50d9378cc09ed022343d94025b9b388876ee65c26e5c0a39a0589f5f720616d2a4361a3a5e044c3a8d8369b816a8b7167397dbe40d9cb38778 WHIRLPOOL 132bb9a83bd270e429d3a5769202e3e0546243a636f646ee41ae3b2752b1dad7c0f2cd088e4aa2d9913c39b993cf2b9a486b002e6648dde3f9b376cbb27ff2b7
 EBUILD selinux-cyphesis-2.20140311-r2.ebuild 395 SHA256 d4aaef8ed8f2082970ed896fd35c8c8ce881fb3a03d54faec9b4c28fb0e86b2d SHA512 954be787661100afbc4f2f210aeabff76562e6a5d77609243a1ffe61d20c1030252d86a9410e62985f4bd1b90360d75b22a6c5efd6d2dfbe4990354dd2293328 WHIRLPOOL 3d6be19b29d0b99770ed31ee424c56380f3fc55fc54b4b07c67c99e00d1160bc9c73be08bea99212ddf2a48f7c4535ed50e23a09670e876f7022c635bd0d45fa
 EBUILD selinux-cyphesis-2.20140311-r3.ebuild 395 SHA256 d84f148933395817888791356de0b8dec653f725b6863b976c619f8056d78dac SHA512 9f0f1cf1f9bcdfaaced8e52b471679f616de6f7178cb51eb29d4fb28f02fb432c50da3066c66cb902c5260c517a9cf983a5781edfce44766db74af0c35e307be WHIRLPOOL de26f74d7e6d26e0a32518c3b74550af62cc604a14da8ba2184c0cb682617bf89e17720a46669b6f835809c724db81ebace5f549ade5757cf13b19019ca66e9c
 EBUILD selinux-cyphesis-2.20140311-r4.ebuild 397 SHA256 725438b90ae86713d1430b994992183742894a9472b45bc34f18cdf43d7e2ee2 SHA512 0b4b3e7cd505e25a20c5705c6680493b6e233ebbf0ccb9046c9a537986ee94bb432843d661489b2ff6de420dd5a83a7edffbf7993fa7482716cc57fddce116f6 WHIRLPOOL 742de34a9977400472a31c2c188e5ef62b3e62d2e54db3401f95ee30bea8f23834d3ca1b1b8213a94d53600d022940766014c3581ceb3a41cc505b22ce75cd97
+EBUILD selinux-cyphesis-2.20140311-r5.ebuild 373 SHA256 44ef97a5e63264a2cf21721212efd7864b255dce1c0122e5095a3a05dc266a53 SHA512 443d11697ee5d66da87ab338601a2fd495bac263d6d66bb17f5705788a692c8d509973507e363be653414eb962160a5774b17ffa3ba0a990f13ec247dc110172 WHIRLPOOL 10fbb3026b80ae8a1764f31187c0e9665e2c2a61677a39feca9a1ed0b1a214020e1e0f94f6692f16bc6ebdb6bfcd9a4c011f3f24eceec50009d6b003a7e9ab52
 EBUILD selinux-cyphesis-9999.ebuild 353 SHA256 0e35d8a8182a075ca3d28ae4a7e34d65b88e037e1200d0c34fabb51fcc665fc8 SHA512 31f06b9beb7f838bf9babe18d4faf12e51b884853673bd0c578eb0dd802d570f5d000b18366993a21bac703f445242a0f61d2f8d2bd39d1d03dad2af0b7d4d60 WHIRLPOOL 0b7be2a64332c3e117b052a0874cd753de0c051d3dc1790ff056b4f412260f9e9be64cec5df487c70311311473fcae1f1b504ce5fc48f7a6f45c1340aca2affb
-MISC ChangeLog 6671 SHA256 3ea1363977df0463b9b356044abf4b52eb02cc9f8942fb23dee97abe5bef1b88 SHA512 5165f8fc16fe2bf6c7ced383c7ecaae33def820d4e980d99d4649a4ca276f0ad524bb4321a11bd0689f231a76f7acd6a14235c12d809dbf3ad86247c2c65a239 WHIRLPOOL 2dd61d97ad2fbeedb24774316183bcf91c5b7cf93e6ce191ab8a787a2bbc07fc7d8410f88a030296a5ddcef4baeb170e31a76c53d257c1642fdc8f58fe4551ea
+MISC ChangeLog 6867 SHA256 64ce26d383ee03bf42fc3462e3a9eb0f39b282cd1f661ae3e3336a1087062f50 SHA512 069dabf1f96ccea3dced135262cabce9ba24cc629a8d4f2de5967f5cd591d2f7d8829ac584a2bf57cf83d271ce97bd88afc8f254f4481d3cd4df36cd4208541e WHIRLPOOL 7d77c458df722abfcc33779c3a975d5bcd5c5869b9a0405563125c476145ac52fbd95b9ca0294e87174a5188df1f00c23b042dcc829258a6ae75905fc6a49885
 MISC metadata.xml 232 SHA256 46d9991ea8182b055314f79cf65bf3dd526907c9795791e7fbf9e6bdd11d4c0b SHA512 59de9398923488366e593d571555d6950179c7e724904054984b98b2cbd672788259e348750a2d625c9564d19ca64b0c18e68fc5ea414839e0b6ba6517a55449 WHIRLPOOL eb0955ce23f8145c071b95569117f3fac94b93a9dbb94c23f2d79ad5669e181aed501c7668a68fa96d4c9be2d64766c7b8c8e4466ca4aee96526499660af15cd
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0
 
-iQIcBAEBCAAGBQJT5RxlAAoJEC7dUkA7aK9HnPsP/Rsm7K1EAqk4h/nXz3vLroyt
-Q+H9xbfRmBHRXPbRxjQmJIC/T0ZXUOXNbAjfQpdGUqI8nAKXFCWqxFwhzAxRq7r4
-oUOH4ZrRj+Lypzb5u+CtAX5IEhm/JDqHe/ymp8c8gzQdu5BeLVSBoKJY2Eoj/g7x
-F15ijlx4EPhPFzlmGA9lf9XOsCeVl12MB2lZXNTDLSu3rKp1KVAvnpPJYdKhZLgY
-Bt/P/iF4W4un5a8NrklrU2K9onalreOylGt1A8c768O7kbH5uLd1gDc25WZXVYik
-NnCKgwMWAQMfDr/RF0g3YW+IPddqyNeZEHv93zAps/FSlkhXra3MzEbby4FRZrYC
-/BJnKWnFEep7GWynuiOp2/EoVmhp5jWyHDwSrQPAT9pv4U2HP5DpuFDBccHCCHe+
-X5RfOUcnS4oLM6KeXJdS0q93WE1AVxJ4HqVwsCi6QAlD1LqamVVeQq9oBdVctB4Y
-Sdd2XHrIadIpOevhpNSHmyspKL0y7bOUcvSO8RBI4QX0bMtHndMCMYdzFypT4lTi
-eEBI9R1MpHyMYi7iGNugoknPGkJDuEjutp6mdPfO/5f4x+uCo5B3NH++lmIM/i6p
-XS2z1HYOOqP7rvzZHmacSYTW86/+k1E7wgRgawg/7IjWy3AgEsaOZL030Awms+Kd
-+0ex8Ezz+X6zOfa6RmRB
-=fzYU
+iQIcBAEBCAAGBQJT5ng3AAoJEC7dUkA7aK9HAhQP/3TwKHPGpLWCdoJUSlHYdvQO
+HS2GEhV53WqlQ4BiRgfGlvd4lhY6xJmgQ/KiiL/O5tY0SB92Ns9i5QOUL2QHLmqj
+2FrmVdn8/dM5kDW/srErJpwHIukt1+17B8mnDTiwzCbI03tTUFu+Hybwo4zxWDz4
+uEzcfC9/CRkgj69gqhy9D/uZwbdighJ6u6TIiubDPeCEtwR8MQItToxIp8jmn62J
+t/ny66Ril3KyfK9wmJQlSiYtvws+EOpycIVqlbWFyCLTVBsy2yjxVNn7cvsxrK3U
+YTffs4feG4OMAHLdU/U+F/C14VVeXj95NS92pJS0+u0+vH2Ga9vROLj+g/5t9ETt
+9v/zhzBStM44R5Qd9yHduwbaq/oN6xlCaER0L3R3pnynRXeBiQ4vsxEBX21KzIWQ
+V8tos48mTKMQ9dZzXsE7EK3Lp9xXzw6X4UAlGI88obumjDodam/Nd93gpJG50HAv
+2NoHVfqXaVSEKyPEMlkyi5lne+8Ixie1XU19VOb7lCm9AIwaKXgMjgYt8zGC3irt
+pRdphnIYCEzCgsIFqETx3DuXG9iJ9tF6Hhk3yjuHeaA5JKzxvdSPoYnr9Ur5/RGy
+7IjBzrrQVWNu/VdarO9gohFOsA874Ve5+TNdamsKqNHmztwd9CiDDVgxzUjk65uD
+LsxltCABMtLyHehsC0a2
+=1j3L
 -----END PGP SIGNATURE-----
diff --git a/sec-policy/selinux-cyphesis/selinux-cyphesis-2.20140311-r5.ebuild b/sec-policy/selinux-cyphesis/selinux-cyphesis-2.20140311-r5.ebuild
new file mode 100644
index 000000000000..1ca3abfe1464
--- /dev/null
+++ b/sec-policy/selinux-cyphesis/selinux-cyphesis-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-cyphesis/selinux-cyphesis-2.20140311-r5.ebuild,v 1.1 2014/08/09 19:34:48 swift Exp $
+EAPI="5"
+
+IUSE=""
+MODS="cyphesis"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for cyphesis"
+
+KEYWORDS="~amd64 ~x86"
diff --git a/sec-policy/selinux-daemontools/ChangeLog b/sec-policy/selinux-daemontools/ChangeLog
index a08328b7de0d..63db126418d6 100644
--- a/sec-policy/selinux-daemontools/ChangeLog
+++ b/sec-policy/selinux-daemontools/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sec-policy/selinux-daemontools
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-daemontools/ChangeLog,v 1.76 2014/08/08 18:49:20 swift Exp $
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-daemontools/ChangeLog,v 1.77 2014/08/09 19:34:19 swift Exp $
+
+*selinux-daemontools-2.20140311-r5 (09 Aug 2014)
+
+  09 Aug 2014; Sven Vermeulen <swift@gentoo.org>
+  +selinux-daemontools-2.20140311-r5.ebuild:
+  Bump towards r5 (fixes duplicate context for hiawatha)
 
   08 Aug 2014; Sven Vermeulen <swift@gentoo.org>
   selinux-daemontools-9999.ebuild:
diff --git a/sec-policy/selinux-daemontools/Manifest b/sec-policy/selinux-daemontools/Manifest
index 6719843193d1..6883157a79c5 100644
--- a/sec-policy/selinux-daemontools/Manifest
+++ b/sec-policy/selinux-daemontools/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-daemontools-2.20140311-r1.ebuild 407 SHA256 28894d4daedcc90fb9bcb7914e89b7a0aaba126c8e5ad61b20ae5ceab5786ea8 SHA512 bd6d380710d682f2b81ef7755a62a450dd40f47dd400a62740fc26b9e2ec1cb556fba730ed42d088c7780d573e9b5868f02fcf3adc72460d40fe4959ccf62a93 WHIRLPOOL 3168de30a9184a5e5398dd9bef42b6ebee8484f47107e373dfb22bf9031a8afd624b7829e653a8510c3453c511616a6c9c59f70d9e38456ea89e7853a8b5d051
 EBUILD selinux-daemontools-2.20140311-r2.ebuild 407 SHA256 78d4ad17f1236f5950156ca96534a4df543f5f276ce61fbac9d671860fa47ba7 SHA512 eedb6d115f912cce9c75ed826cc4bc2fe40ed21d74c65062057eb1c62a8c076486564cafe047e185b599617c4e4f2ba3d73a2c69110e1f6fec3a6fcd1b0ad580 WHIRLPOOL 1b45b8578097c110807eba903d75ef8a9337e6ec9abcd49fffc71e1426f12d6d96bcfa015804922fb6356e1caceddcdfbee9071ad86ef031bae1ae845fdc6ec5
 EBUILD selinux-daemontools-2.20140311-r3.ebuild 407 SHA256 fd474d7ca201a5033ccdfbd3d03de3865b2ea606b98d54dcf384f8cd29d96e0c SHA512 3db66a26c7611fa7aeebd3ca2723a3429d035454545ef45cd87668a8bba5e3a57889240ec75dcfcc6be8984d51152b3090950a16c8cb43e3b771d641b5755c68 WHIRLPOOL b86edc30e4bcf36a6eedfb9c1de0eb0cd1cd3ee081b32983213aeb369645123c3afbd35dbb1084c1e94cdb85472053cfe1bda1029f1e8ba754569865a4ad43fd
 EBUILD selinux-daemontools-2.20140311-r4.ebuild 409 SHA256 ecc2ff832469cbfe8559c2f252af7904043d48ea85dfeb8c103d5967d7f5a7d9 SHA512 a4c0620b3b169a38bfe56fa3a4f3040675038b7ce3473f78068c2051f87191f8b2b04046f75d204d713b695168aca5779983a1b6c3caabaac43781538d5e2725 WHIRLPOOL 17df8875c381f0125b8806e2236b0b5ab2ad44e151aa75807e0d89ce7ffa91d696fc4eea5853b58c1c6eda134a9735ea0dc6b01645b28e4495d55a180957af99
+EBUILD selinux-daemontools-2.20140311-r5.ebuild 385 SHA256 a587f9382781adadb5cefe337d8c69bd04767cb0aea7dffea4f76d376b743566 SHA512 5e5d26bc15cda587af9f8fd7db444f3dbba36dcb2a39725613dffb89a66e5c19e6cf5ea3dcff5725fa43343adfd958ae2731a1c1525cb32737aa19fe6a5b7be1 WHIRLPOOL 23644400422ba9f53d6abc6a5fc57e24a2d742bacb410e63f826de9c369432abc58806a485b91ecb8e457c8f1ef2bfba040b395420be4a098a94c2acbf279321
 EBUILD selinux-daemontools-9999.ebuild 365 SHA256 de061b948589e88af4d261d4b604929b1dc7c7b67a23771299c74e5c1f017dbc SHA512 6140709d03ae285147075f1192f3787901e04cd530872ad89ac1d867888d7008ca1df92b5774c290f5b871536d9c5daced08f3823696f1cfa313c3ed32fc4a9d WHIRLPOOL 51cf82fa95cd3db98c98e7c96840050b3a9fbe8703795bf9fea16dcc57257c65c91f962197a82c92380717a9a9df0ddc904ae515b97396d112a4f55d17b0367c
-MISC ChangeLog 12341 SHA256 0f7d6d53bba9a07677839a5e0afaca2a528d14375e8fd7d72ddd01031a1c3e64 SHA512 39a1f6b6380670899b905f29725a74b9062f98d3e5a511fc9cad372c7bf8a4451c717dae4e47dfe69df87abe202a80fd8093f02c9cee513c5f44f26fd8bce208 WHIRLPOOL f31a0905184f956be45379b4c98fe0651e2af6f5d3d06ec154bb40151ea353eaabe8ce929c66b67d9fd47d5e928c37556718c7bd61e3d493d871e1e0ab9a69c4
+MISC ChangeLog 12543 SHA256 b85dfc0314f19983bb27e89381d1b714d9a9b9c81e07b26bce9a4bec84dccd59 SHA512 ea6417afd19f226bebb38a7b3b91fc752e038263214ebf03688ee2cefa4e8b25c78bb84c1a0a292c570862f0cd42c0d7b7d7669ad3f4d60af3270690e4228bc7 WHIRLPOOL 82dba12ddba898ebe80f36d8d171aa92ff7cb0200e8b1affd442ab22d97f7957e0185e792499074729f86397c9cc3e3b6ffee7ef1358d287a813b1c126037944
 MISC metadata.xml 235 SHA256 4a7f2427d78dda1e71f05b91fbe2e99d26f7b502c0ec6715de5f4227ebd7eb4f SHA512 63cf3f00da61d9548d0ecf1bf19c37ba9cffcf46a043b76a76ba0163e2f6cfc8f3863b28f96048e4fab2221423fe385692a93fee8e9cb76b083679531734d736 WHIRLPOOL 5234ab848934dff2472d93aa02a54b06bd2110b6146a356fa3d8d3b2ea8bc91c41890ec057a4aaf52bae55e561de33ed56d0c3ccb111951d6342b5536b895187
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0
 
-iQIcBAEBCAAGBQJT5RxlAAoJEC7dUkA7aK9H7dYP/06TcZ7UHpvLLJYbz3i05T/M
-UTbxR5A2DS5sJwvninTKm77shRnpzi1ra8lwN9wSs335zgXsuVSCSJB4Josbq0pB
-OaBETUhRLbmh3WwDBO0t6MdvkTwpY2WvZ/e5R4SVtBJMaxKz/GUFBit8BdA2rlxH
-V2Q2xtWhAv0Jo4UlvIFxMsaT2cYLl76rmN9TWxd2yt7OFHcdmaSt+kkCkKgeFBtb
-g3ZrYUU5cjByviMTLlH9NnRGPPR+9XNAQiIx4K3EdVq2w9F3UYsySkKS+7npRkZQ
-E+KbpZOwNE/Cw+hPlRXqNPjc2P0fPAN3692iMfWY94aY9RhRss2AEOY7Fqa0EnJC
-vUAGrcJZp3YegebTpIUPpWfbHIpib2pLXZHvRrsk19dMEaFbysDyiSFoGASk0a6S
-TM35KlL7CjgCmbaqDXcyoaEtBVnbJJpxi1zHedqZQyj0Sf+qIurUqqdmQPCXCbtt
-kcer8w4wB/jyil5bCG784U+aNYvzyH7dLXeMbWleMjzqKbQgFD50Q9glsvAzei7N
-5T/a0Avigv0DIzjvATE8JflP+FIp+bwG6cgYuPCiTV4YyQyZ873irw+x9ZIP5ZQn
-XjkAt+2OcB/RFLVN0t7G2cN88BQF8rVmtYXALfXmnPPMRqan4Y7w3aMnL/8+69OJ
-TWGpQY/bWvVcTkyGZvYb
-=/Ps8
+iQIcBAEBCAAGBQJT5ng3AAoJEC7dUkA7aK9HG3AP+wcNe+mfOJ83sGglvZC2L9bN
+uXgqsxUnr55G8VM4NZp21lv1vKWknU/zhBn9O7zSbJqE3o7Wvr4gCPMiknydG8B3
+5AbN/NDPtQjFpp8EArkd1czKBn51jMuMRHFxAfboj1/OOmavT9i2rE4ZGd5FhFic
+81sLrJ77Vel/Seq9Ay4LxgPkklmdMZ+WhxhgT3iwww6xjRvHQThK+pERE7HJYuAi
+QKMN62mz5chp/fh2+54T6sZ+IZOwXmjWvy8dFeIU1el4X1CDfOoKaU9O0EPd0nza
+RmK9fgWiQGyQ2pJC4/rVWis5u7OVxJDaUg3jZLiGy170qPwuzDAwJuqJQAKIc8kI
+qIpfvCdFmU/HKbbs1I9MisRzBSRfjCVSWywUdjr1JDKnMD/pVBYQsKp1HB/vKgz8
+Bhzvgz9r9IkchkXMl8PRb3ZNY88yM90nD04RdQcG0beJL1dkNxLdj16OVqriutEv
+JVPu6ljbiqHGtNnEhrXgQXmC4dsZeoNqpN4Mlbcrrc/DhPDd4jYIW6yAJkoLrI6H
+ZDdwgLBdcvglWr1BSzhw5dU6Kzv2Wu4fLbhM9hLyhiFnVz3ImRVJ7XxBfgUhQSUq
+aaOUpIh+8Pxz+L6NMXyPaMpploATy+4fI3Xb1pBDbnrl0MINouIFQYIfSS6Bvn+h
+3Ak7/TNh+aZRjSNn/tDR
+=lClQ
 -----END PGP SIGNATURE-----
diff --git a/sec-policy/selinux-daemontools/selinux-daemontools-2.20140311-r5.ebuild b/sec-policy/selinux-daemontools/selinux-daemontools-2.20140311-r5.ebuild
new file mode 100644
index 000000000000..c87402d86d00
--- /dev/null
+++ b/sec-policy/selinux-daemontools/selinux-daemontools-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-daemontools/selinux-daemontools-2.20140311-r5.ebuild,v 1.1 2014/08/09 19:34:19 swift Exp $
+EAPI="5"
+
+IUSE=""
+MODS="daemontools"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for daemontools"
+
+KEYWORDS="~amd64 ~x86"
diff --git a/sec-policy/selinux-dante/ChangeLog b/sec-policy/selinux-dante/ChangeLog
index 3e01da7b2f3c..42bc4565419c 100644
--- a/sec-policy/selinux-dante/ChangeLog
+++ b/sec-policy/selinux-dante/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sec-policy/selinux-dante
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-dante/ChangeLog,v 1.66 2014/08/08 18:50:04 swift Exp $
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-dante/ChangeLog,v 1.67 2014/08/09 19:34:13 swift Exp $
+
+*selinux-dante-2.20140311-r5 (09 Aug 2014)
+
+  09 Aug 2014; Sven Vermeulen <swift@gentoo.org>
+  +selinux-dante-2.20140311-r5.ebuild:
+  Bump towards r5 (fixes duplicate context for hiawatha)
 
   08 Aug 2014; Sven Vermeulen <swift@gentoo.org> selinux-dante-9999.ebuild:
   Make 9999 ebuilds EAPI=5 and transform to make master for version bumps
diff --git a/sec-policy/selinux-dante/Manifest b/sec-policy/selinux-dante/Manifest
index 25adb47b587e..99b29c974356 100644
--- a/sec-policy/selinux-dante/Manifest
+++ b/sec-policy/selinux-dante/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-dante-2.20140311-r1.ebuild 383 SHA256 a964588473b58b82a3db2dfd32c8a96e2fee483755e82e88f3912e90987aea04 SHA512 32badf29beb6071ed720da24a007fdfb71284d0eae99a221973a1bd0e514615818b878bb249140102575389953ec21554afb91d9bd6fa7b927fbf44a5fd8123e WHIRLPOOL f35ea0232fb0bf33203ad55f132c9e599962938b3146973abd489f98754d5526abc65045796282ede9e71197e8a1e5d1482e8b9705ff0c4cb9b31809f9b8a2fe
 EBUILD selinux-dante-2.20140311-r2.ebuild 383 SHA256 ffabbbd9180e0b5e05882f262476e107ef856ec5d26fe3cadf99eb0935a5f9a0 SHA512 2c578fca887c147eea3585bef4ce0fec9ff33955370f1185cf8ae4a41094582c53decfc29bfe7b7eb29b94d76662308cb5413a96cf419174c26c12062bd9dad0 WHIRLPOOL 186b5f44834d988cb2de210e033bb724986914f34b7f07462b2b9a8f27f1411a1af93e0c3ec037ac4042771dcaf1c25a8c3bf18b85ddd2ff72721e22d0f7b9ec
 EBUILD selinux-dante-2.20140311-r3.ebuild 383 SHA256 4aef1f54d979c9993b381bddca1aac43d0cc01851cbfb4fa2085bb6552ae6b2a SHA512 ff5457ce76b3cea929fe98654a451db04e4ad9aa389bdaed30137177824a09c2c73b42319b99b1ff7a96aacf58fd4b7cc32e1561e6e0311b6a7f5290b999c383 WHIRLPOOL 32f06be67ec2a2402e6830ce7fdd900cbdcfe9bb1a992a0b685a2b7a7c4684b269cddc03279317f930b3ea070bb1e63a4cea7b72275a258c5c76f9e1b84582ee
 EBUILD selinux-dante-2.20140311-r4.ebuild 385 SHA256 948e51112af29458686468a93d5dec95bb08b989c2726da91e3fe8e88977330b SHA512 32d6f99a78a24131e77e669d91e9167a818d32243b9d27f9bcfd5ea0fd5d0572611703c76a56525251ae7836fa00263f8c01fc442f4378fa8782793a8dee9a4c WHIRLPOOL efc20bcd928ef73a69a1a5c964278b09b8aa97c6b3be84ec27e58f6e04ffa3e3babe901bdd15f9e6e8ee290852ed62848ecd5fd1a6bf395bf6203bec53bba439
+EBUILD selinux-dante-2.20140311-r5.ebuild 361 SHA256 312fe0200b162740b7733dc2fdc715ab8ea1ef3d5c5c89cdac70ee7df1ae32ab SHA512 8e5efae20b056ec4836fcf50edf0940eb80b9b60bd5242bdc725188c274552baee3ff1a7dcb45f1ff378ce2b67e4f6b6e63c80586c7f2226758496217221cd85 WHIRLPOOL 06935afec163dd2a4265cd7014c1d8f64341e67556ebec22a175f71788f4bad36f33cf7ec81bd647d3ef3056e3a6be9d944f9b930dcf228ee6b64f46376ce097
 EBUILD selinux-dante-9999.ebuild 341 SHA256 2a937ad30dc7d18f4c09fd88b8673be54e8c2f36a69bccdbf450087a35619f8d SHA512 b8e90c6651418a6234e642a8846f6e8bcfe4da5f27337c6b2c94edd793b5a1de5f4e8e8dc649cb27cff4fdfbe228581eb8aed5150374755686bfeff9805eb151 WHIRLPOOL 8ce81c2ff27abbed678f5438799f8e11116fb63ebac5cbd6dd96f43636b785242f0f55f2d0fbca6f8c22d9117dd03fe5090ab41abfe07b48ab10422009d0b367
-MISC ChangeLog 10034 SHA256 f38e733c7ec1e409aed2dda78ebc2db7023af691902127ddf980a2f5d735e126 SHA512 98a615f1dd87bc58851556232137fb922bcfbea350c1dcba2aa3a97107c37cbde011fc2bc5deca0bcfefef3b3d391338405d7cbe1e3ed922c433ee09afc7961a WHIRLPOOL 023606523edd2d02d85248a67a78787b7d95adc3eccc890ffe8196c465ed6a63837188b0fe51c42353f099fc34fa00842afd0643e38c1a30d16d6e3628796040
+MISC ChangeLog 10224 SHA256 b782c7c6f97a26e62819d06547d9c8139f731323d99e84c8143fb6020156f7b5 SHA512 4860231b669dc65e266c951153de993a8c3748860b1f31646fd9e43cdb4f72877f73cf91d1f9d07ffcac178359a9482e70dfefae1f428b419e2919e9b5a664c0 WHIRLPOOL f175263924a4adf35de47a44289760a2efaab2c2493fff151ad9376ff5a4aab534a3ff71dce5696b7a3cc28671a553f5ad3d50e61c21b2577e8bccb25f4dec08
 MISC metadata.xml 229 SHA256 e84dbe604bc91a2fe1849e212c911ca061525d6c1869c6756145ab48e7834b99 SHA512 075855196f428ba92cc7f36f46303b5097df408547ce1b03f592967ec7f34da874a1be2227ec47a2e2a51510d6c76e9a9ad7055aa03a4caec78f10b13b5a9928 WHIRLPOOL 5e5ede2e151450ccb1a577a2d249bd79b4c1a338f8db0221b1b2c6fe52981fe14f071748dbb4d287bfd9b0179687bc9a07eb10ce6daf853a74e2f907bc9bcedf
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0
 
-iQIcBAEBCAAGBQJT5RxlAAoJEC7dUkA7aK9HnBYQAIMoSorOlam9lVuPqvvlBOcD
-0uytWFOZCdxnW/rPMAQuEj3dFp2laDbicXwCz4A3oiSk/AGErIAd/YBSo0UoHM8Z
-wQ//hFeSb0RMEHfsWlJ2bDDx0HgQJa87qDlRawAI2NCz6b9VGiAzPOOW1A4xnrnj
-s8ZytpLJEMPaaSfPNox7FmR71IEv5ifFqotxxe9us+7cfl04Faws7+Qp2k9mXnqY
-kRw7bIhCwxc3Uxka3Z/cpAuqLLXCL0y2ARA0OufFtEpK2zDPAXqXOFBn7gkGkRWr
-qITr8PfNtu3nYHgTexBK4fA2dpY5pN882jaXwBEI+PFHzeJuYHYWHbp0FaGtm7Qc
-Y5y860pQgTDML5hS+cRivjbzJuSEecTq7MDOYJ/O0zytF0j5Phyt7Q3tgZBf27Ef
-tZHVX5NwAlm1pu/SW90WF8fCGJQ1mX85PL0H+c7zzn9P17SuASPdYFRrKL9+xipG
-YPLQ1otxwn9h7mdWaJEgOy4ZvOSetAQchVoG5ibrjopFkA41iuicLPRr48sACG7k
-LhfpIp9Vy3+9PYz4ufHQ59j+0FTm+Tkej1pS+c2TnJdvPCiDmYWrly0mxPRM3EEJ
-rDmS7t7ekqdsIUdnHwT8SFZ3wsQweSmfgf7Atj+rGaHH0Y230DkbSfJ1e/PvAPyG
-dn1eF9GhdI73ShpnDykE
-=QFHr
+iQIcBAEBCAAGBQJT5ng3AAoJEC7dUkA7aK9HLKIP/Rr54C9aoMjn1F5XbagyM8Sd
+menaPc9BVjf4XBAutp1MSkI4x/Qx3cwpSTJ1mNjmFOVbTp4qr64JUwK/GwTpidzD
+fwVJb37+RDO3DzEGSzDvOiXk3BDRRLIuDVfBGsKZ+horyiKUHPYcpubtOKbEV3ys
+BSyGryqdn7ImPFStM0HGyVNOorH84PfqxcK8TJAiTPrUDvXW02FT5N1NuyprGPr1
+IQKvjRoIh6N+MFH6k2oAsvsrT/MqLADHKlF+ChDHqmOYXBY8QpUyA9Wg66GYLUFX
+OxKlShmyNJdL+DjoyQEoD+0Mv4U6bn3h6dF/lW3WBVuLaKQYm38/rUqbHH+Xk8mB
+0Gam+BsC86IkSmSbqCgvcUD9/RR+irAROoj69tmpwp8mNndOfts7cSohTbkBghzK
+xWA5ZoTDpydilQL9kIVYUg090rpXlY9aevl5UVB2TKZ99mYdFjCLsei4uAAEiMtV
+9Ec71Cm8//OL6MyBNt5WhReZyykE0HvBOPI0MiNf4/ozx29eXLIhq1OI4QL+GKHS
+pohHEDk1XLbnd0giWvMOMkLHwTGUTyXTEmkyWLnMCSl0b4wAZl59FdihK99ruY1l
+F6fLvoLHwnei2T2WC8tYLihZbhvnewdOPTGK8V3cVQblbT+kSEJcIK0C0WbhGSVs
+ZTVki9NEVfkz7hv682Fs
+=Nkix
 -----END PGP SIGNATURE-----
diff --git a/sec-policy/selinux-dante/selinux-dante-2.20140311-r5.ebuild b/sec-policy/selinux-dante/selinux-dante-2.20140311-r5.ebuild
new file mode 100644
index 000000000000..fdc94730be84
--- /dev/null
+++ b/sec-policy/selinux-dante/selinux-dante-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-dante/selinux-dante-2.20140311-r5.ebuild,v 1.1 2014/08/09 19:34:13 swift Exp $
+EAPI="5"
+
+IUSE=""
+MODS="dante"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for dante"
+
+KEYWORDS="~amd64 ~x86"
diff --git a/sec-policy/selinux-dbadm/ChangeLog b/sec-policy/selinux-dbadm/ChangeLog
index 271dd22da552..9229973962dc 100644
--- a/sec-policy/selinux-dbadm/ChangeLog
+++ b/sec-policy/selinux-dbadm/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sec-policy/selinux-dbadm
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-dbadm/ChangeLog,v 1.27 2014/08/08 18:50:04 swift Exp $
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-dbadm/ChangeLog,v 1.28 2014/08/09 19:34:06 swift Exp $
+
+*selinux-dbadm-2.20140311-r5 (09 Aug 2014)
+
+  09 Aug 2014; Sven Vermeulen <swift@gentoo.org>
+  +selinux-dbadm-2.20140311-r5.ebuild:
+  Bump towards r5 (fixes duplicate context for hiawatha)
 
   08 Aug 2014; Sven Vermeulen <swift@gentoo.org> selinux-dbadm-9999.ebuild:
   Make 9999 ebuilds EAPI=5 and transform to make master for version bumps
diff --git a/sec-policy/selinux-dbadm/Manifest b/sec-policy/selinux-dbadm/Manifest
index a217a9f6e562..101d43e0ae21 100644
--- a/sec-policy/selinux-dbadm/Manifest
+++ b/sec-policy/selinux-dbadm/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-dbadm-2.20140311-r1.ebuild 383 SHA256 1df354f2fb161647b17698afc024f9504c6c83769dc1879978914cefadc7c464 SHA512 8872da9ea5f648155526a4c71c1205263f893b8902f24ea21ac7a734f07e90970aedb05925825c95bf156f79800b14457dc9f2ecf4d76603938077d227c95689 WHIRLPOOL 946725730214cfde5e78ba708bc65f745b14eb2fcb1572010dc282cd9960c6705d0055ea7d31a2ddfb72ac9308a1986dc1e4f8e06881cde04a774944f2ea12af
 EBUILD selinux-dbadm-2.20140311-r2.ebuild 383 SHA256 82733b1b4b07db13415257d1fd49bf2d38410e21d6fb1ba46fe35e7333ae06e4 SHA512 a7f00b0d1182a0104cad8b9d5f03a2921ad8491e24faf1112c7dd3a1d9dd1aed7d7056758372a9411eb178ef50e39cd3753fd82c607b6160f313397c843f83a2 WHIRLPOOL ae24d397c722a84aac3919cdf984d6f97d5f1f880debe9b4fcbee77c824080b54e99a253016c12268ee486bd9b42ee9209106d14ac5a8989ae89a64c3da29343
 EBUILD selinux-dbadm-2.20140311-r3.ebuild 383 SHA256 db23c4c7bfbb69097e5de0c3b52f74323e3b8851f672981f61ad0da57c512376 SHA512 d72c2bc3903c5e326cca16eadf414a0ff01dc5e4006f6699e0a9fb7b9e3bf7a59dd30a2e983b9537c0c4afecb4737e47d67e512525e649a59229ef8e03dd38ae WHIRLPOOL db117ab4c7ec4a1932daee2d5d6a1b26d8a3d67f85f2ba518caaaaed67408b4bc6d4b12fe906afd988974b0aab0da6f4d69a4ec433b9fa0180f1c9abb2a3acaa
 EBUILD selinux-dbadm-2.20140311-r4.ebuild 385 SHA256 55874d0344c29f013e6266423e5cad540d8e5563393635dcf8547eb01f84ff43 SHA512 fadcc679af8638e340a88139e5c310362465866dd72ec6557243287f037b70dc45915763b4c8632de0d0a3fa47902b46b3561b73d6119f339bc9f59a72d773f5 WHIRLPOOL 00a4d2582c9a90ae97da70247eeaee07952549b580626dae7962511916ea7aa7c11f5934ed9fce39b7ac1d51eabbafaf5d6d3f2643113ac4539729d570d6f026
+EBUILD selinux-dbadm-2.20140311-r5.ebuild 361 SHA256 4aa75687be0efe99bf05090973c28edd83afd9f10d578bb1c8419c0ec4e89e5d SHA512 0a3cc139baf2f1c308c20e1b24682ea807c33ea7d548fff486696cf8898c46ea777749bad72f1dfd8c5eec5654dcdfc58132e0bd69ffee4387dcfeec8dc36771 WHIRLPOOL 16f809cc3cc927de4468ed74a5926bae4ec5d035b792b41a4e080cb40efaf0aeefecdaa6251a0e00babbab6747d4d28c35320e71a942f6bef15f9a689d951a5d
 EBUILD selinux-dbadm-9999.ebuild 341 SHA256 502eaa5334f11655b4762e17da5a043fda4e25841d73aadb8cc51b2ed10d97ef SHA512 75f692d354e5eba991049463ae2770bce4a47810e53fcfc7b566808e16cfa307b864f8efea34220eab2c7738cffab86e844f9939743c021f9536b064b37af227 WHIRLPOOL b351e9beb77ff8ffe278a9383aa6a9a6c6ce297b29791239679df977c49347f88f8bdfb16b5551ab121c004715636200209b0d8db25318519c4a144a7d5b5c04
-MISC ChangeLog 4332 SHA256 646dadb8eacfde6c43b5b433909cd5d5d209b90dc312f1d66d27f5cc621fff72 SHA512 0b7d8e084f5785932f672a0c24576009fe6fd0a6713201c33c47f713df527cebdc2c16934564861a38e559783e01a0412b8e455e8a65cdf946ba55bab26fa70a WHIRLPOOL dbdd093b31c78b6328f12e1958969a0903105a6bfde051924b26b63036905d1156b5d193fcbee611c3f48fdc38c162c2f55a25443d8f774582cc4ddf4e712550
+MISC ChangeLog 4522 SHA256 ebae48ba2629500a16d9fbc2d52f6a456a7f1be2e1dc2336a17ad61c3154d2a3 SHA512 7d39637fa5b259580cac1a9a20f34e0245cadd98955838b4ccd2a74dc8fb0824e02381cf1ecedae80719499bc46d3d5ee8d95141a03a68677f8bfb7fc049a830 WHIRLPOOL 664b7fb7d3af29b82664dbb0551024be0f5b5df2b820917ce841ba2c697904eef84e833e443ce8a37f0027078417b873718b0b79e415afcf00149edfa607238b
 MISC metadata.xml 229 SHA256 d8734cc58a29b2e534a4e0584037cb303a75a5cfc1cfa6cd5b00eb03f5d9e240 SHA512 f83d55c3c7dd4686eddfddc63d15ea80d9cc71d0ac86e1efbee8be7ff2f677e09271e33fc7db4a147ad6391a3a28016e2b9c46c41fbd880bfd1cd78a9e752bd5 WHIRLPOOL 8a5be39c3721ac4d28354963b5c7680c26eca2bfdb29e65b76c352f83c97b58d199aa9792032b12d2de3446da5af85b85275c68601fc117a6b97ab09b56a6894
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0
 
-iQIcBAEBCAAGBQJT5RxmAAoJEC7dUkA7aK9HGs4P/R3cp5vzLWdhSPwJ6wsGk95S
-HH4UWreerk8XfDM3ltbmFXIqvTxvM3FKupMSiBbzXmXvZgU3vdcaJRoOGV1vtoRh
-KTWtoBl4qLDLvvsbsBHRgdbaFmqVKoTm/ouBY6X0vOzkfn2Ka6vjmbMdcuFBFs2e
-4PecAkh/vrAT6spMtcgpnwKpaM8/gCfmf/T/pcWqIYqDstVMnnNpfTA1wAhJQcjA
-VTeKp9nMtqqXVNvdwRdJSMdpVFKicaHep/uE4xWNGHPKyQRcW94Mo6UqBX7HbzXg
-1GWPxc793xa1qLkBbDbuHr4nq7IhEHNzs+Q40c8ZWWX6GEeyuKUVCHuJdnsAoZAo
-pWLyUAdHWyqRvFasw/tjr3XSqbqzQqxA/Ooj1g1+UBgKryu9XAn+mXKAamhQdWLQ
-n4bAkq01KLhD17UE53Tl6Bw8phZkrrxd+NzVUkNCbMV0Y61HRSdz6Xp/lqMfyYAx
-r/nb994OS7HIbCFjZ68LIcQNVpDTTmWseagxT9EYnfZ5TiO5Gcmo/A/+V+zYbDBH
-2ftmeMhzoruRVr6S1TMuEAMwPLSngu7phLfzvoE2H8LmdjXxMr+RSOAI+7PO7d9G
-CKjzSQ693KEXviXo6FGDZMk97b+vvCAwJHWEwFeHcVUV2rmW/KTqRKgQgNpJGiH4
-xhMD+UTpXb79+QxISyTr
-=3Lqz
+iQIcBAEBCAAGBQJT5ng4AAoJEC7dUkA7aK9HK3oP/3B8qAqV31e4P8/7Wt31MRm6
+t/ItbJK2xx1StFrV7NNoMqbdvTA73AbiHC5tyUk7VBN/YthAzmI1s07abcT12AwG
+hFYvYcHgBfoaNt7pzGfxRmrB+jajzO5BkwKd1iSG+/u8reKhGXYwEhbFhC6zWcUh
+W+1jmI7vRVv53QJsBJfM2YtsnSPr7CdeF/r9vrggVTdxwMoCuQsovwYBjiOdVIWg
+z0M0SY2PVojV9GD001CEMf4gIHkrQP20k4YVP98RP/WEw3pThNJQkpIx6LmfnjLx
+toYzrnVGo/WmQ4/BRt/ElMF6XRfko736Sq/OpUjledVXIkQHxcRvnwbT2FqICuSr
+PsaQrTCUm3jRLWQZxgSvn7veNhTeagBNhbsDnlklWObTo65BqEumnaD0K2AZ7hdA
+U+8ovvvm5JBHZrEG9RkeQYnENuPOs5v+IbFjFyEuWB71h2JbCSCQ/5n305rZ6DDE
+Jefvojvlm5XBjVUuBnIeIW2BJIsUL9H3a5v7DDZURUNdWh2TQPqM2m5RHc7pSiTB
+r74ohi4BOGhh2CKpPNYz+RBfbOaGfo7fSBtvMyVOmvJQiENYWr518Ij2SMS5bdDr
+QdBwe6idI6qjd9ZJFWTTvGQwm8lIFlby6PvFUzJM3aXLEPZwTzI4GZDY+f82L/Nj
+G1YiQqw6LLPtOlKWCxv8
+=RvQY
 -----END PGP SIGNATURE-----
diff --git a/sec-policy/selinux-dbadm/selinux-dbadm-2.20140311-r5.ebuild b/sec-policy/selinux-dbadm/selinux-dbadm-2.20140311-r5.ebuild
new file mode 100644
index 000000000000..0fbfdfbf8307
--- /dev/null
+++ b/sec-policy/selinux-dbadm/selinux-dbadm-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-dbadm/selinux-dbadm-2.20140311-r5.ebuild,v 1.1 2014/08/09 19:34:06 swift Exp $
+EAPI="5"
+
+IUSE=""
+MODS="dbadm"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for dbadm"
+
+KEYWORDS="~amd64 ~x86"
diff --git a/sec-policy/selinux-dbskk/ChangeLog b/sec-policy/selinux-dbskk/ChangeLog
index 1747551eba2c..b558edba5da0 100644
--- a/sec-policy/selinux-dbskk/ChangeLog
+++ b/sec-policy/selinux-dbskk/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sec-policy/selinux-dbskk
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-dbskk/ChangeLog,v 1.43 2014/08/08 18:49:50 swift Exp $
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-dbskk/ChangeLog,v 1.44 2014/08/09 19:34:27 swift Exp $
+
+*selinux-dbskk-2.20140311-r5 (09 Aug 2014)
+
+  09 Aug 2014; Sven Vermeulen <swift@gentoo.org>
+  +selinux-dbskk-2.20140311-r5.ebuild:
+  Bump towards r5 (fixes duplicate context for hiawatha)
 
   08 Aug 2014; Sven Vermeulen <swift@gentoo.org> selinux-dbskk-9999.ebuild:
   Make 9999 ebuilds EAPI=5 and transform to make master for version bumps
diff --git a/sec-policy/selinux-dbskk/Manifest b/sec-policy/selinux-dbskk/Manifest
index 61dbcf167ce2..358df060c344 100644
--- a/sec-policy/selinux-dbskk/Manifest
+++ b/sec-policy/selinux-dbskk/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-dbskk-2.20140311-r1.ebuild 449 SHA256 ccde97c7917d254aa0dc0638f901ee8d39d27f473c76e5c1db2ba609b3ba42fb SHA512 86e5c43723ff85b316abe00e47cbfd63d8a7c9864d3fcd7808271e734442acaac22463ff3c4d1a01ae2b6b412508e32507a9169a08666d7253d94296cdcbc03c WHIRLPOOL 35e9c34552d038ecc035aa291a5a21ce78b8b107f2d389e459171bf01ce0aff6144c8187f25890574560356acb989fec260d079c804f021a28f57dd2a22f98c6
 EBUILD selinux-dbskk-2.20140311-r2.ebuild 449 SHA256 8765c505caf2d9adfde3900610de0c9ee0d833ef016df58e95f72e8963200be4 SHA512 93c8f329df731d31f1088faf068c3dfb05dc6554fe63c952a68502017c9c072ca229644dcde2dcd3f2e0e726da2b124459443c900333ee718e2d97455b35bdf4 WHIRLPOOL 2bcc897cf52ae91b90ec2d8a159520a53fbb64b11fae68aaabe564695d6e174769ba100da1075ed601401b6b57abc287a34fff0c180bd3cd92fa96fdfa88a815
 EBUILD selinux-dbskk-2.20140311-r3.ebuild 449 SHA256 08e7286008d5d416bef5eef1c4486e07b61bd88152efc50d16cb210d7f9786ca SHA512 a5beff455a9edd58eadd80c3952f089205ae14955956c3cdd0a4adc9c247eff6e1db731da3b9302c35ef777dc4e3bc5d8639c5451be7bae32ee2912da9750b22 WHIRLPOOL f39f221d8fb994e73fc2c8c5fdc61ba5e64a5118868fcd4b073a04e28ae3d58b2b9c83ad005f0a20a3465cd71bef459f3846e8ffae87c70d06adaf8a2b1b6b0f
 EBUILD selinux-dbskk-2.20140311-r4.ebuild 451 SHA256 c266fb81038853301fb6da6a944024beb1ccc2ccb2a5b1b5ea0b9875b2c3faf7 SHA512 8f8bdd1928214e6307e3ff0e9028c6873e190f4d324197645b29705b1785b34aad44f194b0d03f9f72b00f9e8f7d2e4504d0453c2e9fe512ffba39438708bd99 WHIRLPOOL a39a68b86662bd1b6087bf984a5352f9d341bd08dbfb22a92437ebf0db60da3c32af41582a8af7cbfddfb97987d569dea90cd25d894e1178d3c6866c10f30db5
+EBUILD selinux-dbskk-2.20140311-r5.ebuild 427 SHA256 d364a98c3e5078545c7c75e7bc28155f5531cb7546ea7e3fc6b6f3668e810e8b SHA512 7ebf539d8c46371dcd02dfd004342784b22969eb0e6a5fe48fb9dde988d09932902082c6bcd84fae3b10e71877c07ca769867d96c597a47c874aa03bfcc11cfa WHIRLPOOL 497ed2b0d14bcad25ea3871bcb4424255a6e9d82d0bae81c0c3864e29da63ad6aaa536efbed7a34e400b035ab55960628dfd0c632092e3610fb65b178b1a2f10
 EBUILD selinux-dbskk-9999.ebuild 407 SHA256 cdd39b9ca7c138f688773e6e651c44476b448a1ee6af5adfcb89c29983dc13ee SHA512 2aabb442871fcf2e01eff2218da4a9995f58f6a025fbdc30654bd623782f07edbfdb92803a68eaade4294d51d80db1f8fd88165c96c219b625a60e4565008621 WHIRLPOOL 27052eb07188832fe14b8029c74d3f3e272bb871f0e13676c282ede62e3e7035dbf83e8d66ae3e042f54d193352ec0089f23b90725ab464d1fcf7e7607d21fff
-MISC ChangeLog 6577 SHA256 7adbe5e4f4fd9c32c198b2dcd466f3b0cca73aedd42151a238511a10a9825a83 SHA512 c6ae988f782c97f544afae72270f11ddeacc60e2b24a5b10b915fc2e2cc5412dc544302c21d136ce817f347241288404af6759120f53deb28a03c6df7348ee37 WHIRLPOOL f957e013c0ee316b9fd2cb693119ce0ced597cc2da7d5d5a965508d0b51cd8c5be5af5454b295cd731f2182b25feb8fb9b5cd6b28a7c41513a16f297ccfd1bce
+MISC ChangeLog 6767 SHA256 cd3fde45a3a5ab21720c9f86acaf1c47a75b856940e4bab5bed06c0f7839a039 SHA512 fbe882dfc414a3482dedb078d602bc0f8c5ad2ff369212c2d0d5c873b6831dd132f539e2b42c1d53c20adb1eb9d141db1f9eec62c6c94f429fca3c1e795421a6 WHIRLPOOL 5d4736e15d34570858ac373292d16c579c3d5682cfc52f8dce908bcfd257d6222e7606d39eae1d08a013a1bcd3f5d81c30d2397526c92c9e037006e5c3d74c00
 MISC metadata.xml 229 SHA256 532023bb1f89c526878faa65e0e98d60c8f1b5387fd0bb600d7d0fc209b33f96 SHA512 f1f10d701aae2671a443a58d6b57ba709f5abed3455b0c340a421beddc7503c954d507a304bc7045c724a55f8c0d5d36689f74efb271ec2d4f79a695a45498db WHIRLPOOL 3decb47dae47989187917499b7833334e37a8e4faae1963484e5f3bc520bd39c3afb8210cea92fd5679285cd08795155255670df507d63aff71c66def5a605c6
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0
 
-iQIcBAEBCAAGBQJT5RxmAAoJEC7dUkA7aK9HqrgP/2WyWu0OycVsJrxHvu55pirn
-jrhgIKegd6l3/6c+VrruLJD1aQ19GLGkn9nVVhOb3qq+U4M3DpJSQLHNWemqdj6F
-Yx0iSJMIO9WauwZ7HNo/MbNwmU679Dq8ju0J8X7w8VKoxfIn6WBVtMVMSwDTZOcX
-SNLLWbXem8p+M3jutBu8Y0tvPDWHwA/lsAbLncljBvwDWYQRPZv8GBENIzd4Rpx2
-cm8tvYD8zU3uRRK2G94v3FPsUddvEiMJNRO+3m8rrY7YMcQfGOmt/mtKvVUXaHLX
-VylOjQRNUYayZZ+/5dWLRLPyrWhVAfK0hjOdFO35l4gxeajOvUEjBQlktcA7tezE
-QZaUZiRKtlBLZ2fJIrW9u5TOMqQW8MK4QR/zNjiKK6em26fy37os2so39Uav4Pp0
-HLAtcZBeKc4vcpVTOKlYQIUFwaZtkOpdwSfO1VhMaNc5rtdruJbCdA4jBVtVpRS0
-1CydVX2aeIgrH2zN9jgP6SnnhBXjJ0ZCMe201B4TK+R+qG0dyTMbMXDFmy4iqwYn
-7QvIMWWScnrSoBVcjd8ktjuhjSyWsaH8t+VAm9tCWVa+vFa4Aa7OsOkSW8AvOP1X
-bPRMDcbFPwN4yzH5zxz1V5H/OaqFKi1zAm1/bpq0G0w8lm7BInPrQ+Xn3QsaY5Sw
-iHKay4vjm+kuYqJ4P1uu
-=rG27
+iQIcBAEBCAAGBQJT5ng4AAoJEC7dUkA7aK9HJrIP+gIn4ppWQbKq0mlSNc+yZkvB
+W0CfLG3wRPwBecUwOQ09gOYu478UcC+61nGpL8ryzAUjE5xSAy9FjevFldUgexTR
+x5RFWoFHU7duINch+8H43ndKz4x3aAjk2r7uvjNQ9+aVrOsvlW0PCABuya1FSa3Z
+8fexk9LRjJz7EcExvswO3ELHX+hNzwOeEdvOF1icHfjqAt2MPl/ozKfIH1IraNu3
+BaHe2uq5j4b0avQ2zpptBU6MWXTzQtMxHWrpGgueaguj+4NhkZgo8hYv1vQginTs
+aOxazIv/ttO3H1zC26KaAcvBGOYHorMuUlqGYua/5aHBb606trDQeRWzoQKIn3UJ
+gAw148meioouTZ9GUWyN1kgtwoX2byHDV1DfKXvty1PokjNXQZFsqQstlJoCPPaN
+DUal/M320HjDyt70L6oCwdmKoAWJtrzCWIrP5EzvVx6kDlmt6Mcw4vGXYaEMMEK7
+5t7pFf/LgXeMUIWMAiuKUT1aneKAxxNbn4zQcagwQuEEcOewc/wwk2ZDIX4EjfV7
+Hndj3PuU58PjX30dCP+4XUjcYOSwtSjgPkqR844TW7a+r0r9s03IQjUhuD0oiBN0
+PO+6bHSPX80/NsitSp2m5GKP2ugOfe3g0DXeww/4F8Ah7Cm/k0Xg5xRU71yhk6RB
+1XGV27BYF76TXn3ofzZ3
+=B6Ry
 -----END PGP SIGNATURE-----
diff --git a/sec-policy/selinux-dbskk/selinux-dbskk-2.20140311-r5.ebuild b/sec-policy/selinux-dbskk/selinux-dbskk-2.20140311-r5.ebuild
new file mode 100644
index 000000000000..aca9f7ffe2f8
--- /dev/null
+++ b/sec-policy/selinux-dbskk/selinux-dbskk-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-dbskk/selinux-dbskk-2.20140311-r5.ebuild,v 1.1 2014/08/09 19:34:27 swift Exp $
+EAPI="5"
+
+IUSE=""
+MODS="dbskk"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for dbskk"
+
+KEYWORDS="~amd64 ~x86"
+DEPEND="${DEPEND}
+	sec-policy/selinux-inetd
+"
+RDEPEND="${DEPEND}"
diff --git a/sec-policy/selinux-dbus/ChangeLog b/sec-policy/selinux-dbus/ChangeLog
index 915ce5bd232e..31cd4ae29bb1 100644
--- a/sec-policy/selinux-dbus/ChangeLog
+++ b/sec-policy/selinux-dbus/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sec-policy/selinux-dbus
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-dbus/ChangeLog,v 1.59 2014/08/08 18:50:06 swift Exp $
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-dbus/ChangeLog,v 1.60 2014/08/09 19:34:23 swift Exp $
+
+*selinux-dbus-2.20140311-r5 (09 Aug 2014)
+
+  09 Aug 2014; Sven Vermeulen <swift@gentoo.org>
+  +selinux-dbus-2.20140311-r5.ebuild:
+  Bump towards r5 (fixes duplicate context for hiawatha)
 
   08 Aug 2014; Sven Vermeulen <swift@gentoo.org> selinux-dbus-9999.ebuild:
   Make 9999 ebuilds EAPI=5 and transform to make master for version bumps
diff --git a/sec-policy/selinux-dbus/Manifest b/sec-policy/selinux-dbus/Manifest
index fe26d93dd1f9..f3bbc76aa02f 100644
--- a/sec-policy/selinux-dbus/Manifest
+++ b/sec-policy/selinux-dbus/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-dbus-2.20140311-r1.ebuild 379 SHA256 ca82dda85ee42902c19a571a9505a63a0022b3d267f2907e7cb52e26bb822531 SHA512 990a33f1f26654de361c06fed6d39fe0def67cd6415da8862ecac54ac479e38f434baf8a162e5f8e5d313c93389c29538f408b71ab418bd4c27865fdf239ad4e WHIRLPOOL c44644ba88ee49d09c1633fd1e63bc886f03a00ec1da38c8546b52542928e64fcfccce7d3c80b01dd0a0eb0308a4e5e1d7641e454567946ebdb78351aa0c8cec
 EBUILD selinux-dbus-2.20140311-r2.ebuild 379 SHA256 cde20bc17acce2f581326642ed01e977ecf68844237cef12a2ccfa622d7b267a SHA512 83fca87253b3fb71fed8c3fba0bc168579189948b178b6b6d949bbb715cd61489bc21fe4c4f8a8c0e9e3ada2dcea3d36b3c4deb9a981bf60d2ed6d5fe4d1c3b7 WHIRLPOOL 0dc3e18c67262f6a3708c855f0050f1cff7343a1a49356637ebe566b6f6e020b4c21523694e27d23f497593940f7db70df9362cc8fd284132c1a09230c242688
 EBUILD selinux-dbus-2.20140311-r3.ebuild 379 SHA256 0af654a1321f3173ef5458a88e2be59075e9c80233ca3dbb6e9a282079d967d6 SHA512 de8d66938733b7eaca8d0f370d1a708d960a41783f8fc6ea1263ddd1aca92ea0e5510a3d831e04a0bbd1f650c8b0ec1907a56ea464fb2dc255cc0910459e72d2 WHIRLPOOL 4856c8322aa94c812a1486db635521238ceb0cd8dba0f05a83823fcabaddfc1bf42e4dad516436379441daf5b510d2438cfdda804a71cb881d9e23e14587acd3
 EBUILD selinux-dbus-2.20140311-r4.ebuild 381 SHA256 c3afe49c05cc5482f2012839d5d76e63702907ccb2a53f9201de6e412411d072 SHA512 975db2456f3cb42b56a709805b0b9d78376d0ec56e73e34e1b22a0d550fcd4576db43e669e3822124f20502d2a3088d7a7529dfd93199eaaf6b1d11e2461b7a1 WHIRLPOOL 2bfa97217550a0d62ff3b2420fc113de99fe48cb815762dc0fe7a15a6f11a383d6afa0b5aab24e214bb0f51b329df26ce3d38600491e2da95528799290bf9799
+EBUILD selinux-dbus-2.20140311-r5.ebuild 357 SHA256 f8c7e95e95abec5ed9c690967b467d715d1bc789b1fea91adb5afebe6ee16181 SHA512 e5c42f5751ec90bd49259203f384c0359a69c7f8d27431d32ac7b64715da4a87911f4fc609cd405efbbe0e2f909cdf13171f5d742c8419f20cfea942033863a8 WHIRLPOOL c1cd67430afb6f16656ea140f74e014969c31067a4ca205ef09a844a3741542e48645887b95f2ddd4c2560dbded1eb28df308926950ac65ab2cdde25e338dfdf
 EBUILD selinux-dbus-9999.ebuild 337 SHA256 132c7cb4354ca1a0d07f4d219f166a2dc5d16a80187434c27a648d5304569869 SHA512 56c134718696a08f056dcdf3e2896d550317f3bc4809ea1da12447918c3a7309fd9391aed29df44996114626b5f23e2152059a8945d44e9888175e7460cdc714 WHIRLPOOL 9ba66a4b7f360734e7b45dbab39c59711a8f0e643e659c394369764097489db85c3627598261550c7e9ca607568641157893896c015d6f985aea8ee27e1623f1
-MISC ChangeLog 9001 SHA256 a158f177ee119e21be3bb61f39a72ce9b94f6d961b69db3fd67e054115c4b186 SHA512 b3ff2b037c6e37d64108504f3651dd5d9f0956168da7b280e07d8a0ca65724d5a2fd7e97949e0e712c0d0288046e6f67b06cf402a7e0410b4902dc1549b5b258 WHIRLPOOL e55e2f008facdf22989b334c38a9514c7e09a818a80011552e86c212bbcb63e446a9967c202704e80bef8cc9b59c3924435609dcdef5d0e6ace53861359be62b
+MISC ChangeLog 9189 SHA256 733c2c861ff2860c6fed620f2c846bc27771dd42c890962524339395f74ae49e SHA512 6ffc216a70d05f228c85614bbadd2111abd99a9149917484e348946edf068165d6f99982527855f969accd6d403066ac5758d1f6e029f9b572795775cc4a1749 WHIRLPOOL c9843f55fbc8bbbd12dea0a2b48f50551053218e375d3ed2a2d94708f9378f3ea1167298638304974ede8787c027b5decad9bf54d617d0c6073f69fe9a6adf4b
 MISC metadata.xml 228 SHA256 ab350343fd6b86306249ac67c97abc7029657fc0352af4746a37aefa5af17fa5 SHA512 0fb0af52574863afee96e2ad77514aff16621d07bf6954d0398b127aaa42bcbcf964a13a094c080337e6f82dab8e3a70cbf1cb05cf397576756322fa1ec0792e WHIRLPOOL b4f0fe4ca15f341e0600008297f7f98b45d1427bae79598dd185011e4ae13f9c4bc63b61b1bd48ba1aef1ce7af1b460170fe46b0919572333a5e329c51529d5c
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0
 
-iQIcBAEBCAAGBQJT5RxmAAoJEC7dUkA7aK9HSSgP/3XhBn/qj9X+SQRerPOYxeUv
-Hja0K929gqIpoLi+sby+S+1J3i2XZVahyJthjUk2KAe+5uIFI9UpfWaLYqAoHw42
-ChdeZxWBmePVUJVOet/XtIlBYaU1iQ4zqB3NPdbi0/g41FjXMiIPNOQwvuDHJU9s
-bw7TIsZgh2firqE4ZRw1ENHc7a7o2DOP9ENPUGxWfa58qjsHcKntmICCQh4Gf3ZA
-eR3zNkFTw9Nuy1OlCDPUJC7rg62tik0Win1Aekba/sgCFE5BQvdMLeB94BJtnuqz
-bITh3RLvd4nz23u/DQK4jjBjjjJhNC78Krs/Gvrf1jiEIx475Ki7SFR6imU/9UMp
-8fTptHdkV5M4lEnC4Mt4yzHUl9ckjlly57qhXDB7/P4QCdvqfVcQVrBGSYBKecLZ
-PR0raX4oBpRs8Jf05jTzT3TV4HoQTFmaFAq0Gub6g+MCWr8nETq7T3gzh+HFZDjj
-662pAqtrYn7dq9vuyyCGVDDGACJ7vGTHAbDeMsYSfTm/yvUuyujSOG1VbE1aNoN3
-Et8NnpeJN0OcdMSGT3SSuRgAH/QLIOff2ArnF24bqIym8IybQJFAcXTQ3YqlaIjr
-jVpTImG3BQyphWL8+p6CSDRskY1uoXXBbVYtGn5W8wgQ/5vzgKdx4APCU2J9NXqR
-rL8lbi6MCTmarBPyo7DT
-=RLP/
+iQIcBAEBCAAGBQJT5ng4AAoJEC7dUkA7aK9HIqMP/3AvT+TMLkfzTYNlOUHpdU29
+CbnkOLMXuKV545R9avG2Fiu1IRXMrrL2W53W2tRbkPi51GOr6gubh8fChXRtFUBX
+jrUJHAFUGx1nzYcijrWpKBnowQvFAJBGv9CoahFYtGD6ap0mjjXvPqEULK99Wcsl
+hELK4b/3uyJzClgZDTAYWfIpmlfvw+9fW8XF+9nyGwO+OWPha+cLx/CuFFBBxE2h
+iKIqP7Tj2q3k9oLaIGTdEACQPlV6Q8ohCKF76A+oBAtY/0XzcwGI/s2Pla5Gb6Ig
+KW7sHpiEkBaZRNdqP3fenHsvP57rRJV9twKU4doPcR3aMzspXOX6mGFIa/+tAuk4
+lxDWY2YTzmsrCR3pKxj1RL56LOhoQSargEgKaVqYfnvYRT3e79kln5daUDuUfe9Q
+dNbstK9gv7ulKbRZUr17svAbrMSLmWSRD6qEkgifUeLafvDmHv07Q33NH+E+2ZXK
+QLWfIgbfk2kh+h+lUa60goIvdUArQEnOL0nQfFzabdSVxllmC7MuKUwDUVFbpzZK
+Y97973pSl0Jlqvng5SMOx+R8WgRzRi8Rw8kEkmzycX/njh2zrbvo25j9T/MYhHMX
+hXssDzOepg3m8s0WzaOv7cDppmBwXiBfDZn3Xda0H2EIGZpG6zr80Gq9NElPFYXA
+6aiWTYerCvnWoEkXNnYP
+=+ut1
 -----END PGP SIGNATURE-----
diff --git a/sec-policy/selinux-dbus/selinux-dbus-2.20140311-r5.ebuild b/sec-policy/selinux-dbus/selinux-dbus-2.20140311-r5.ebuild
new file mode 100644
index 000000000000..83f1d74c1cf3
--- /dev/null
+++ b/sec-policy/selinux-dbus/selinux-dbus-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-dbus/selinux-dbus-2.20140311-r5.ebuild,v 1.1 2014/08/09 19:34:23 swift Exp $
+EAPI="5"
+
+IUSE=""
+MODS="dbus"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for dbus"
+
+KEYWORDS="~amd64 ~x86"
diff --git a/sec-policy/selinux-dcc/ChangeLog b/sec-policy/selinux-dcc/ChangeLog
index e76f4c0d32fc..d0201e1c6f43 100644
--- a/sec-policy/selinux-dcc/ChangeLog
+++ b/sec-policy/selinux-dcc/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sec-policy/selinux-dcc
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-dcc/ChangeLog,v 1.42 2014/08/08 18:49:22 swift Exp $
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-dcc/ChangeLog,v 1.43 2014/08/09 19:34:05 swift Exp $
+
+*selinux-dcc-2.20140311-r5 (09 Aug 2014)
+
+  09 Aug 2014; Sven Vermeulen <swift@gentoo.org>
+  +selinux-dcc-2.20140311-r5.ebuild:
+  Bump towards r5 (fixes duplicate context for hiawatha)
 
   08 Aug 2014; Sven Vermeulen <swift@gentoo.org> selinux-dcc-9999.ebuild:
   Make 9999 ebuilds EAPI=5 and transform to make master for version bumps
diff --git a/sec-policy/selinux-dcc/Manifest b/sec-policy/selinux-dcc/Manifest
index 959b03cc1e49..f0a463e8104e 100644
--- a/sec-policy/selinux-dcc/Manifest
+++ b/sec-policy/selinux-dcc/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-dcc-2.20140311-r1.ebuild 375 SHA256 c0e16a8ea1ec89dc8d073af8046fb5c4a9ab985bccae16a40cf98c3cb04a5a96 SHA512 9280ad0ca0a6faad9e36ed99e0e49526c461735787bdfc7d24fd365169cb6ef44056b88e6a64aa13a315689802d0fbb0d98594624f896b5db6e8d08f9bc0c50f WHIRLPOOL 1cd56823f910b79a46c58c84b5b4b44f1579ccbca9b1af81c020ab7a703514ed3902d3b58683dd55f35003743b258234457146eeb9a87a60a11d87a8c47b0da8
 EBUILD selinux-dcc-2.20140311-r2.ebuild 375 SHA256 764b9df177ca2541beffbfc03517df85ff3188e6034dda70acb121162e2b410e SHA512 289cde2e55df1f3f32470052d313badee6013da9fa2d1b07d214657e750a52e381790924d0104d6000a515482aa0b84ed1dede3af7230736da0977f24e24e48a WHIRLPOOL ba7ff3efde7ee1e3696aea34687dee01e30596c61e9ada5056c7745d430c61162c1006678d76ff10d82d365dc64033e88f476d2a0819eaabd697d4beea717b66
 EBUILD selinux-dcc-2.20140311-r3.ebuild 375 SHA256 6234f2ece62c669c40ac94af35f68fa16edc999251b04a436d7b2e816d52cb52 SHA512 16e2c86494dee93ed8615f9098311db9747d1d15ca5353ae3c658475d3053191f4e5234adebf63e06439028b7f5f424a418804fad02e9040b621a35900cb52b1 WHIRLPOOL 3172bd843289749c302c4c37e25e1aba07937e4fab10bf4f4dc730aeba4d44d5a1ed443ca01e26169e9b77bdaffdd497a5cbf654e86958021e60bfc33d233593
 EBUILD selinux-dcc-2.20140311-r4.ebuild 377 SHA256 1f502a1ffece5a8ae6b263db9d4db8bb60fea1de5d1c22c17cd5dc89e8373562 SHA512 5ab438438ad060e5e7cc9658c2e584b54ef6ecf628e23126dcf02d72819c5b28d590fe79a5c2d9ac1017a7035e843824b4d2d7e5773ef09acb05c0c9938d0938 WHIRLPOOL 8eea3ae72b21e51bb8a93d108f5a4e8ae23b9c32b5e9455483df5def86c7e9eff5ab7979e81922af10d71d4c23e15f7d3f79d22a60a51e77f952428655e9a778
+EBUILD selinux-dcc-2.20140311-r5.ebuild 353 SHA256 25f5852d42c11b705839f06190c3c83482aab43156989128c4ddc449ee2e63a4 SHA512 0bd9d2936e1912a81eeab12e16c30a4a43f2e701f24c6e52c433a2ef8a1b00a2aea5874a8d83b698baea3d9da622db4d340e1acdb1d62319893a0ec146d797e2 WHIRLPOOL 35666079905661b3b2263dce97f06cd8737a7be756916c342d2a2b473a051cbe8969f3ee2bbca044835571b4c5490d4fe1665345b48377cb389b2bc5491432af
 EBUILD selinux-dcc-9999.ebuild 333 SHA256 3bb5b74f6bdaa155037aa36d2e062aee643b78f0fed87a87e2958c15bdc1ecd3 SHA512 7fcb2173acd99aa8d32324407288a9326b651ea9ce88d71579b77e4924a11a8587afb8868c633b6f4d74801518eb6f0081836a1bc6f8ce95dac1eb507173b914 WHIRLPOOL bbd4a0a6e2762441b6025ff172b1d905869ab51f68f7708b9f0614535e9f14b172c1c033c8ba3267729ee068e6cb9e8bc76fc1b984dffc1fcd715a7de8d461b9
-MISC ChangeLog 6286 SHA256 440fd5f0eb720d3df7fc4b2868f8f6f0533464bd5817746c1dbc1ebc3d215c00 SHA512 070f264a14eee4480a5c9ec998569f3b985ea57c7c18e8da5c7077e3bbcea23286c5f4437d42470b557477648e25d85144e32c2abc9e7947b3cc81fb6e9b2dcd WHIRLPOOL 219f02370594e657eb01d1109e81e09fd217c33653f559b64997c2aebf19f2d4d1fd8ae93f0411b045009c798ad8703893e7e72ed8efcdf0544c4c7f18adb265
+MISC ChangeLog 6472 SHA256 c0437e7b3ac9a800ea17a518e51a8a2b714f15cd19b27b7ec2555c76fd010690 SHA512 b008bb0d0104813e170eec8e5425efab919cdcbfbaae6e20fd6aad278d730399d292abc163d62bf34923a78b7b4c5d0a9936f98966904b7c4b628ca744eec661 WHIRLPOOL 709a5c3c85aa36930e7ee29206738e589f3d3a3690820e2d5df092a54e94b929f9154ad4ce657ccfaceaa1a6ca85a05a5fb394131c1e07ff6e0d837b80a48718
 MISC metadata.xml 227 SHA256 6fc454ea63a6dc14b4292199246f93b92c08da0d4e4e2d335b7fec2f79f286d2 SHA512 db0c7f06efa5e8ce1919d0c445cfa84d47fffe8d5b4dae75694b9d75097054199feab6cfdd4d8661baabeb1d465a5e43719d3551679d48ab13250f4084bd5549 WHIRLPOOL 1eec5ca5175abbc4f952615e52653a22c36d7166637d9a5dd30aad1043b6529f90fed1c2e87c69cc78309d7091637503c0d62839f558febb8d115be87769ac5a
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0
 
-iQIcBAEBCAAGBQJT5RxnAAoJEC7dUkA7aK9HADMQAJ7BBYja5JCFL3UgKq6s0RoT
-ED8RiGa82NYlaYNa6zlXho7Xr6jvEVv/mjkd8DY61fdI3ZjrN/NJi8JwJLGYmo4Z
-+KFf4F/aVgLSkp2iiEFfvudDGJzaRSpZ9xYfupyWxBmnS5C11TuiJ68XbwIauW0p
-aR9/qmDCoM/kpMzqkUDToxF93MFxocEkTaGOivCBpDFeZgouzp+y55tRvWKg3WtU
-05Wp2RBTrTkIwy1XOW4lZrVH1nZGSvefj3n++JyKFNDrfbPpRJTD868sciPGfSXA
-u7QYlDPFMhmkKUNh7yGdJdGrG/4GKvOluB9JVJR4q8cX78W8b728+c1D+jzHify4
-ztWEXR5drRPlSnW/6ngLlPVHVPxbSBKT2Hl/o8UAmLceEqwMtgHWjxisuM+lPxIV
-WyoIlon173fB81DJCzgva7svs7JBD+AeHmF/h1JtZ56UHDEhxGRiPnHpqQzDs3XX
-TT+XPTn0AtC/Z+QwzfcKxCBvJrT3YuCXwzLgacZBmF9cnnIh5iIC0fTaVyKjGqbA
-VKx7WZc5nKthahr/PGfCUbgQ0372bS/gdEoocftpQgf1HSmf2XWB/YNXNBP9EDqv
-XEyiAinTvllTlFVulJtmptFB7JDaG64i/9bQ+Q/34MpZxfGvv8MbBOfnMKiXSBQO
-JNlYivoKczQuk+wuwdUu
-=Hjcf
+iQIcBAEBCAAGBQJT5ng5AAoJEC7dUkA7aK9H0wkP/0B1xOaf+Mf3KASgFEUjpGUz
+dyBOYHOTfayZtlqRSkmGEExnjfflxTMqn5fJvpkY9tTvxjwYhiPxqFmAgz3YsW/F
+ILiGc6DUcWG0O2L/7GbxcQ8eGdN/1q7HU3RK2YTR2qB1pbpoiUR8kZk7jEhvhSeO
+pYqYPSO4944pm8iw1duZY6Mr6Dl1snK2s6zAN+Vt/+73LLUSEoqT1NQ5OaO8x4zq
+B4Wof2GTzF/negzUi3Z0kM8hQ4UIGn8F8YeCxnHMlgh7cvx5Ge+aXs6m5XtI21pv
+CFE6vHyEoN0+3b3WbbkKYoNA1kzfdsYGevxy62pXgtkX7WpB/xU1SsKzzs7l5WT9
+l0uEeZYriJftjL6c2+4RueHaQ1Pt5GrltQZU/0VuReU80OjBPtFR8cLNOxUT4iKK
+dcrziFDhpguhG6YCu3tFijhofWnUfbKwapVUQ/OtaRwKMvq+sctoyAsXW/45j9Fi
+3MVbz9uCw1gyMgGDLhZM/gWEPoYCknCtgpyltFj+5p3I9iCL3VvgzlQk8+mBynof
+0dtRvbvbsPSFMQIz44Yd/jZT+Nl4fyI1ce2nLnmF2cZOw5JwFSRAwe22u9a35NBR
+63PljeJV1JOvZzYuXDgWz6Jwsw2ddVbDux5dtFalm6BDht73nsW+gPX7X7dlpvPS
+XgYDTe2eAbHAjHfnjCcl
+=tOm/
 -----END PGP SIGNATURE-----
diff --git a/sec-policy/selinux-dcc/selinux-dcc-2.20140311-r5.ebuild b/sec-policy/selinux-dcc/selinux-dcc-2.20140311-r5.ebuild
new file mode 100644
index 000000000000..a6dc51bd079f
--- /dev/null
+++ b/sec-policy/selinux-dcc/selinux-dcc-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-dcc/selinux-dcc-2.20140311-r5.ebuild,v 1.1 2014/08/09 19:34:05 swift Exp $
+EAPI="5"
+
+IUSE=""
+MODS="dcc"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for dcc"
+
+KEYWORDS="~amd64 ~x86"
diff --git a/sec-policy/selinux-ddclient/ChangeLog b/sec-policy/selinux-ddclient/ChangeLog
index 02bc4c32439e..9e9a06ce91d4 100644
--- a/sec-policy/selinux-ddclient/ChangeLog
+++ b/sec-policy/selinux-ddclient/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sec-policy/selinux-ddclient
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-ddclient/ChangeLog,v 1.42 2014/08/08 18:49:57 swift Exp $
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-ddclient/ChangeLog,v 1.43 2014/08/09 19:34:06 swift Exp $
+
+*selinux-ddclient-2.20140311-r5 (09 Aug 2014)
+
+  09 Aug 2014; Sven Vermeulen <swift@gentoo.org>
+  +selinux-ddclient-2.20140311-r5.ebuild:
+  Bump towards r5 (fixes duplicate context for hiawatha)
 
   08 Aug 2014; Sven Vermeulen <swift@gentoo.org> selinux-ddclient-9999.ebuild:
   Make 9999 ebuilds EAPI=5 and transform to make master for version bumps
diff --git a/sec-policy/selinux-ddclient/Manifest b/sec-policy/selinux-ddclient/Manifest
index 2ef8de4fc9e1..b5564de44908 100644
--- a/sec-policy/selinux-ddclient/Manifest
+++ b/sec-policy/selinux-ddclient/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-ddclient-2.20140311-r1.ebuild 395 SHA256 5c868f09dc89e4ed557c9a16f545ce7897157a1e2e261e7d6e82d39b257d37e3 SHA512 3abd494c492b27e68dbc42a2e664c42af163c45988b1d62cbacf96427589107a3693eae7cd95b542b7597cb93427f239c0094a19224366cc46dccbe81139fb40 WHIRLPOOL 0343a24d53825da4b936120c3d190e821948656e20263c403bfa34e5f03bb5398f2e56ea6e6ad9f6aaf59de86c99a6c364b80c98939da40cae7b15b4402265e1
 EBUILD selinux-ddclient-2.20140311-r2.ebuild 395 SHA256 ebd0da2f641d590ec911c01c59a5a7d1406783356ac1332ec1c02a55ebe89b37 SHA512 56d3be2cb840e367043acf888004bf007e05df7de03ef6dc6e17fe8f7344104036703c77e1fef370ba4500cfad18bb7cb67228067309e0a663b54f8b23cf6faa WHIRLPOOL e8adce20011cc17f63a4fab29f3a24a0257c0ce06dc665ec4c54e986435451863503fe2997bae2d844744683fe1e79cab3728bec7a4647c156f9c6d28e2b3f86
 EBUILD selinux-ddclient-2.20140311-r3.ebuild 395 SHA256 3131b3ffe4edd1a1a4ae0f669e34f17ac134d25d7e5b92e0c5ca209415b8ebad SHA512 d7695654f42f0be5a47f70f1174138cdb2c60ee86e58d6a654827a3059cec3736e5eabc6bb1a22cad6626a5558d3f37d9deba2add45eea9aa096be6da14f9c4d WHIRLPOOL 8e5b284cc08f8d46fa19db62489c3930a13548084b7cfd5cd5f5515609c01bc2c9823ebe0280fff34f8223dc22498baa93a1326b5734b7cf96dc2aaa6a62de11
 EBUILD selinux-ddclient-2.20140311-r4.ebuild 397 SHA256 270e290fdd23ce8856b65eb80b15f575c4864a4249fe47f6a1a06e93ef72da57 SHA512 43d5964c09f8fca05c963e022154d4ff7a2a61fe5448fa42250afbc7ffec460a768086bfc83d035e108beb72d4439e3783c8e1ad52ea6c3021388f0761451581 WHIRLPOOL 0012e990be9112d8728ae9a04462860f19a5f137c44f4bf4f25dd60c8654986e0213f389ee85c5713b77991cd6accfe9fd37687d27dd24e082f086c64f9629fa
+EBUILD selinux-ddclient-2.20140311-r5.ebuild 373 SHA256 a50719b9aaea9a7b2021a7289831bdc128c35a6bff6536b3a994f7c70a23709f SHA512 2c3d324768b6ec09f2998468e73421488ff2c45d1a02bb87134f3c3d58f7606a08ecb34d3e04391f9a382e900fe32c774372ba35737be000de55854db0c5ba98 WHIRLPOOL 1838bc6ad886a118ad3794f23a8da151625bb7e64712134e517ab44781412173c5da539ffd04dfcdbc8c6744db0bce1c11316f696e40f91fd13df474aa1a039d
 EBUILD selinux-ddclient-9999.ebuild 353 SHA256 f3dba38962108542cb8799e42ee1f3b5305f3aa32c65d4f898f2dce4b7ad65e7 SHA512 02656006dadad46082bdcbf027d2a906fbd8fb340f08930ff641be43fe1a1ed784032620461e52ff2ec2e510a73f7f02b165e030d73fb4c2d8544378e398df3b WHIRLPOOL 4fe451b53baa58894e0a8031fe69702422cda8801c468b9a0dacf60e532c15379bcdd26add643759f48caa5ee53529ee2ed369f6ae6386e358e371fdc1d2f9f1
-MISC ChangeLog 6671 SHA256 97f83f2d22eceae5176ee5e319760310a94948c060154fb5038925225b9d6319 SHA512 b8f9adddf66d81044060c91c9df1945c1cfc5eb86118af773f337ebab5651a9b4d2ff6255e79517f44fb3fc861d315f4833b99bb08d6191870742201bc1d8887 WHIRLPOOL 9355959b92df9cba6443dfb24e4a2b71d5d984671d5229021b033726dbf1adaf5b219b01970587bca74d30cf35426705f73d4f2ae90d71316d744150617d128e
+MISC ChangeLog 6867 SHA256 fa20fc9d3088252ceaf38c9635e576f36122695e5f788fdecb5057be3b5a72cc SHA512 ae46c4f6014fa4b4b1543653132cfc32d8dda3591051910c2d56e675ad37ee91f7f6d615269b1f1ffb2dbdd9e01bc0051e9f98bbd1bdca8b179f96022a370a55 WHIRLPOOL 5f66657062d0ba09c32a0e6d96fd2110b699287dd8de595b4573be5f21c900055af08eaa11dc5e1e4955ae32194a7e1dd6aa253f19781f4bc8679536f8833b5e
 MISC metadata.xml 232 SHA256 4fb9675f17f75ecfd3896b2bb86050871d80b5923e8a6e1479985a4c78d12c65 SHA512 776609367184ba568cf1b34f30773ffb4bac3f629f11cfce456605817afb03acb8cd5d0d20b4462bc2a520810e3047822930b26ec9dc06d3aa0729e9b68f5840 WHIRLPOOL 546f661715d43934bfa0f87af8e5bcd8c62e4e059fd3f6242bd62308f430cc9f3d26bf775cc0f6c8b0acadc9d013190fc0c34b9733aaedcc1459c676685dde73
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0
 
-iQIcBAEBCAAGBQJT5RxnAAoJEC7dUkA7aK9HoSgQAJ/wfSTodle+equnF9pzC5iI
-/PxPKpQCUtXM0VJw7Te/Jt5UbRryrGuiR6QDQ0eJSYep7LPLBksayxbg53ZXbJH4
-dLg9A2F4FoRCdxqutOlUx+nOOWfa2kqt49CqxscxxIWwYcCeE77BsOGTjIu7TpbT
-4KCWD1qjO54NMDX9CuJL9KHmZXnR8QwSJWB7QeztHmhm8lbiYFYiIAoZhllJze3v
-RPrAv5rEmW7dbHZy3GWdKag8DsJsZFVNfGBfvniTZ7BtSrXma4weoLZz0HfpBtNq
-Wie9yd6Y+kBowWMTL8QzrSSGJxSPCazrmsORoi183aTvFwpx/NA96TKzlW6gIQ2v
-Rt33lNlWQQyyEjh3FaXhbovSHA07Gsj3HK7wFAGnFES04iZr4cdMPGzX9wt/CjK/
-Nue7e7C82WFkTSKxWeUiqh+zT8vI77Gk38m5a4nYk4xxS17HxKLW+Ui/QwllowGA
-Cl5glcXY3Q0Neg9m6k4Nivt2dgfBdxxCcxtfq3kJL5+AVD+ayTQ3CoWayG8zpLs5
-L9RaMihChB9XBDUC6y0KxtoyBI16aQJwAGl4uQnUjl6CrI9JhRJHod3rGEPscIGe
-z6svKUYx9tdJBK1F0GynsIkwrESYF7p1L1wbDNEJwh9f9uIQM+yt9jbk/0lGnwBk
-19a9ypMHtloFNLgHqMpB
-=8pT+
+iQIcBAEBCAAGBQJT5ng5AAoJEC7dUkA7aK9H9l8P+wc1UDAL6hn5ymJZmvRUNe8i
+xuaYOj/X3so1ldHam1NLA5WLPTa/Bu/ugu+Bk0Wc85H6R26ylXKFTfd1kjLsHK+f
+Z2OBrZOh89/pq1DV8hfvHqd/rjADxCwCk0JbQwi3YKzelzBXHcpmRGYMForwxiV9
+RGx3syEqt8CkQvpCjUbE0GEQ6T2Cken3zT97m7JnQOwEVN0PgZr/EwBbaFTNfJKS
+h7KS5A2RPk+QtvwjIxQmtPhPTcLzCPWcSl73CNYGoIwZaoqM/GwZaWY6voe+saqr
+tva54awm8U0+EYex4LaWvU89qbOlW/lDXsfKhkB+vQqgSf1UznKdn/QiLviAfou2
+rg6ioWhee3tR0k7GMBZkydey0t6kF/jkoGz9BjyVaEvMBc0+ymaJo7osYyGxbOkM
+Lvez2N4i+hvQnY/1uIcIZ3yaGCG33DcF40w57Pc/achFvwxHPdYmUDCx583ZlqN3
+4P/Q4jcbc+8VCYtx96Z2l/hkPipuoq/v+Su1qPFOP4Ndl17wxMJBzl8EUzc401Mj
+B4BjqbDajCQZy4m3ttNsKig4PXDIIDoYKc0/XcWIXLAn17dlVKWw669fGLVwb0hp
+PARrEvLdxG9HATtVNKelgdbnjuWKhHFACEp86ikHsMHdpyrnI7c4VxmvkherV3t/
+MoFk1CTELTqv+g11jOvL
+=3BRD
 -----END PGP SIGNATURE-----
diff --git a/sec-policy/selinux-ddclient/selinux-ddclient-2.20140311-r5.ebuild b/sec-policy/selinux-ddclient/selinux-ddclient-2.20140311-r5.ebuild
new file mode 100644
index 000000000000..9b80b8ddfa6c
--- /dev/null
+++ b/sec-policy/selinux-ddclient/selinux-ddclient-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-ddclient/selinux-ddclient-2.20140311-r5.ebuild,v 1.1 2014/08/09 19:34:06 swift Exp $
+EAPI="5"
+
+IUSE=""
+MODS="ddclient"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for ddclient"
+
+KEYWORDS="~amd64 ~x86"
diff --git a/sec-policy/selinux-ddcprobe/ChangeLog b/sec-policy/selinux-ddcprobe/ChangeLog
index f59a81d4575b..6df6a64faf78 100644
--- a/sec-policy/selinux-ddcprobe/ChangeLog
+++ b/sec-policy/selinux-ddcprobe/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sec-policy/selinux-ddcprobe
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-ddcprobe/ChangeLog,v 1.42 2014/08/08 18:49:40 swift Exp $
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-ddcprobe/ChangeLog,v 1.43 2014/08/09 19:34:29 swift Exp $
+
+*selinux-ddcprobe-2.20140311-r5 (09 Aug 2014)
+
+  09 Aug 2014; Sven Vermeulen <swift@gentoo.org>
+  +selinux-ddcprobe-2.20140311-r5.ebuild:
+  Bump towards r5 (fixes duplicate context for hiawatha)
 
   08 Aug 2014; Sven Vermeulen <swift@gentoo.org> selinux-ddcprobe-9999.ebuild:
   Make 9999 ebuilds EAPI=5 and transform to make master for version bumps
diff --git a/sec-policy/selinux-ddcprobe/Manifest b/sec-policy/selinux-ddcprobe/Manifest
index 916767270360..c2cc811aceae 100644
--- a/sec-policy/selinux-ddcprobe/Manifest
+++ b/sec-policy/selinux-ddcprobe/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-ddcprobe-2.20140311-r1.ebuild 395 SHA256 c3f8b319c543b0d0cdf5843e688cc7ba69649092e1cbe41628cb32ac75d012ab SHA512 0f1ef0c4fc6696dfdfd9386c9cae72724797ab28add205aa7bdbefbc73f4b1c3b31fcc50f8fd44156485ba0c29fdcd1459d374d33b43d947a9160e990462e47a WHIRLPOOL 6089ddd23773cd23060cfad571a664871b6a736f460d18671f34e14b068b63ce42f48007318c214370d0063910c3f2e6511fd89036fad07e76fd64d1c0087150
 EBUILD selinux-ddcprobe-2.20140311-r2.ebuild 395 SHA256 4b2bda05db3ccf7ef28b7b6f723add2bdfd8d2541282c8521c383c13dc42df96 SHA512 fb1b4c978cbc43d356c7edc5f53cc00b8fa7c365460ad050196bc5bc9da1c08c304faaf8b9c78bf3c7ddb1ab7dd28894b4137b38ffd83016ad13ebc2686a4d20 WHIRLPOOL 543c2ad5b16e850b76ef49122eb814cbb651ecfb071013ef677018d9530c98066ddd156131cceddc2d9a47194253f2655179d92f965a54b9e347cc9deed1bc9b
 EBUILD selinux-ddcprobe-2.20140311-r3.ebuild 395 SHA256 53de43cdec2edaf601b4c7ac473e84cc181fba5b965312b638157d35578a86c0 SHA512 61857c6569db66855241a3a56156aa98a87540ea196c6d9ef7b4ff66bc83780c2bd07771fcea1565791b677e7893de6332432ccd6817eab303ebecfadc27351d WHIRLPOOL 0baaed15998a49aaffe766cf7d5ef36442b1b61b4845514da287a6cf2c95f714f5f61d9b8bdcf6a5fb2c2c92c7af23875b5b660d1d1ef17e48309d78d10a0e74
 EBUILD selinux-ddcprobe-2.20140311-r4.ebuild 397 SHA256 1e2583082ef6a89cb12bcd609be4548730e2e08004c4039bbe30843951aa7d2a SHA512 c84a3c648df646bd01ae51a965eebfa9622fd100d6a8f06322455d048902700e7facd8573e55b84d6cc0d37acab35a4daac873070ea1b2d818c4be4cbe509504 WHIRLPOOL a46d181d72f64657cfb55fa0b4443d97e046f6c43047d15fa8686243418400277c999d5d630461fce5e45dc5e62fc20fdc162b0bea362fd8bb66384c5d3160d0
+EBUILD selinux-ddcprobe-2.20140311-r5.ebuild 373 SHA256 a4db8fa7d778d52560f1395f108fa59ba8fcbd36de688181551e6aabe4c1a543 SHA512 84b8120fda946df0f7fbe262e3446a8619f3341a5adfcb180d26f25f1c2f56530d9215f2d667ece651a81e33305cbd01bf6bc3dd6e4f1bce6d1d376ef91546e1 WHIRLPOOL b69d09c6c051d527fb780781e72b712cd53e8b97f9ec2ea0c05255d82a7ae9487ed7420a5c2def8cf9b220cece205ed020edcbd02cbe524e8309250fee40017f
 EBUILD selinux-ddcprobe-9999.ebuild 353 SHA256 00333327e5e2bd2fd1c896dfbb33945f1a38075c7a17ff6b32c522eb0229410c SHA512 9c139e4d6e79f57a2a27fab863aff8902cdbd132f97df13d0b43f0bb05f7a5e9e72fe0c35109d50fb97995a81651aef8187dcaf7dede81adf6798617dd981a87 WHIRLPOOL 9d8d18a484f94d207483ba522d8b7fc1440954ab097d33a765e43aced1bff33a8756c36e76db91d9cc40e18baf28533592ce6a72ff69cd57ee61d723c1928b8f
-MISC ChangeLog 6671 SHA256 39b4287e91adde65dc1d3cd6a24ec4c33a3fa71a071436fc4c04476a2aef4cc1 SHA512 34b220c24ca7b34378125d39821928d68425a827954d4993b22bde1fac67619141d356ddab7f70ffa0cbd57e67c2fa474021a7ea9075e8eb6eb71560ecbc2196 WHIRLPOOL 9601e6237d53d7253ba0f0028f8825ec1d9b0c71de2f991ba977ff1de08698d3c25686d06d1c9235db75e8037e1cfb8143587057d0ed7b1a52769f2462f90926
+MISC ChangeLog 6867 SHA256 ba55d527e60b95320bdc62a435ea3e7467d81433879ed953e124a9ad88b4dcec SHA512 db971493ed5a53494d96b92640afdc8c02babb9ee1f8cdae828e4fcb0aa2bb35fffe3ef8c48da81ee9a2f86764b4041fbcc46b28dda9eaa671092e3a19fd4db3 WHIRLPOOL eb07ef98c5d2a93f78c6cfd8a6768a1c693e4f750a9a9d8860f3bb0031519bbe72c9aa87b396661c35591582be00d1c766642153f8215439e52e8d49adfb87e7
 MISC metadata.xml 232 SHA256 353c3fb6a271396be4876df904e86ae99fd342a41dfb8942f5881389f07d37fd SHA512 62be61a0370c329f3922a2867bce16e05a51eb756fff36ad394645a15c3bfddf3cd02be433312fcff9150c531e539e0e5114073716f8e95c9d4eadb58f7fe2da WHIRLPOOL 8ed5a9e6dd61c2fb4b5757f9e4bca4cc8c15d5fcebaeb612e01d28593cebbdd3a27d2de15998dc189b61a9a401d670b9b29459c15017621b9983e35a71202b55
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0
 
-iQIcBAEBCAAGBQJT5RxoAAoJEC7dUkA7aK9HYcwP/2F3/mJH9wqI9q1w7nKfejbB
-Ydzkg/Ylbgs40g7sMXwPk9vYQvN95zNTfvqccWzEQdKJWu9o7jBu9CWxFtR3qg1v
-EeztVuh3DuT72l3r71B9q4VctSMZarq0N5Un6BdJ+ijEtKjQ3Q/cNhNEOqjYtPQi
-0jBhAK4YFSFOe4/btrXPeKnF220pTkOVb5ShsR4MfJR3rqw6U3N8vak1U2aq51py
-YljH5x6ep4PxkcvPVOhh2laYB0+GL+p8oESeQ2JrIDDsiusq+0BZV1zyR6U2edaY
-KOoEQ2CsMX7ArtUuLI9ElZVTBgE26cIdYNZXbQv7pcJ2OgtuKSO7OSBH0pjL7mWL
-ibWbyJ/hW9LXBWenjFGqTjLY9Vlb/xZGRzUi/F3MVPEgcjiqEG0xb+Av+tOL3JJ1
-73VepwWR2rsQygOUBTjS+g67Ndik7vatsVpeR94YZuKkIuyJmo2v9i0bDiTqvqLv
-fcTN5x554rqacok9fTFIpwyWqRkBfOofrx1/Colrff6bObf6YgX1SIemN6R8BdJH
-/GeNfzFUMvRclYMpfbfacFMZw4unecZ2SHXUnO5xfy8jYgKe1hw4XERq3B/7p0hU
-/tgycvCJgy8W7Lc+tDHlu16UgNrpW1Jh2kYgTPuVm7Ts0OitewvH4ptJoQ8JQrUz
-I1pjqujTrMR4KATNvF+y
-=WWR1
+iQIcBAEBCAAGBQJT5ng5AAoJEC7dUkA7aK9HJIoQAJFNZx+KHw4GGdf4LgAB3BK9
+xNyl50J2SqYw35/LuzEHNSEkr4u7YY+ub933nEP+PyN+X3XqFP7V9wqoeiLi/pru
+21WwFee5Xj2ljyfTOEG+HSOH1YcHsayo95qGbRPa2Ag1sgpeG4SSITGQ98cXzrbn
+eN+y3SAQqVHMQxCKm7zAwWxDOaB2A9d1P0rvpA0hg8ThVrubFhwjYRETFD1gr9qx
+U42OxL+XeBljt/Vsmsndb7X+YV8mmBZWkiedlDywNolzLVRVoXvUNQHn0IuOI64m
+NZbrNunpgCQm1j3ALcAX8NJVTnN5Fxg37TiWFd96+CuC1jUtrxfq0T//RmwuRnkg
+WpZWT0AyVz2l/ttalamw9IKf1bTq+/0K/WLyX8ip+a/tKXEHqmVlxEdaEjcpMTCX
+/piwuibJpf4IdaUuYX7T+YDX6FT9PGKHpuQdO3Tkvlkk0CC1tZOHepOacENdgZEV
+qX9SL2cmxmSaH2T56+bGlTqTL16Aj5BwbYM+c7KhoHgk53jB4qq7436XKo0kGziL
+rz/bkRGbJShDosikAcy/1biLHbGUD/ybXeRdUoJAY3w9TMia4YUqPaYgI5Bba8UA
+1PsaxW/3nRTPVXKTzJ0kuyimoxFsAW2cTFFDjdNySylhDL+woGNKpBRrCl/OzeAq
+i4rGIKipsr3r8eZi5L2w
+=oLfn
 -----END PGP SIGNATURE-----
diff --git a/sec-policy/selinux-ddcprobe/selinux-ddcprobe-2.20140311-r5.ebuild b/sec-policy/selinux-ddcprobe/selinux-ddcprobe-2.20140311-r5.ebuild
new file mode 100644
index 000000000000..388a33dba551
--- /dev/null
+++ b/sec-policy/selinux-ddcprobe/selinux-ddcprobe-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-ddcprobe/selinux-ddcprobe-2.20140311-r5.ebuild,v 1.1 2014/08/09 19:34:29 swift Exp $
+EAPI="5"
+
+IUSE=""
+MODS="ddcprobe"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for ddcprobe"
+
+KEYWORDS="~amd64 ~x86"
diff --git a/sec-policy/selinux-denyhosts/ChangeLog b/sec-policy/selinux-denyhosts/ChangeLog
index 827f67191752..3fa4dc5dd976 100644
--- a/sec-policy/selinux-denyhosts/ChangeLog
+++ b/sec-policy/selinux-denyhosts/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sec-policy/selinux-denyhosts
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-denyhosts/ChangeLog,v 1.40 2014/08/08 18:49:26 swift Exp $
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-denyhosts/ChangeLog,v 1.41 2014/08/09 19:34:20 swift Exp $
+
+*selinux-denyhosts-2.20140311-r5 (09 Aug 2014)
+
+  09 Aug 2014; Sven Vermeulen <swift@gentoo.org>
+  +selinux-denyhosts-2.20140311-r5.ebuild:
+  Bump towards r5 (fixes duplicate context for hiawatha)
 
   08 Aug 2014; Sven Vermeulen <swift@gentoo.org> selinux-denyhosts-9999.ebuild:
   Make 9999 ebuilds EAPI=5 and transform to make master for version bumps
diff --git a/sec-policy/selinux-denyhosts/Manifest b/sec-policy/selinux-denyhosts/Manifest
index 0faa7703bae6..76b3d35a4e6d 100644
--- a/sec-policy/selinux-denyhosts/Manifest
+++ b/sec-policy/selinux-denyhosts/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-denyhosts-2.20140311-r1.ebuild 399 SHA256 28e830c08a67cdf122b273a39e21e58a2a5057f178bcad1d946406d9ee372fc7 SHA512 73fc22ad445abccf719576f403149a4a759ecf5b842993cf13b7fa6b79cf13a950cf0cf0a2db1f24d0aea5d679ba1b0df29bf218dc83e58705ba7229965ffa67 WHIRLPOOL 1da8000fc110fd0f968601090646df008f8a03a3e5528d8f31d7ed978765fded3a29da9bf9bff382bfbe6f8314a440ed105d9f2759aaaba0f04307732c4a072d
 EBUILD selinux-denyhosts-2.20140311-r2.ebuild 399 SHA256 570861d25af3a50c2a2188beeec7bc7b64977398d90715c545fbbdc0b4eda9cb SHA512 2ac448d82969824c99319a5bb7722af79968f32cede206ef725d07e0d1db5721366e4fdd4509716860fd91d0628433474dffd66d1c5e18acd54c752a6586ad28 WHIRLPOOL c5ebf0cdcc8fc2383ab6878718a45775520dc86593147054664c78eb3095091448a1dd142a18a2c77d0a4613dfa9d68a5f478403f96315e9474387b512a295cf
 EBUILD selinux-denyhosts-2.20140311-r3.ebuild 399 SHA256 c38f69d3ff68bc150d072b2e29700a85065959a658e66d8442e3736b354a669c SHA512 f549b75f6b6ce6ef681805a002b41b53555d18d4317e60c799162d0f081bb9d70a3fd2b5308c7d8a5427f1c3c60b3879e2640cbbfa7a0285550492049d6c9a34 WHIRLPOOL 49c7c720f080591972f2fcf08a0b54e4629afd33e5702a22880d9d31cb9423d9552ddd6575e85402df6fd44282c776e832c995b630292ffa76167caebbbe1f35
 EBUILD selinux-denyhosts-2.20140311-r4.ebuild 401 SHA256 0d98cdff636a781a9c75de46a0f35fdfb2184a153b961beedb637e0b255311d4 SHA512 efb3764db750c6f658c7d72cf0ce60afb504849cb54d89be1aab9a0c72ef6d9426cb39847eb98ad36ec1607a50c633ab9e12821a371ef46401dd5f0d8006187f WHIRLPOOL 0d0957a1c8b97acd832ac2e2167fda36a29c365a7550688c2f8d32ab8da463b9a450a532e1e25c2e4f6f40ec1442f4a25d6ec1bbac4269c67883f4054c321be4
+EBUILD selinux-denyhosts-2.20140311-r5.ebuild 377 SHA256 17cedc806e47aaf3e4a80c522c74045242d417592e9b8e48345e9c759006f02e SHA512 15d89114f3fd4e66f5375979c72cd1f4efe6a60f02f8e8a1e9c8d0d3dc10aeaaea4d50583390280826a528aeca3367afe5e8875f328877e46034293e72b6e494 WHIRLPOOL 4fe7ae43fbfc5509f1a536ec14e809fcff613c57e1aa9ac6de8494e4b4b91c303888f033ba182f8d27628976feaaeb90744aa39af6d883846a419234ebb38ceb
 EBUILD selinux-denyhosts-9999.ebuild 357 SHA256 6f7ed6ba1046ff04359155253595bca7b45f44179c5c079d54ccdf4fff5f4b22 SHA512 09b7172ffee304418c3bd0bf48885181346294f19852de7f00689994df8f4da57fd0c782b7712b6a4746363343e40c1f9198be2039717aafb3a2f361cfeb1c11 WHIRLPOOL 907cab2d1796137b300af0824e50a25e1e53317e5f7b0624c4d57913b32391a988a5addc3418383980b09e81a7dcb53b007ffacf58dba41bdb631589dd5e289c
-MISC ChangeLog 6486 SHA256 47b5f68ca25df1843f69601e72df3c4f7335290374c36315256096130a5d5c7a SHA512 3e69a8ba2e81b1c10d9156225cfa8dde345b4fb2df8c2b05f305bb5492521080f52c01ea9f2d59e0fcbb61edfbfe7d24ccc2ef8d0b0611c6e966d37a0754a820 WHIRLPOOL cabb3c6612726dd49ceff829c723d368808d102ca4ba069d3512464df8094c91c04de6903ea0765fe91fa8aa8050198128d62448e706a678ba51eaef39634768
+MISC ChangeLog 6684 SHA256 ea02b42f4325b32adb23dc5234bec51612c4d812e0c23e23c2f1d1a6326fbb5d SHA512 2b3a82a8e22eb4789f81e59a23735e5a421dfdf2fcccc1a9f4f42d1a8835233a869fa7eaa9f66fc17b0ed2a9575909d978e62b12830a6a5fc22f18b48f9ee248 WHIRLPOOL 1b356e9b22e0312a45783fa9571039d39fe9f8a17f73bcf562c944a23440f7ed557dc3a6c6f8a453f76c1099ddad17081554a4aa8518e6a1f81b8338d29ffccf
 MISC metadata.xml 233 SHA256 80fa60345c1ef9d46ff47eabf11930960b6a1e66e7a4dd9c70404bb755da4d34 SHA512 b18e2dc82a855053d6255bd47cc07227eed409106f1c78b731ba52e867d9366d75eea6b583221eed7da4dbd5aeeef39fb7c3a3461f727a684bb58c37c4e14a2e WHIRLPOOL df1181cccd94b5671bdac9d57af227a31ad5e23fc101ec5fe3342ed5e92a53bebc8b346d829ccdc5dd886914393b7935b2b478b28d8fc6ae895638de2e923c75
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0
 
-iQIcBAEBCAAGBQJT5RxoAAoJEC7dUkA7aK9H78sP/1ViyeLDldePDjMhGHikifnf
-a4d0wyfziZ6fjUSC0HugXk1MYU3OlwR/Xkh1x6dcqHUmMWk3fGjZCi9hehFesyBC
-a79+uSxO0LmRNdmcfHRVm8F8d0vNbkTOT+kiL0+sST4f4MtjFDdhjIZqBNYO/GLv
-zT8KXnnjlAAKkXZ4UgJAetLwDLmXEsFjiErX7T7tvElEy5FUDw/MwhwBUJVYKEKS
-17EZ1iDjdFRyFkYBL4Q3r3XmQH0Ot8x9dy05P8YMiBEg3oG/kRGjHcUpS3dVwCm/
-cxTWAEIpydfaaBquKSdHoCwbRok1TF5HGcG9AhlMG7xcutPJAHsGMqIq+S0LJNYK
-lVkr2coOkYTfjVR7enwmdwU+7QJfshCZ2LOLhgpgq6GDLP7p3lDWdn9feKTUW09x
-2oouErXZ6vgN8utGtz1Ntjstc5ymS1Ht8FEQ9tOueMTclnxazGuCyv0ATwcZWJJi
-hgrYBaO6kjOHElsVTvn2hU/6jDe63BKE+WIfGPwIGqk4AuUoQ3G6nCuqhHh6ZL7F
-eiohG6OcOJQR0K6+FB3QLGEtNlp0DLonjApvQeE0a1x5ILbcZ4enCYyTrT6kYwZS
-qF+XI8DvaJmk8ilp2CzK6zW9Br4rDI9kvBVZ0+usaTCAIJsFuM/pYxY5Z76sVJzC
-OyJc5RJdh+YHHFBOW6vg
-=Er8n
+iQIcBAEBCAAGBQJT5ng6AAoJEC7dUkA7aK9HfxkP/j0IMUO1o/+E4rkmzMfUHUUO
+iD0JtI89Yy2F4y8mXchg2yM3LU+e750OsM+kjdAlqxmFyYes5o/5gqRZhk17EkLv
+pF935OWLm+oIHrIfI/JPwmMRneFCAVZwPmdmYYwdvVNCa4I81T8A31EW5bG4hKpX
+LWDAPcWcGl7vNNKsEBvWA17n3GFCaI9wZctrfgwJ+yGo8vo0hGDGp6/DqbGwNQtR
+CFMmFCN1zzDKPcMSKlGFNgy6p9BJsA2WnbapQlIk3DNOZZhVQzsxH/2yK0FaitAM
+/HZTBviYxS9QPuKZuVCasMXZ+0ASwhM63n3z9sUoorGxdUKvAfKapHHBsQTwVlFm
++Ypo/fJq1jLRF80uARx2GSjtG3allfw3elBEYGrUXWIgT/pqOxt3OyHjBmHi/4Wq
+CDgGEUfzUsRQpQeF/MTPY/g+M/ua6TZuaqJAwDgXhgQYPc828wQyBIJ1t+2NiIGV
+V4CfJI4fc3rXtr70ewSazkL22oZM8gPtl5z4oyoJwSu3c3cNRSY729Kewzb6bNBz
+ezr6IeTUgTb6LGxFDq3NjqbR8Sjje0lZOrZ9mzz8sGv3jxvyDfLBPvYk2lH8Tihd
+SrUKFM6+KiA1v1DzNEX4drp9b2GgWf4joOkGiWQ2Pnrcauu3ohTAnhwRbdigFcfj
+tgGkdVdcCBzWKabeyem7
+=jfpu
 -----END PGP SIGNATURE-----
diff --git a/sec-policy/selinux-denyhosts/selinux-denyhosts-2.20140311-r5.ebuild b/sec-policy/selinux-denyhosts/selinux-denyhosts-2.20140311-r5.ebuild
new file mode 100644
index 000000000000..7f9c28647b70
--- /dev/null
+++ b/sec-policy/selinux-denyhosts/selinux-denyhosts-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-denyhosts/selinux-denyhosts-2.20140311-r5.ebuild,v 1.1 2014/08/09 19:34:20 swift Exp $
+EAPI="5"
+
+IUSE=""
+MODS="denyhosts"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for denyhosts"
+
+KEYWORDS="~amd64 ~x86"
diff --git a/sec-policy/selinux-devicekit/ChangeLog b/sec-policy/selinux-devicekit/ChangeLog
index 51d3296373c6..3fb72e282460 100644
--- a/sec-policy/selinux-devicekit/ChangeLog
+++ b/sec-policy/selinux-devicekit/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sec-policy/selinux-devicekit
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-devicekit/ChangeLog,v 1.29 2014/08/08 18:49:51 swift Exp $
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-devicekit/ChangeLog,v 1.30 2014/08/09 19:34:38 swift Exp $
+
+*selinux-devicekit-2.20140311-r5 (09 Aug 2014)
+
+  09 Aug 2014; Sven Vermeulen <swift@gentoo.org>
+  +selinux-devicekit-2.20140311-r5.ebuild:
+  Bump towards r5 (fixes duplicate context for hiawatha)
 
   08 Aug 2014; Sven Vermeulen <swift@gentoo.org> selinux-devicekit-9999.ebuild:
   Make 9999 ebuilds EAPI=5 and transform to make master for version bumps
diff --git a/sec-policy/selinux-devicekit/Manifest b/sec-policy/selinux-devicekit/Manifest
index aaf6c95b1a20..5557451a21ef 100644
--- a/sec-policy/selinux-devicekit/Manifest
+++ b/sec-policy/selinux-devicekit/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-devicekit-2.20140311-r1.ebuild 464 SHA256 699bcc90dccd71606cfad181f11a7e3f0b3a7378420729ed9a3a2ed6033037cd SHA512 5eeaceb4ad08658a9db8d7432b24b04a2151bcb1db60f081d5d64f38edcb86cce1cc3768128384b381c696465f0e66273ac1dc269c692edb00dbddff6de6ad2a WHIRLPOOL 5df61b014164e169e52bf2c1b0056700b67d057cfc772b0c11407455aa9b50286f2c11aa6e0fe49b5926f1fdc7cf58605466bb0a8d17d5ba7174955750a1a98a
 EBUILD selinux-devicekit-2.20140311-r2.ebuild 464 SHA256 d328f78cac05a79d6be2bb84e9deb4e92dcc6ac4d5076f9feba192373a27f3f0 SHA512 779ad7afe4417d153ab851c1e0b3ce2c4d88bb9619d547a30dcd37f17216e3ef43a76f8783f4c4040eba2158faa553941ecab5c81fd550059f11d0d5d60fcdee WHIRLPOOL 4b66ab7a46f6cbccc1afb13466bd241eff738aa8a0648c542a8f126412cbddcaa9f627984dbd73e39bd804d797a9efe17c954ca1ac9a9e2446bab8bd37f97e22
 EBUILD selinux-devicekit-2.20140311-r3.ebuild 464 SHA256 f3eb0c2dbbcdd6c985b6b9455daaf0b165a6aa7d9f374d2f883bfd5b34a334c6 SHA512 d0b35c9f33599bf09a29e86c0dccb70e3806de8b1bdc124d5553da60ab013bdf1fc39686bd94717a43e09ee0040b7519ed7e4d07c8feab3e3331820bbc273424 WHIRLPOOL 41d8192e461b71beb696292047bbe71ace7c8c4c0afa6edbffcf0b37c6341121cc9f644e615968db9733f124c1a005854db09d04411c55a0090a49a46013a0b9
 EBUILD selinux-devicekit-2.20140311-r4.ebuild 466 SHA256 0c2ce6cdcd9679c651394b790b2c9901122ad2da160f63d78f760072a4d08682 SHA512 ea5c1d0673ee3ec2fea89f6c3ec186284be8090867a0f8986c231df393990a6567546f677424ba6415cb2d79e7f2ad380b6f021fed23787a5687c5b09e089760 WHIRLPOOL bbb3923096cdedb0aae1ad1f86551582440c98158de902e70b6ff19f79e0add089bbb81a32b594999252f31a7dba7227d255cbe3db43d81da5d59b1e6bf698e6
+EBUILD selinux-devicekit-2.20140311-r5.ebuild 377 SHA256 c1fa7f10a3c63c2cd071a62dffa089248fb19b6c14c8c3f490e477368a0c9d98 SHA512 0c33a6a4617dd962f7665513e4b1832f6bc6ad4709bae420c7cfa3ca802fe96d2e367a3dcd24b57f62142c71287c4b2b40d59333607ea70bb6e35b8d4ca61aa9 WHIRLPOOL ab2bc30ca24f0ec4697f9002b596b4b514498f37bc5b7cc8afa4c7eaba2402facf9c2090dc7ffe3753401687e59e3e89d71be7713b8e602f78bb5ba1808b1339
 EBUILD selinux-devicekit-9999.ebuild 357 SHA256 2330f5bd96cd979669278073045dadb6e7fbdfd6ce2fe00504e526f986a0b6b5 SHA512 bc1a13b80be8e92219c6207e50ec54b0b905484cf4312b3b98e69d3e706033a469c265fb145fbb29d5812cf7c94e8dbd8c09ea27679a0baf2b9da15a2066fa6e WHIRLPOOL 7db2b025f86ef0d491a483ad041c155e9b3ec098968c5fecdb7a1178e1ba4a8a865b9e32626546a8ab79b99f75c412a2a27f68b4ec343b61d7b724752da2487f
-MISC ChangeLog 4864 SHA256 e3f3caecdd0eb97dd94abaa79aebd4f9676529068e1cadae33eb7094bdaaffc2 SHA512 95d3027c3327e967f5668a57b1f6c640d87da3272026c4862b88b4e2f1c050ca89b8e5a4cdc0a3fae7134968762cec2c2f0e48f3af438a85dddc95362a183306 WHIRLPOOL e7baf4d34cda18645ebf29afabf0be91d3d776b1b7b116a0c6a3f1974478c42b8a9569dcea7f5d539915b6f0c85641bd52786a8cb5cea991fdb9e36909b8a4b1
+MISC ChangeLog 5062 SHA256 fc89ec8aa40ddd7f811dbb1e960734896912e3464cf08497cfdeb119d61af0b9 SHA512 6a6fb283164ebf306b03f6fd2037e8e7a4011a6562a49913f34e2c1900b6a8e7bbe8e4234bf8f7ae9409466a398c7d1438645eb528ebfafe4d9975309f98dc4b WHIRLPOOL 873224ef1dd38d565338f103652f61215377174a632a48d216a2dbd4954e123fa4afe11bc6d4b87d1ed04f59bbfa15d54e85d48f60201d6b8c555159e7ffe617
 MISC metadata.xml 233 SHA256 49310f5ef1d7cba22152af8fd2c9a30cac4ecdb5cfdbe8fd77d81cfa18cfaf90 SHA512 17c12a32a125fbc253f3f36d9521ee8a904a533c31f98a7b6c8fd73cadfedf6f2e24cd05cd29e26887584a116f54a782ef0535997028c5966ac69398c27ad544 WHIRLPOOL faee4f038da8d466d22b39b04c1325b6047b8ab8cdcca666626334c1e79c2d4901bd0742bd010d0062a36a633cbcb103d08b66bcf0475a40e3341e26363d54a4
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0
 
-iQIcBAEBCAAGBQJT5RxoAAoJEC7dUkA7aK9HpKoQAJFjsjEAByMbnTmtDyJaJllg
-/psmlkGwQH9ydqKYZxHE+lZ2l0P9k0UFGoR0WXCFEjzy8KwpWplAfA/1LmiBxWkl
-/3HT50S+DrQUG8EBQeLjoR2NbO/Z1VTA5NmjIgEbc/Y3SnJ7NwjIgXqIT7B3/u9V
-YFO1VNK77eQcYhERWoQNzGaq3onOPfYNg9rZKAjAjc30kpWB54X0uQG99UmCaOJa
-Y54zMdlyy7gaJuboHZm0Ql1dCMf0D6f8mMeFKyrRubZ7wpXEyajYtasBeBeLl1xK
-xza4GBK6Y5rEugNbMubx0XtCAJjFYlKYi8qf7DPHGDCE+vxeGpAInJuJfJX+EX4m
-QCR2K0GFJWZXTDlM1gixjJdARzOLEpjOia6cFLQ9oAobndwi804ApRd/Fj4oZeEj
-fUDXNorXoke2KqH5A6wKdcLvMicZSSEvSREtE6IsqxoL80qD18xKe/pPGt93zELI
-B0+cqLvwAFACeN9Osiju+1dWWoQvRwPiON/setCPF8kwVCFkNYKw5JUptphJWeW4
-e1cZNlktllYYkFn2RpCp0jkzj6Ho+HzV/P/Jo7MsFW+zumACT5YM1eXLdeqZzZwJ
-+qmlfXgAIQCQcbfJ23/8BOa/w1wh8EmVBjtG37q8HfpnSF12rCryrlC5TZVk55TV
-6d3huUHVanR0xyLP1unj
-=9l6D
+iQIcBAEBCAAGBQJT5ng6AAoJEC7dUkA7aK9Hd54QAIqJZPPQpTeCnVq3eI3+LoR3
+IPZd/W1xUMpkCkTvkpZNb2duSWPudTl6X7fKQChnMVbyiW1/34tWqyN+/7Qr7nqS
+69j8uwOKhBhpYfx5s4cUhGJCTnEtTDXA1i2XTzt0YxjqT4nMOOaT8uudI8zCRX57
+OaOuVMP4BqEfjsrpvCzAbxsZMFpZwiomGr1vs2xT2F5Rc2aT8EyiZrh4z9rBDbaO
+lG1+BW2ueoutEtMGNWmE+akOK9dNCY9Krtw1cT1dh0XQP4z8JuyJSaKqVlkYyy4k
+nM9W+/eyFNRuUmJdovpuXr3Y/CFVSlitgUPKyYt2UJPsjOf9QHJi1RWKTvCBD3jt
+eT9azIotlX+7X5HyWI1FqJ9FmOKn7QcT/vs0Ga2c9QtI0/ydq4Y/OuReITdo94k5
+1HMVnNALMsW2CL15xdi8NIVsoj5rmDjf1EXLeWj2//lWJ4N4xWmUwbD7REGwr+JQ
+dcbeDgvfjhaf+INgwjTpY7lsMQrCWfBMzJgHj3mxDqlmDch0Eqaz1kywxAZY8+I8
+9NcU1ZrF8OcplDjeFdfPbFhd7zl5F/veVInw12IMLLZ0TDrIvFIYI/9LDmj6PA/d
+I68ZDzUCcTiQphBVRGWSsp5gtfcRQL6gZs/YmOHHNBd49syOriLQIDYtbV78zuhR
+GJxA9cVwE7X7oujhcW/x
+=uCFX
 -----END PGP SIGNATURE-----
diff --git a/sec-policy/selinux-devicekit/selinux-devicekit-2.20140311-r5.ebuild b/sec-policy/selinux-devicekit/selinux-devicekit-2.20140311-r5.ebuild
new file mode 100644
index 000000000000..e759e27ab788
--- /dev/null
+++ b/sec-policy/selinux-devicekit/selinux-devicekit-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-devicekit/selinux-devicekit-2.20140311-r5.ebuild,v 1.1 2014/08/09 19:34:38 swift Exp $
+EAPI="5"
+
+IUSE=""
+MODS="devicekit"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for devicekit"
+
+KEYWORDS="~amd64 ~x86"
diff --git a/sec-policy/selinux-dhcp/ChangeLog b/sec-policy/selinux-dhcp/ChangeLog
index 3fe802ad25e1..64a9f1a80f95 100644
--- a/sec-policy/selinux-dhcp/ChangeLog
+++ b/sec-policy/selinux-dhcp/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sec-policy/selinux-dhcp
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-dhcp/ChangeLog,v 1.79 2014/08/08 18:49:26 swift Exp $
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-dhcp/ChangeLog,v 1.80 2014/08/09 19:34:47 swift Exp $
+
+*selinux-dhcp-2.20140311-r5 (09 Aug 2014)
+
+  09 Aug 2014; Sven Vermeulen <swift@gentoo.org>
+  +selinux-dhcp-2.20140311-r5.ebuild:
+  Bump towards r5 (fixes duplicate context for hiawatha)
 
   08 Aug 2014; Sven Vermeulen <swift@gentoo.org> selinux-dhcp-9999.ebuild:
   Make 9999 ebuilds EAPI=5 and transform to make master for version bumps
diff --git a/sec-policy/selinux-dhcp/Manifest b/sec-policy/selinux-dhcp/Manifest
index bf4514d1da94..ca8f68ad8c4c 100644
--- a/sec-policy/selinux-dhcp/Manifest
+++ b/sec-policy/selinux-dhcp/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-dhcp-2.20140311-r1.ebuild 379 SHA256 f98aa5f7e3afc8bd8dbe36e31ce1c4b6849753acc4aa903212856e7c74ad0c1f SHA512 1616855c6c6dfbd002eb65fb9d4e0991ee3579bc0c694df9bcdf4e46e0be9c377aecadbbc3a2829e6e1b68ccfd60b6ebe58ef8ba5871168883f1d68215932ef7 WHIRLPOOL a1a76f6af7d625dca1d5d58da0566a46cd0519b43312103f45fcf33e1e237dd1eaa5cd04c0d63b28ee337ff8d28f5719b38793b60ae27dd5c6d06258eef40411
 EBUILD selinux-dhcp-2.20140311-r2.ebuild 379 SHA256 8aa3fd076d5cc06809e96f47c7dfa663038d9a0008f9d50e0efe6f6d14d8a484 SHA512 5268328915257b60e34398df10fb20d4e7aaa46d956ec92ceee5116de6b3aeaf8a24ef0d3a39b7fa56acecc8cddfea80fd39e557e7964244c767943e36869ffd WHIRLPOOL c74e4f3babd149b805b951ec2db2bbed0e4195dc9ed69985baa72e87ea5b442242c22e31df9b9afd54fe78fe0905fbc7311a68ec4d54bf8cebeb6f54ba5f5f2e
 EBUILD selinux-dhcp-2.20140311-r3.ebuild 379 SHA256 680524797d8f073ce3513a0b7e621ce4fcee0ae7cb12f383b822f38ec49de0a9 SHA512 538fe71be6e811040b9a448271a92567dcbb808c5e6cd10162e9cc27c9f782b2e76352ddea9ca77f4ccc8feecccd527a3cf186586092bd1837fd63ff8fb874fe WHIRLPOOL f897c1bb3e9dbfc4e63323fb06becec8649135a2b3fe4c6accadeb5ae11ab7efa263c6f2e64ca91db3f8d01d131566cc0311c9859fad8988ec46b4a3b9890a5c
 EBUILD selinux-dhcp-2.20140311-r4.ebuild 381 SHA256 9f43ad557f7d7dd4b7396f1e327b50f89d6131a3ea8db58053f671fc7f7701d4 SHA512 e64ea21f3cc7d6848154d068d247bde14cd6cf00a85f8fa963981c92e25849976f5a0170a25388cc4c85ad9aa08987a98f4be4c8a94a07eb488132c29e570b69 WHIRLPOOL cdc66e85a8388ad75bec931786bd4bcd7804d7d2f4bcbc3f48ff2c171ac34f86ea8053966df73584e5b3091dc120fbca3899e2007e7f2d9eb8be06c23cf1e8fa
+EBUILD selinux-dhcp-2.20140311-r5.ebuild 357 SHA256 f9eee1e456f4b8140ec0f8008ae9099535a05794686111a9274bd7350f9ca507 SHA512 c9de86bf409e886ab62257ab3f0ca70806f60f4b86937efad6df5402c54fafb4937462b696a373f39e5a453b1c59a7ed0a4f1aa776eacc37da736f6fa0ee1f04 WHIRLPOOL 8edd521c2ee465e26fa5f69586f78330e4b71ad21643858929e4b913b810dfd2eaecb570befa2713605e03ae3f49274741890262dd210ae5116992dfbc1a9224
 EBUILD selinux-dhcp-9999.ebuild 337 SHA256 d565b59ce4ad30ca603bf0acb8246ac787acda366cc916a61a9c604e64f77b08 SHA512 42dc60e451978a4088a4bb44d2262c03b3b7bc3631000a874541d044e1c6ac6e948f130a0a97a0ef43f78cdf6a2dbaf983b2990427a2fbdda64eab3f7ef488c1 WHIRLPOOL f39644c79d2f1581db99764328bc96716004360bb211138cb81806739c2162971c9ec6cb2faade5f7166f8aa513026606fb659fc8825862f6bcd213364983ccd
-MISC ChangeLog 11904 SHA256 7eb2a70aad679154377ae1235a2d102cb42f168cf2cb223a848d7a545665371f SHA512 c794e6d97f2f2669aaba331485f163fa6c48991400acc7a284b979ea93dc4f4cc90384baffb0bf1186b23a00ce1744ecba8be214b098cfa1be0cf88b054ac4d2 WHIRLPOOL bc8de195bc873f2bc1df60a09ac8a74f6b111bc95b99eb50e4a12df88e7ba24d611d7fb1c65dccd494de34da0968761c399b1474e928af9247c303096507eeb4
+MISC ChangeLog 12092 SHA256 8194b1a1f5957c8224488563a023f36f4cf06effbe9b33a068b0f1e013080598 SHA512 62afcc0bb4de96f2ebf5afe23b340d998eb534bccd6a85b0a1351af1db16f596b6594ad8cf0e5e79fba2ddc396642e8c5bc2de7cb891890d4c8de48bc21dc83b WHIRLPOOL 5a3ddacaa46675ab8188254df7426b06e4ce28acd2071d1fdd176ee04d18bfb4e2dc0a322330b11773438885dbae4682bc484bcc541eaeff8a6c535d49e7d9b7
 MISC metadata.xml 228 SHA256 340de14f65d0298d35928598379638d6bcf6b57750e0ce67a6ae3ed01df84d05 SHA512 4044230782ee2f141a8e7e87755f9f7b476db88e9adf1d180bc60ad8a6d21bbbf4d5cf4201628a2aedcda52c51532673d94746b3670118fad5c2d436a254528b WHIRLPOOL 13a79c7a3e3517eee9919c30a18d4c1057d2fd32a0eedf9e24041e0297b32bb89d9e3a974b67235ab3b028d45e0872a0daa1548e77ad059d509152ba3b64a18d
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0
 
-iQIcBAEBCAAGBQJT5RxpAAoJEC7dUkA7aK9HRBQP/i8HW9kjoJ+r3IEYO5IrOIV0
-J1ObBFmkHoNXIgP+o9UQtN+AVUxOGb5Es4w6cm+LVqNSF5dTzr70Uv7VGvnKcYJw
-B8rmGrlWSVHQyOpn6HNlqQQLg3PIqdqLw2SATeESTT+huLeVsY7P7PyGVwrkw9GL
-BJY5Jp0xgOMFwg17HgCedWcIHi3TXwDgIu6Y78cpNoEaPHxXy4+0rQmbjmu5QxsW
-sOFTXcG7G3H+YqqE0CBUSBGXmHqVi78K5FzMERUy//JdXTnqZRUoqZN6CiaEOHUT
-oSI6cLr7tKvKy2On7NC7i5aDQCosPvssMHVor1g4eUnO81AV+1Huuup1D9CZPvZG
-Bj7uxW6sJw24tZ/8gWNo/qN4cHbLYXRQy/IaLQArRuSj9UPAz7vQZMCsqKxCcAkO
-kDBGn6orh91K0/ZUuukvzGxQr1P12w+9tHKNyNbt2S6MerHcFkbcqcm/3ndq74/B
-AxyV2fD2GuqJRwM0RYJmNsEJe2zMP53XA4N4d7s5Wfy0vyrTbK+GfWp/n169GizR
-morqEQe+MngXm/vfkMGyiAYl9si9NknXKEM3fiOH2BkKmLKErG7qzGUwCO9mHhFU
-YBzERTPu/NdwBMMtJoo5ar2LCi+cq1rRe5g+SiKyZo5LmbyMgIUsaW8BqOtbqG9V
-Ea32UVYi/T8eqHCfkf+W
-=X+nO
+iQIcBAEBCAAGBQJT5ng7AAoJEC7dUkA7aK9HQLEP/1hhXpRtObZjUKjzbU4kIQD5
+YlZX+RA5k87WWLJXy1RATXMZGIiAx916f7U0fcSKDUqM8cOGrMZltJTTGgM3YDd6
+MoMXoRbPPhepAv0+QZZjQMZ8z3CryjpHyeEMfLdPPJpR6wJPdNKA6R4qqAUnaEBN
+bNfCN0SHOPbz0c9s7sN/0HPxGp7S/pYLY49/1m8OvHD8yVzIIqAVFvbw0ctNJ2xo
+CNgEpPXmzqu5ZrBu/9h2thfM1Np+Hzn4+7eEFTgf1PVGUqAEHQCw+Z011P1OnTer
+hU9qfo6yorXbKwURbVCjuo1OlnFkBUDr14HieQ3xr60efgWFjo/4RBcALn3I3Xo6
+St9DAWf546Ub03AYD2RjhfkVZk4L/R7dTqek91Rta8jkUcr3I858G9JyBa7gnfvn
+1TfH+YpT6mTaKi0AyuE9Cv8jvFrTAEa9tZQApyulkVtCOFXm0FO6BhEqJSQwpdWR
+9o6vwzaVSi6TNBinT3jmoZYfjCjBBeiWKHd4xpunba0zmhnOcn3CB/lVqHfzWIny
+NdDoDACvhL/G/5UvF5kmW4iahLL/08XD4fosBnEUXmCNK1jiUDt432JS2IkZrREW
+YhoEeEzd4RNiuPWL5F06qlY3maKmz28J0suU71LKkzPfz4mEnCU6YBBXTZYwfhBf
+TjMl6oImHXujHBx7yNwC
+=Rrb1
 -----END PGP SIGNATURE-----
diff --git a/sec-policy/selinux-dhcp/selinux-dhcp-2.20140311-r5.ebuild b/sec-policy/selinux-dhcp/selinux-dhcp-2.20140311-r5.ebuild
new file mode 100644
index 000000000000..ee7a442bb7c4
--- /dev/null
+++ b/sec-policy/selinux-dhcp/selinux-dhcp-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-dhcp/selinux-dhcp-2.20140311-r5.ebuild,v 1.1 2014/08/09 19:34:47 swift Exp $
+EAPI="5"
+
+IUSE=""
+MODS="dhcp"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for dhcp"
+
+KEYWORDS="~amd64 ~x86"
diff --git a/sec-policy/selinux-dictd/ChangeLog b/sec-policy/selinux-dictd/ChangeLog
index 85bc9932673b..63bb74fadf73 100644
--- a/sec-policy/selinux-dictd/ChangeLog
+++ b/sec-policy/selinux-dictd/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sec-policy/selinux-dictd
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-dictd/ChangeLog,v 1.42 2014/08/08 18:49:48 swift Exp $
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-dictd/ChangeLog,v 1.43 2014/08/09 19:34:09 swift Exp $
+
+*selinux-dictd-2.20140311-r5 (09 Aug 2014)
+
+  09 Aug 2014; Sven Vermeulen <swift@gentoo.org>
+  +selinux-dictd-2.20140311-r5.ebuild:
+  Bump towards r5 (fixes duplicate context for hiawatha)
 
   08 Aug 2014; Sven Vermeulen <swift@gentoo.org> selinux-dictd-9999.ebuild:
   Make 9999 ebuilds EAPI=5 and transform to make master for version bumps
diff --git a/sec-policy/selinux-dictd/Manifest b/sec-policy/selinux-dictd/Manifest
index 4d011962c5d7..27812c448392 100644
--- a/sec-policy/selinux-dictd/Manifest
+++ b/sec-policy/selinux-dictd/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-dictd-2.20140311-r1.ebuild 383 SHA256 533e3ad1779178820f03386c95f0d51ed35691e473ff2eb2443c0f2d34e694aa SHA512 d0a02685765181960c038cd9f40d22c3aa84c0ca704100e814d2c0d26062dfeb9e5e559ed44772f29127a4ace6ee88ab66fba9d15fca8608a5f88ae90d6798ce WHIRLPOOL 7a235fd98f56a1c3fa8b61036fd37135cdf38e469e2c8c6ecd76ff325b35ae75d16497fe5effb149a17f1f37a43fb9ffcc53e4183926f35331828ba4a69591b8
 EBUILD selinux-dictd-2.20140311-r2.ebuild 383 SHA256 b812176b82bb411c25ae3ff8d7d842d9fbbf1aa3b2f70382cf4822d43231e433 SHA512 d2766117612e5a77c87b7f811399e42a6e381d8a84940341e2500aaeaca61bd26067ed7d3d259d4beb2100c717ee06d796566db8c5f97a8ae97bffe0b7e158bf WHIRLPOOL 9866b6ff4a247e8a59c023ab6f65fb9ad70dfcca65f0a3ff2a389c82c5b4923ccefc639c7c2679a10be6814916643ecf14a92049feab0d142cb6e7bc5af6d77f
 EBUILD selinux-dictd-2.20140311-r3.ebuild 383 SHA256 1dea98b556d878d8ced1a46d77f168df7b75f335b5ee91a3bce619ab4e4fdc69 SHA512 a6696a793c6876d9f80cdbde49c8f01c1834d754e1dcb8ae739e71f1574b5909f73e3c361bd0e0c4efe198aa15166183d193f267aac10cde3e66380b6e8338bd WHIRLPOOL c3822e89b98c855970c51866b9b0455dd93161221c2a04069daf263c86462cf2ef8c5e535f40136668c23eeafd195c6a454439527939f8daff92464ca5d6b11e
 EBUILD selinux-dictd-2.20140311-r4.ebuild 385 SHA256 935260bd9567fa01f04135a10193270ae11e250c98c75958aa1c9b493eda6881 SHA512 2db673574fc984e14494c4867d93aa912ee782f3b3d3d08f5872ef81496be9d7d49e923f9bf044bb342af84543be30dfac19b16a6fc1b6eb763244c526598e2e WHIRLPOOL aa7507da1c7f366ba91800d00cd4248c6d6d23deb1bcfd780aa46eff0702e3ef2c5bc246985acf1d5af68bcf69beab46c9dd0cfa17c8bdd01517da9cb8baedf5
+EBUILD selinux-dictd-2.20140311-r5.ebuild 361 SHA256 dc388390173cee4c513ed6b093cff75b02f2ae4d9120473e850b096ccf3aa52a SHA512 5739ef14e0e16c51128532149ec2dca7c6ab6cfae9dd263e89aa7fd7584a93491a5ab4a1bd19e31bdd475299bab7f7774e3baab964c4ee39070a631cfcc26616 WHIRLPOOL 0dd4a9730a1124772478f54f57f846071b7c04cfeea75eb0ff3937fd8b13d35771afb013a15cad7c2cf971f9f0880b4d4fed6d74925fbd4a371bf49d025de2a3
 EBUILD selinux-dictd-9999.ebuild 341 SHA256 6344572be979ac1e17b4d2b20a3fa8f081cf95bc67815dd1c82897ae9e1d5664 SHA512 5ea905a1679ce20739f2eaadd70e6b77e106b15393c28ff9f23e09e1b9fd61eb909eba253770257570b0fa4d86f59fd7cc29ad97e097f75bd814f9f1a77d1fca WHIRLPOOL 3d3b1ee18a4485a23b12bdbfa16a489ef6632bfca0fc720f03746ce0b615d4a5f1ffc1eacf24781f5a015e52df3ca5a77b9d070b3fb8cfb70c33a203de373e0a
-MISC ChangeLog 6436 SHA256 4005d2df509f84a39fdc3d0cdc6e1037e5e8fce0473fd23d17cc1201a7b3dfa4 SHA512 5544edab2ac79767ecb4458c81a8b0d7dd402d593cbb7a11235fce67a46996ec3c28587e1a90c720594ba9a86195183cdb16f50e9cfd8750d0930de084797c0e WHIRLPOOL 3fc6c8f9006cf6ee347d62480e9b68f558b2a1008e1ce5f40d0d69387f9df9719198b279f515e0aa780ae66de04bf973db1e615a471fdb258e39f49c3faa6cd1
+MISC ChangeLog 6626 SHA256 cac1bcc2641d39b58bfaeb47e1fb70e64e92da35659b6070a77eba27d20fede7 SHA512 ea110701ae568bd2591d3cb6e2b723e03f2ee6979d896c2430e8ff99fcbf72f16a92955b1e5074e856b5f8b7a7add66f004f77d147185b74dc12d8623b0795fc WHIRLPOOL db8328471244bcf401f1fd17a33a3c75b7a00a25cbbaf173ffa076f4d6a614d996caf2d0deb27b4a2eb02281fb0fd6f6d63539a7bd0df103b62b16fbbe44f65d
 MISC metadata.xml 229 SHA256 00bb90e6a30b4ab5340c3708feb0bb6b0798d2f7872fb5da0d656a76a223cbbc SHA512 1958a1bc8fc8899f6643083c74e314d033e613f00c5cc472cd20e8415484ae3340aead637977cb882d3a3f0b3bceaa5764908bea3e1e0956a9939bce176e081a WHIRLPOOL 2f5b8bbf6f686ecc33e2060470ce689caae510cc1f1f7a6ef7b84e2625e7d819dfdcce2620be04973c65ddcaf7ba4566d47f71fe7bd3c691fc1820b4c5aa57c3
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0
 
-iQIcBAEBCAAGBQJT5RxpAAoJEC7dUkA7aK9HGH4P+wTpHxLwhhUUsZbI5bh7wh3k
-6yEp4SNPc0D6owOBduleS0+fodBW14s3EE6nac/iiFJQJtfuAde/a4H3PreCOjiZ
-nRmtloUAZmxujKoWVk7fxO6p9tEan4vtLzCLkr1S0bJisqGdjN0OdmYNeRGSfvHg
-oiaDBIEqkak0cLOQ5oPe/rr/ds5MvJdg5etpuFFgOJPoS0U5u1yAj5aEH80t+iDM
-+JBmclLlBxlgRGQ1No7+Inr60h3NYz5UNuNI4tASUhVAl4ZHO6tOmh4uL9p6SPzW
-nxbSJsidsAdFF9sYyGqnUXx2cOhyi40wXkauYUdIfPfdg19PWwBYuKpko8WgpVf2
-t+rAhtZxcCx1tUparJbcdSguuAFEIR82Gw1214NCa52Ec5g29jJWweOr6j9svVts
-bLi2C28vZb+bKic/ZIoF5NxPmNkmrIRpK1emTO28X8Yu2tTtcFBJMs5Q3OS5/6yZ
-gWC5htBRsT76UGarWCzWK9aHAqhQrrjj7TEmYYO6hkPCqnEFr3BawPGn990h6cul
-7lVsOAEbfUfx5DMBujpwC5XnhpSib+hKQXSmFozX+q1S8Zy/Tdoo6E6x85Tm9Fku
-oNVZ1iJid40sLf9ezegs/tCi52+gfSWLxJUG2l/8gqSlUAzPFCZZNmzA70E/9y/N
-KV21Mcz3JiKjzR+hVWwL
-=6TOk
+iQIcBAEBCAAGBQJT5ng7AAoJEC7dUkA7aK9Ha6UP/jON3M4pZm5wpOj3mHu03TjM
+3RMMUDV2iDVHQnUxfuVHDcdQhdJIUbFeUWb+UE76UtaL/Xvy8Vi+dDl2FvBlXVuZ
+vGUhPEOOr/rRfVP8jiGEN7vsgXGQDtlPqFKQZYTLpysxBHnwWx+QNp32zu9drZoS
+kucM6Q3bbCADPPHnbs3ZvZ4fSOZDiu2+emfE5YAy0pUAshZEGLQG67gV0eKkCrAV
+oX2lpCmDKSk+TiognpCR0STX+fmrpptox33R6tNAHgH/AdUoJOpcgLZ4yTZoYMhN
+gkiuO+xiReGLa5igzOcGdpZEW6XOF0yK/kjuOK3L7kbYjv8oqDqunjrE5q5fpBa7
+aiYEUfH22ZcY0SlXseQkdiN2VNtTm16ITpFgOo2fQqDy7asdpmubHsInbKhBAnl9
+0vSMNuwv2RC7FYzHqv4YOpgSFKpxQ9bn7GkHOIn4+TmaKaQw6CN3HrIZZqSLFxRk
+jvHt23m7WZVEiskw2ScLG+W2JeHSVAtceJQ0BiXVSPcvF9qGiiuFzmMpr3+4xbyU
+bQ9B/+z1APOS19WiwOemnFRtBz81mhYFVjswCAPnG3U5lJziHV/rdbAqQ7CpSoQh
+G12j+Gb0J6stPGcts8vynI57b00w6FbIbgssZQ6bvsNH5/SAPmBLoK1dEjq9PsWC
+XGh3GMacO8JvzrL8SY0R
+=W4jj
 -----END PGP SIGNATURE-----
diff --git a/sec-policy/selinux-dictd/selinux-dictd-2.20140311-r5.ebuild b/sec-policy/selinux-dictd/selinux-dictd-2.20140311-r5.ebuild
new file mode 100644
index 000000000000..94b3d23baedb
--- /dev/null
+++ b/sec-policy/selinux-dictd/selinux-dictd-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-dictd/selinux-dictd-2.20140311-r5.ebuild,v 1.1 2014/08/09 19:34:09 swift Exp $
+EAPI="5"
+
+IUSE=""
+MODS="dictd"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for dictd"
+
+KEYWORDS="~amd64 ~x86"
diff --git a/sec-policy/selinux-dirsrv/ChangeLog b/sec-policy/selinux-dirsrv/ChangeLog
index 0b756311f57e..21fdfd805df3 100644
--- a/sec-policy/selinux-dirsrv/ChangeLog
+++ b/sec-policy/selinux-dirsrv/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sec-policy/selinux-dirsrv
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-dirsrv/ChangeLog,v 1.24 2014/08/08 18:50:01 swift Exp $
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-dirsrv/ChangeLog,v 1.25 2014/08/09 19:34:28 swift Exp $
+
+*selinux-dirsrv-2.20140311-r5 (09 Aug 2014)
+
+  09 Aug 2014; Sven Vermeulen <swift@gentoo.org>
+  +selinux-dirsrv-2.20140311-r5.ebuild:
+  Bump towards r5 (fixes duplicate context for hiawatha)
 
   08 Aug 2014; Sven Vermeulen <swift@gentoo.org> selinux-dirsrv-9999.ebuild:
   Make 9999 ebuilds EAPI=5 and transform to make master for version bumps
diff --git a/sec-policy/selinux-dirsrv/Manifest b/sec-policy/selinux-dirsrv/Manifest
index ae6920d3d9c4..ca7401fa18d2 100644
--- a/sec-policy/selinux-dirsrv/Manifest
+++ b/sec-policy/selinux-dirsrv/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-dirsrv-2.20140311-r1.ebuild 387 SHA256 e7b4320609aacdc646f93c2788cafedc4116ef44aaaa57d28f2eefe6161443b3 SHA512 ac33a201e2cb7ff4efbc150d191572ebc45da27d7b794369313e7e18f79e319d24bc62bff68908c5443ad2878b2feaec44dbbc49321bd6ae553d8b75d76ada46 WHIRLPOOL 25ee08002ac8f7c91b0f1c298a584d3b1334ffe03c5fdeaede240c83bf50ecf9397c91c50912f9f258139df5585b67d911c8048ca39b850c30b2b3038eb7dcd2
 EBUILD selinux-dirsrv-2.20140311-r2.ebuild 387 SHA256 0702b359f2c898896cc4b00b84cd53b3492c9e10bf2c62cf18e98afb311af6ce SHA512 a6e027703015c2e7e67eef92f66f715e1f737a664f1dc07012d5b3f378c45054490738e62ddc5cb54761469403b5ca165ae71aa62ed3ab9a4cdb0ba2a3c81ef7 WHIRLPOOL 25af050d236d099a23f478ccedbb858428994ec8ac81e7bcf52c126de0baec97e0b6abb98122fdf574bc5b0b0f793edec97f05aadb5b745cec2368e09e4bf501
 EBUILD selinux-dirsrv-2.20140311-r3.ebuild 387 SHA256 816fb68d3096dee0c588634fda6c10d3cd3ee3b699010380762851c93efb740f SHA512 816aad9ddd4df038e93a280c52abf34fc4d211e03283257af387aa0ed171ed1347c0caa90fa046b54b7cf546e797c10a312070572639767bc127de27099d5bc3 WHIRLPOOL b4322f638abae6a95b17f8149588e0d73dd76356ab92f6d7b3fbbb2961fa806f775f367aa2cd45e8db12f6d73e1434677a6cb80f2c65bb5df3c7a2a376d51367
 EBUILD selinux-dirsrv-2.20140311-r4.ebuild 389 SHA256 8041626420ed53681d1c9275fe12988c80fd1dd1a95df0f66b24fc70524a7187 SHA512 1e3e16ec3ca1e06c08114b42be824f6730a72e15f0b79f9d3a91aa757d0d97b967cc39a97c26ebb1b90b5dfc27d0beb85d39258fba0aeb2fffc41d8f75a89722 WHIRLPOOL 142c032af08bb13c22ae4e808d3dde082085459e30e90eb7170d7fdeb4817e5c9ecd3d6c7534deed95f392709ffa9fc9863bd0500c208ce530d7298e0779fabb
+EBUILD selinux-dirsrv-2.20140311-r5.ebuild 365 SHA256 01b04808ab8692ec16e04a3c5d6ea8ee078b8d7551d9edc115c389df5b71cc4c SHA512 d1a2f72a1a2f61b2a8a5d0f11a0bbb1af831d7e638e942cbd92a544b860df0c33de794328e161c27eb3ecb13f890e40b45316ff3895aa9740116ebe6d58f3db4 WHIRLPOOL e2e30ca8c7f77ff72329109f879a5c46f7bdb5d6711c03b4aa3ecfa01959be4c12e8d43edbfaf5d7db3dc39479c72b7daf87cf7781c54f16163974ea536e752a
 EBUILD selinux-dirsrv-9999.ebuild 345 SHA256 64360a3d949bfdbfa56aef9119ba8ffb8c66c610bed9ecb629293ab97f158263 SHA512 267bd5c151ebdd263bf88c70be980b9ef6d2d98e01334cb9524a43339c76a840da24f12c338f7784db64ce883e90629d532b7a7994b00828115929882a7f7ed0 WHIRLPOOL b4135c93caa4a740e34e3a7bae38815c3602915cc6d662bf20c3c5bc56ffcd52a17d2324917058ada801d1a7685aa5a8ccea96329726ff724c759316d509cadc
-MISC ChangeLog 3909 SHA256 f598d8a28a0665070ae6e80a6498f3115447816010edd0606431e9f962db9287 SHA512 87c5d87a770f0928495c562ba0187a4864dbc07013cd027285bc27ded3d39b9e21042f56989b075b592a2fff2abd6dc1348fadd25f283b525231b92cbeddbd65 WHIRLPOOL 3e6d6632b96289a4f55dbbc5fe50e4d79b7ff9c5fc3f879cfb8204ba06e70514cff980bb84f18189b1532151d0cb106f68d1125ac0a8db40437756b51ae7aeaf
+MISC ChangeLog 4101 SHA256 54b9025e43edb3a9c629ce7a74ee982d88963a9a504cd0ca267174f70c8c60eb SHA512 d6064161597d302c902e90c3871d0cb1179e368e987cf56a260ff7de81cada856e94b05eeac30e8eadc3426f1bb394dc50b9817cbe68581b9a5970ec71700c96 WHIRLPOOL 0233c4d128cda4d84784508aee1b05b79e8d905efb63a732a9fcf9e95bace37d027b013ca91284ace83093d8597b3191857fbc48521a287085599946153ad07f
 MISC metadata.xml 230 SHA256 f7a24e9bbd016ebc80428686fc658e5b274cce2b84a4781bcb128297310a1c3f SHA512 adc05b831ef9b2f3287249bb53fd628e23d7cdb838e57129d01619e2037a36992ea07b49329a231356393a58e10e8542ed15b3c1d5f2ade81afd88bbbc2d2542 WHIRLPOOL efe6bdfe787a12954662b12d443c9ae4d0577cba564802b4b8ab1f72952edf96bb4a419d8567c147173214077abd2ad78ca3308a6aaf42e69ba611799028f347
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0
 
-iQIcBAEBCAAGBQJT5RxpAAoJEC7dUkA7aK9HiFAQAIcrpkDyjIhcGEKk04eyDBG4
-PfqreIv1DaFaybij6Qh0a2Es71ZcRTK1FSnUVM2FtqVl5/DZX+q6ecK9msZZpERo
-eW1yJZ0YlY2qgDv+bNjocqnh0zK2f4dgsHv+SowWCzoILdofMmJ4YNgVYGHgqZad
-teARRD6R8KyaUfXOzET1oE3DeJwC51cho5+apOrSpEOeWKi3RRgvopJgujFaQoja
-Z85uH7Zfi1ybBCsw7Fgg0gbhKEEBI0odKOA2sSc72jGV2FxmLe5EnGhG0NSWMhAr
-nXNQbwNxLkpPgi8zNB4q1he6nd9tqeMjw5M7uYzvIirDjG9mfRBU7sANoA1AVcLe
-1RjTHtuO7NBgpcHX7ZaxCt/u6dUy0/EXskBZR9pQecKGPp57CrsCTruiEYxqe3wu
-P82pDBw/sMygk+0Vyr4NcW/UzG2GVV9KIqyz0kh5RWUyJTgXMqpK+D980eSZxYKN
-m9AOfKiRON8jsLI8AHeUPH8PTime2U8b+UizESHjrfYvJJwwDAyqaPatj7LeHO2P
-2oo7CYNgFCDIhqogbUsfwalv2X4vJp7a2RHtVlDQL++GQaEqN1+VD7nxcw7hf+ZI
-Xa+ty9FnJEnM84UL07qj7MCq2JfDCW8knc6aIEUcTrNstV2Vna21qWy942Rxqjn6
-F2vRsIgNaIp4mgg2jirW
-=qF3/
+iQIcBAEBCAAGBQJT5ng7AAoJEC7dUkA7aK9H1RMP/igAn1ZaSPeOIX4VY3VZ0qPc
+m5L78HMoDqkvxA5zrW3ISnyzy9/ee/YQeubWfIDl3z5WR0tJ3dn/hciy2beCf67s
+OHwf7R38MQpJ+nXbz5kblr7S9+B8OwSDkpWjodLvQASKNCNRj8h5kjSRaHuWMLAX
+EygvmbpIjzb7OjHRHM4VVe45TU8mCgDMKjlZXLvdiCfwsogt0lS/yA1KHX/yk/F6
+I0BuoiYngUuNyNmT+WU5N1qHC/OTENTqRAIeH4H36seveLHRodHxJMfQKAJ+2ECc
+7GsurnHltMEi+HKIeAHwakw8RGhVzh8+bFIHnv32GZyuBcaxGo2vNawgeAz8vpwB
+b897vz6W2jobVUVfLQKdij5mvMCxvkz2zziyUnvfRsMDvVSqnRod0U1kvsfcJrDp
+TQI4iWlf+HBXJC1FVE2p/9tGG8vwlL/XgIruwa3t+iSWU6KJfSbBP11n5JfVs8KU
+ufnxJzxv2HRbkjNBajynlGzJnTSP2hbX09Lci5esOFdRVVEclzfxmd4usrwBGX0e
+nA+QDx4RERDCruPGqppWCt6TTjfBLeiGGxxQ+J+6QgRJRCkVuIheokJQPzXfX+Ej
+WPZTCJM9cELbP5KnPK/dMZRqMHAQmU3Ur9zdNR2asmv6vtp3nPriUHJv/bd8QMFC
+J2cARAUsb8RHjlmdZuJh
+=LwE5
 -----END PGP SIGNATURE-----
diff --git a/sec-policy/selinux-dirsrv/selinux-dirsrv-2.20140311-r5.ebuild b/sec-policy/selinux-dirsrv/selinux-dirsrv-2.20140311-r5.ebuild
new file mode 100644
index 000000000000..59f3a8064dab
--- /dev/null
+++ b/sec-policy/selinux-dirsrv/selinux-dirsrv-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-dirsrv/selinux-dirsrv-2.20140311-r5.ebuild,v 1.1 2014/08/09 19:34:28 swift Exp $
+EAPI="5"
+
+IUSE=""
+MODS="dirsrv"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for dirsrv"
+
+KEYWORDS="~amd64 ~x86"
diff --git a/sec-policy/selinux-distcc/ChangeLog b/sec-policy/selinux-distcc/ChangeLog
index fa8c2543846a..fa8ba8523f62 100644
--- a/sec-policy/selinux-distcc/ChangeLog
+++ b/sec-policy/selinux-distcc/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sec-policy/selinux-distcc
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-distcc/ChangeLog,v 1.62 2014/08/08 18:49:23 swift Exp $
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-distcc/ChangeLog,v 1.63 2014/08/09 19:34:46 swift Exp $
+
+*selinux-distcc-2.20140311-r5 (09 Aug 2014)
+
+  09 Aug 2014; Sven Vermeulen <swift@gentoo.org>
+  +selinux-distcc-2.20140311-r5.ebuild:
+  Bump towards r5 (fixes duplicate context for hiawatha)
 
   08 Aug 2014; Sven Vermeulen <swift@gentoo.org> selinux-distcc-9999.ebuild:
   Make 9999 ebuilds EAPI=5 and transform to make master for version bumps
diff --git a/sec-policy/selinux-distcc/Manifest b/sec-policy/selinux-distcc/Manifest
index 6291732e86dc..f69aee88e2c2 100644
--- a/sec-policy/selinux-distcc/Manifest
+++ b/sec-policy/selinux-distcc/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-distcc-2.20140311-r1.ebuild 387 SHA256 3938e175d85f262ae9bfcbf530f0d12664fafa058bd167e625746c7826d6760b SHA512 f5e2e31013167e37d28be4e18e390809adc9bc7bb9c8e60eebecf498dd59e368fd21a9cbb4162a223aee4da3c13f55bdfb6fc16073f21962d24deea83f0424b7 WHIRLPOOL 6c5bb29f7f7eacd9437215ddbf8d989cec9fe7ff76f4a91c536864e9e967e664941d5376de9fde000d3ae3f69015c3b9b1a5d07b08418be9203e0adf57dab6de
 EBUILD selinux-distcc-2.20140311-r2.ebuild 387 SHA256 1d15325fcec027c4f9d4f123ee1e06f8b5f2c54e3121d0d8c78c062a3ed4b0a4 SHA512 45da048ae13fb89d46b795efd7efba0bae59502592be2c8a6535240042ffe499f92290458fe677b883d26af79b86ad879f4809373545439d36ee5adb6488aa9d WHIRLPOOL 634a83c30049abc26943a84ff42a20493bef34a8372060cfb84f35a29d34cde4cf3c0768036fcf489901474461c5562c824f09b5fe4cd4c8f72ecf6f1f231f78
 EBUILD selinux-distcc-2.20140311-r3.ebuild 387 SHA256 54442fd1bea98da4efe1d7ccdd145abc86e6fef19005c52fe4c4bad2d9898a80 SHA512 262b83fe960fa30d64b7e62aa5ad23b0a60c8f6818a88a4d27bca1518f1712d2906876691c21887741f60bd020c7c3a79d960c44b1521284d68f1a51fc93615d WHIRLPOOL 4e28315e31e12d4130354eeba03a7066780c5c36f93c5aceeb844306da6807e223f362cbb84c755cee6301b2418b1b74a1318c030411252f976a4da3366003e1
 EBUILD selinux-distcc-2.20140311-r4.ebuild 389 SHA256 517333efa312486870d34551a327750f98ec98b6c3dea5810da2f829c78a49ce SHA512 c28693a042a7c28082d10d58ee229a167833800432752a356b3a2534419972669a1c15dd9cded7e7b0d4b813740ea1e71474b22522f40f6d8c7ed5051eceabeb WHIRLPOOL ac0b3f1068d268c22e2e02366934586bdc4c78bafc94fd85a1a0b1f944dc420161b92a2bfed90df620d04c2517e6fdcfa80a562f33951a7b6472d971deccebcb
+EBUILD selinux-distcc-2.20140311-r5.ebuild 365 SHA256 293d887548091a0d89a6ae545125638021babf69a6d7cc5216a7139a6bbc0fec SHA512 3b346a44c7298a4c1039e5c0e70adfdb75688260f39f48f9a6e7376ecddafd4dd08f63dc89be6234fa5661dce7fc265d21bfd83befad5e53b2f68302da77d444 WHIRLPOOL ae49c41afd7d73dc43caee2ec27a50da0ae3f209f07f1c50aad726d76e03d0c761eb253452b228241a7c4b9b4b8081f3ae7c98d5f346fd16085ddc6227c88e5c
 EBUILD selinux-distcc-9999.ebuild 345 SHA256 d6e211792480d6b4a7f228955927f5cf3355a36578dde2ce9e9006cedd5cda9c SHA512 1ae31843136190d5cd6395bbb02e6c8d9d0ae316a5206c98fdac60cbce98a7056fb9cc72af01bf269680abb72779d640e3c71a6962e58d4646fe6870bf34486e WHIRLPOOL 29acdc2d04557662b53ffec00fea9943f21307fdd67b25ef2fa3968a03cef26cbadbfeda9daf4bf5a3bcc59eec3846eb40cf73a152617ebf9ede464b979730d5
-MISC ChangeLog 9307 SHA256 3db3d5be6c181e38909e286ce0cf1e463a1eca890aa1765a5ce1ebfa914dbb99 SHA512 121e5b0a1c10bc58abece00b7d6a63c342a7374d843e7220eed64897aaee512e975dcaf4f1ca31f8ac0985b3ac0673c6d73f509d4104842a14c8a3c46199c546 WHIRLPOOL 67aa956a25479aca3e4517bc8ffc32795bf373c3425a7d777874122eb243e74b3d224c167f0e3c3cf01ff4dd9940dcf4b87e7d0724109fb54524f239c1bf792d
+MISC ChangeLog 9499 SHA256 350525fe40b6649016107f15961931096ffad1b1426d770748cdc5b8b26956fb SHA512 608309e9ed40569baf2dbc1a1d519e9fb5f515174a187fd7d116f66f747f657d4bfe7ca6d30cf79528c4da161131265ec9a9d18e64ee336eac0139c11c49a45d WHIRLPOOL 244a8ef6fc2c7d4aebe450b49450d5868b9843c9f9695102c926d385481393d4982b02fbc78992e1dfd991dfa2e73b237a6c3f482d40b7659d0ffce387787992
 MISC metadata.xml 230 SHA256 130f87d2516f5c3ab03d32883f62c2ce7193f01fccc1376c1e6f9e9531391ff1 SHA512 ef8529e62abb702688f086b461dcf0d36f9653f4dc926567bbc82ea5986c9e30ba5a8929aebbb081806770af5c509b92c2d58e82d6fc5d29b9f0b03c772c565b WHIRLPOOL c9d176cf612869555b103213e07daddf8113664d1d370c19365391638a7e14c546a6639df4fd98e70fac6eda89ad7c297c313bb2eb0bead872fb51ddf12e41eb
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0
 
-iQIcBAEBCAAGBQJT5RxqAAoJEC7dUkA7aK9HhEsP/RhaSju6khkc10zN2gdCSkk0
-UoklOMSf6EXNRLP0A+O94MWsNn0BFRnNxp2IGM0nd0WoD3ghp+LsvHnp5uVwEGHQ
-z9DTP7y78CH5zp50+3falrf4GjpMWDi3UJLrOi+hKgXAMWoE3WQ9G7H6EnPldHlt
-MLABq9wNcIKtCvD/XN710jSmUfi5FkEbETjeoKMjRjhp8cLU6nTb8yqHC8ggazCm
-J+yYtNgpzJsJ+3gX6/INzgJavfhcRUekXEmh25kTMoIDPF36Luy6HZB+4mgb/I3W
-MrB5+7Q8qCKp4/X4ahbigcJdWcoFeLQ6U/JwLzbWKJOLVuBlyE01Qzy4DpLGi6Xl
-KQblg2w0clxucp12hEzEB+86vQzez9O/JIC0hqnF6zRkoakwJcG6b5XBwA1iFuf/
-s8ZYs5ZsoQP4EbgwTLpZwlWNvDNcm1GOeTEL5SicNO89nBZzu3qIeRuiVij2CvVP
-mfYsK7XBFNEV1yl6FtroBrK/gU/mU5RCm5Wp5pqlTej89a7YGCDptU+YmgTrB0Ak
-hCx9bFupBnRFbN7sODAV1tDKmjbDCUYosEtzXnNRymrLTHu8dosWOEtIKCnHh3LC
-n+ens8PCTgHYsdwH4oMZyFJMbEj6Pti6cXf5uzAHYwKeB5VV5Ddwj+FLmaCJ/AIh
-fT7O5yiZSlkRbcd8DGtW
-=b0gP
+iQIcBAEBCAAGBQJT5ng8AAoJEC7dUkA7aK9HPWcP/1pPnPkZYZd+CwQ0VTXIAYgf
+D7pvg2ED/YI8CeWV1IsQqpU9SExheuCHPzYJmQcI+DSbMM9BNZjzfB0sHgM/VTPf
+5yc8DSiXO8ch7cyXwWDrWjdn9+FDkqcA/ucD3b3a+HFHeqV7Bmy9qy5MlQEnc5OM
+H6GFfRujjSQs0iog81H654n2kjr92UxMGM0yU4yz1iV1SuFb8X3gQhmjjCmPr8up
+MHbQr4G3zHtBLEp/D2TXAlGT6oxr411FxbsPayiFPpwXuuPPdwNuZNJIargjCtD8
+CHuU86lOzsZ1ZfksKm36wx9LQHxZ2U8WSHXS0tZNsjb1dlTnUVuqqX5GbxpmzJ+t
+kLP0ZYT7tV9BceZIFRBiENwXVrDsRSVOdDTqSRZ1DaQcXmWogGPsxt9EV0XsDg+/
+Vv7lpXgjibMsVJw1DkBgvca+uf55UhhoVxm2G5FpGmmT15dSYHYtR4dHe8lG22/9
+U1l+28iuD/sJbG0c8zwV0reENP5DNsTbMpiyAuqX6pwFTTAqkc5SW4U/URfSZtN6
+Cjd4TOuWfOb1CIqwLsUGjuwv2IZ1+dqPucgGtf4V4M/8SQKBcLb6nomDl5sbz52l
+6mhM8Lkx2TJ9mqiwvuokAaOsjKZTHFcPKZs5XRY0n4Vf9S97CtngEu+VwzgcHo2c
+CMRegqdGwNJ/bBK5YgCo
+=6tf+
 -----END PGP SIGNATURE-----
diff --git a/sec-policy/selinux-distcc/selinux-distcc-2.20140311-r5.ebuild b/sec-policy/selinux-distcc/selinux-distcc-2.20140311-r5.ebuild
new file mode 100644
index 000000000000..b26e46097bf8
--- /dev/null
+++ b/sec-policy/selinux-distcc/selinux-distcc-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-distcc/selinux-distcc-2.20140311-r5.ebuild,v 1.1 2014/08/09 19:34:46 swift Exp $
+EAPI="5"
+
+IUSE=""
+MODS="distcc"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for distcc"
+
+KEYWORDS="~amd64 ~x86"
diff --git a/sec-policy/selinux-djbdns/ChangeLog b/sec-policy/selinux-djbdns/ChangeLog
index 574e97d977d8..490ec26730cf 100644
--- a/sec-policy/selinux-djbdns/ChangeLog
+++ b/sec-policy/selinux-djbdns/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sec-policy/selinux-djbdns
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-djbdns/ChangeLog,v 1.67 2014/08/08 18:49:19 swift Exp $
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-djbdns/ChangeLog,v 1.68 2014/08/09 19:34:17 swift Exp $
+
+*selinux-djbdns-2.20140311-r5 (09 Aug 2014)
+
+  09 Aug 2014; Sven Vermeulen <swift@gentoo.org>
+  +selinux-djbdns-2.20140311-r5.ebuild:
+  Bump towards r5 (fixes duplicate context for hiawatha)
 
   08 Aug 2014; Sven Vermeulen <swift@gentoo.org> selinux-djbdns-9999.ebuild:
   Make 9999 ebuilds EAPI=5 and transform to make master for version bumps
diff --git a/sec-policy/selinux-djbdns/Manifest b/sec-policy/selinux-djbdns/Manifest
index c56868c1756e..b83054640ae5 100644
--- a/sec-policy/selinux-djbdns/Manifest
+++ b/sec-policy/selinux-djbdns/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-djbdns-2.20140311-r1.ebuild 488 SHA256 25145935aef2b09f9f110c562abb0d0eb8fa054ea5d5d964d84265d2a419079c SHA512 3e81582aea0d47bc328a4ef9d4ddf81e7ef8ed807d6465df16e5a286255554d1165bf6d3b08654b5df7244f1ea6c4ed9f1fef00b7ee09c20e8c60aa48067de35 WHIRLPOOL c3e52a48a09a5c5d961caad835f2bc8d7ba03932f7ddb5fcbcfc5391896534c4f4a433e2a056be92b87161884bbac8ad6456d455012fe652368b9acb1d09371e
 EBUILD selinux-djbdns-2.20140311-r2.ebuild 488 SHA256 dfa835c4dab55319e32f50c4d554d6e4a7c1830d647b278593a2d777f19532eb SHA512 6745c349814c8fc072c95a6f9551c9e84d2ad269d09166867f9ea187d6e50c8cc61693827c38bf0f97c31bc335f3309de5147c8110be7dde74a92832ffe485cd WHIRLPOOL 4b57b65e86085b9f556f89f3b82152d3cd2ddf3f92cfd64af9c53081e8d0b57d8f62d6ee45d3e7acc04f7b4d1f79fc1807eea9de2cb23fc62c08b6cb72556c06
 EBUILD selinux-djbdns-2.20140311-r3.ebuild 488 SHA256 03dabdc9fe04cff11b565ae6dcf86e4f84623d4b72d512bbd2215c9fbedd25f5 SHA512 e41c7df949c7750e67b604f0a6e1768f61761a1cdd962b83252fc13977f8b4013c64d293a6021818cc8d25665e38d4bd8f5d01073a1975df8baa79cac523acc6 WHIRLPOOL 0820cad7315151f79c2aa981da6b8172f113afbffea7fbec122ec0fbb3cea0d8a40b10a52251e4961b3c634fae9ea91f002f8dec969e75e7e3991b0d080ed6a9
 EBUILD selinux-djbdns-2.20140311-r4.ebuild 490 SHA256 8112a81b504f309d01e1002bc1f72ad6da0255590bd5a4f91990dfdaa40e0b6d SHA512 4e3e6721449adf0e87909cf6a02f97ec18041ee9245e2c8c84af20df54dc098f132740ee8c619383a688dc4c3f12dadd77ce28f64d329c94bff06f359739cd15 WHIRLPOOL c148d58834abbc051aa7785b28a7f6e2b373a30407b07e53e96cda8baa04c65b93e86d2a337340b3bdbde31fbc50031d792a3e39ac9f19239ba5501fbef3af02
+EBUILD selinux-djbdns-2.20140311-r5.ebuild 437 SHA256 5c5af5ffa75069a11ef9e38dcabd39ee7ff57b12d4a017109a8ae7d4d10c7f37 SHA512 bbc5615946ff4bc7ec9784b2e21002b0b2d98d51a8b1c5fe0750d3d12422fe118260df9cf0ba465315c353a65f399057a82e827d7e37b2044568e8d53136f48a WHIRLPOOL 8d875c13f9e9b747a10714094014fdb30f7c17883d62e81a8eaf26db46cc2f16c37eb989d22afda58ab70c267eac9c3a029b49575094668605b80a69145cde95
 EBUILD selinux-djbdns-9999.ebuild 417 SHA256 3474b153c93dc2527f4ad4c3576d688827ee99df27fa72283dd6e99ea16a1bc1 SHA512 702ad721eb2c132764d57dac85059a6f8b53efe96246024ef50635cea3755b729368d9eb3a8807c7005839306a1a475bb8f3f5b8736e2d502e22d27d689a7e4e WHIRLPOOL 20e4a645bd2925989e47ad1c34f7c97e76702458115f40db7f01c26530d184a119226c573b278dc81034eda4c05cad22ea871411190497c41aa9627395fac920
-MISC ChangeLog 9924 SHA256 3813df1b8e58408eecec969d0885cb0f39f3066cc325485f141cb13c46c97e84 SHA512 74931f3115372fe3c01be66533b963cc11e6adfb2930c8283df6e1dc435f992b0d58e31893ba77ef3c38d74fb5ec4924f10b40755f0a6a19dc3f43cafb01046e WHIRLPOOL cbd85d74cd0148fb775c83dc064a917b5fd19607993e12acff56f4ea4a48c64c7cab9ef30a12ab57f7ace5fd3825b5bee12f5e7086d17aa21b7eeb5053a24ee0
+MISC ChangeLog 10116 SHA256 26411535ea92fceb018d7d66a61a610414d5b42629a26d3447484b10788933e9 SHA512 b65387d6b238ef513289d0cf9f571c835b3625f3dfda38e78d74c33dca1e35c331ad2b1eeb9bd61d07decf537f508af6233dbe8242e33f94aab53673d9b6f065 WHIRLPOOL e83eee28f97b3c62f60092d0e80e7078199d49961aa56243b3163a974220a94eb1ebed02d06b91884138e7b84e802e73147d776f76affb83ea1c37520c98e227
 MISC metadata.xml 230 SHA256 572fccfab35a3432769fcb907c5b2d2a9b406a17f82e6e051ab6cccdb75eec24 SHA512 2286b74b1285a259a7a7d416bedc05727ce4957109096cc560818d4605768a2903ebee175602f30e73650b8b5850cb3ccff8219c829e96d4784974bfcfb5d509 WHIRLPOOL c620eda01c5e93a9835f8950b9fb8c77ed4e2f0bf3393053a9cf4853edd1d25453e572b67b6c3f329b4c4b657176db9f0b14a7f6e2422383cce6303ae3a1a206
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0
 
-iQIcBAEBCAAGBQJT5RxqAAoJEC7dUkA7aK9HRJ8P/3FwSBhMTKuaE5Z2hpsGhMeb
-R+uuxv9yxvshz4goZjb3n74V8I5lxsgXmRCq+ENakNvWNDtcqKPabtQsyVOCW3iF
-Q8hSOraQ4NaYosQPuY/5DQd7pGVQ1Y9uRlegmIXVzzjLr0+jBRO/hPi4/PelJO2q
-uzDMbu6H4BM53iHVLsn3UVZqU2Z7FLKVvItT2a3Bpbh7m+LxwMzHZ/9yqyIio8th
-qcBvOkiRSgFjZeqTwHfFnxLarPPp9ryvX1A5vb+UfXURBsTGLM7r3myLfvkIMxB7
-5sM97KJuu+I63CJ7QRfP1tKp5ArXzpn4l3TaDzD3vVDVTxsjH2DwY8w8Xx7GeSEn
-GLxzhQzsTBBnrhK00LHrVJZv52oOy1948ErjL6P8aLE8ofI/kE0MuIZqgqNIhW0r
-kzz7gTNkBTy7Uia08xtqjSIRAxRsjtMUjlzafWH+xeGCxoHf6qAlXKEu7g4kLspb
-cVCKq9+yjFEqRrgdcOFJeZ1gUmJGglOwe4rPqNJ3hOSU1lUONCr5FtEnhpzEk/L+
-6+O2QpLDOaiaYdoMlOE1ySKVDqxRSh5oumWBqoRGpkr6M1hOhz82VHWf67a/XKY5
-MbO8iuqxMvKTTm0XL93nFjjsOM6ptaAx8aNHHBw2fz4MUQ6fPxujuZRjykiH8uTh
-ZzK/zXOOR31P/scBdz3x
-=atnv
+iQIcBAEBCAAGBQJT5ng8AAoJEC7dUkA7aK9Hpp8P/iWizLDxanu9XoIBJmqUTwGx
+fQ4XqxmS7KbUwXI5kZlVLlPlHrP6k74WF/kKBSR6ZcFM1pSSTmTX/b2K8oafLNvl
+QL+ECn51wsABKyEPbthHjVFjCoGBz4kjJs7WBD9dF90LrkWJ8R2EWF4TA8skvh/p
+vzD2Uvitl1pZH9ru1RXUkeL1LsQfR3YRxePBY6xMzgnwJwGLDgwB6+02IhylcNzA
+BXWc3w+nDoXE/TMv7vp1MKDQ9OxcVaOreoEbIB77yGMhq9VtFRTCEwpxVRLlVm4/
+pmoRPUGXns19PJrU4gCv8pVCvPrGaUDQ3AKk7unrLhhzsA/UJIgKKJq/m3Mti6hO
+3EuSidz5LUPL48LbsT4MDvXdyfEK5vmhVjxj628muct7a2BH7/mBOWFe9wc6CkJU
++bC8xoA5VtCKAoTeZSD/4Ixih/vP7HdTrNDpoWQGaBA7razBHE2tfwYWdB4XSo5i
+Pi/nhX6FRk6QFQ8+LM56Kr+69FVj6mIWC9d8NhjKWIInn1/QYFzjAmEkm2NfHDfW
+YNmeixxO73zUyzdVihrxjFWiJbv2myZb48PQUBBq6wFIuRoDJQW+7Wydg0xXCsaa
+rGTpsjf+MtOXqLlRSv/D95E9uLd59XwdZW028slvOcK80+iISjQQXidLBz9yjv6c
+LjxKtmJ0fKIbmnXJCuDv
+=9xi4
 -----END PGP SIGNATURE-----
diff --git a/sec-policy/selinux-djbdns/selinux-djbdns-2.20140311-r5.ebuild b/sec-policy/selinux-djbdns/selinux-djbdns-2.20140311-r5.ebuild
new file mode 100644
index 000000000000..c88f59ba42ce
--- /dev/null
+++ b/sec-policy/selinux-djbdns/selinux-djbdns-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-djbdns/selinux-djbdns-2.20140311-r5.ebuild,v 1.1 2014/08/09 19:34:17 swift Exp $
+EAPI="5"
+
+IUSE=""
+MODS="djbdns"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for djbdns"
+
+KEYWORDS="~amd64 ~x86"
+DEPEND="${DEPEND}
+	sec-policy/selinux-daemontools
+"
+RDEPEND="${DEPEND}"
diff --git a/sec-policy/selinux-dkim/ChangeLog b/sec-policy/selinux-dkim/ChangeLog
index 4ae7b156fbea..517a06842f5b 100644
--- a/sec-policy/selinux-dkim/ChangeLog
+++ b/sec-policy/selinux-dkim/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sec-policy/selinux-dkim
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-dkim/ChangeLog,v 1.42 2014/08/08 18:49:53 swift Exp $
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-dkim/ChangeLog,v 1.43 2014/08/09 19:34:31 swift Exp $
+
+*selinux-dkim-2.20140311-r5 (09 Aug 2014)
+
+  09 Aug 2014; Sven Vermeulen <swift@gentoo.org>
+  +selinux-dkim-2.20140311-r5.ebuild:
+  Bump towards r5 (fixes duplicate context for hiawatha)
 
   08 Aug 2014; Sven Vermeulen <swift@gentoo.org> selinux-dkim-9999.ebuild:
   Make 9999 ebuilds EAPI=5 and transform to make master for version bumps
diff --git a/sec-policy/selinux-dkim/Manifest b/sec-policy/selinux-dkim/Manifest
index 65c332bc0b75..b596fbe6a072 100644
--- a/sec-policy/selinux-dkim/Manifest
+++ b/sec-policy/selinux-dkim/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-dkim-2.20140311-r1.ebuild 446 SHA256 7d2bb8bfb9c4e2adcb22ee71a4cbe343d8af04c8c72ef83ffc5d790309f3bd29 SHA512 e5f9e4076bb7cd7d7b4456850b11b872adb34eb4884d794f802a81245fbd1e9dc687e22c35cae1651ceed47672da2f2512e1ee24d76184e408d2db70849e6b1a WHIRLPOOL c982a49be8987da389f68da913f23a4790d38225b2dfac05b1d89750bd19c4f4f3bb1bd16c7f228eb4506cc0ec99a64e05224f3a3c2eea501f8e9f239063224b
 EBUILD selinux-dkim-2.20140311-r2.ebuild 446 SHA256 34a302a2848fdcdd429a094358c3374d3be9941731f4e7690e5343f93e939d45 SHA512 97e6e20a84b9d1cd5dcf92144a2c86e83a7abdc65b996229806ef363ff8bdee7501b331758d0c8cc4055cae1a3718103060e9f9c40d528d2e65bf44b21b3ebc4 WHIRLPOOL d93718c672a116d87f6571beb3113b1da8d0c1625f34318089c5ae13b3481cb023f5caf85c558db6b0bbe86c23c132f6c70d4b3de984df7fd269d629e5b75b37
 EBUILD selinux-dkim-2.20140311-r3.ebuild 446 SHA256 30ce257683b5a30df3b7d028a9be98373694582c8aa8d237dd549815b2796fd0 SHA512 625c41867ada1cc76b7d961a71e7f0f19e4c42d425bf5e588e9ec7876b983626de85d2182472764294c870c3ce9bc40ec614e3c68a63035de6b06a0a529ed3d4 WHIRLPOOL b4631800b627ab9e134c714f8fbe28b8887b8e3894a1306599453c4fa38d10c800256ebc58a4abdd93b23cf732d69d586c6a7ad8cd704014efb1de566651e542
 EBUILD selinux-dkim-2.20140311-r4.ebuild 448 SHA256 fc7afc276ab004cecd71d07acc9e8ffc6984ffb46406ffa0b4943ddc60e2610e SHA512 22326a2506bdb4a5cdb9e2704fb78cb3ddc5d16b29ff57829f5d38e8ae5f224a79780a1b4487b0a842e08788e5c114b2a5e642907f1bb11cdbd9c4b12f679a6c WHIRLPOOL f86c019321be89cccf870222760f1d3e3c79959343ac06af12fb6b0a1f51d6944106eccf3dbc713fc82b127506dc1f19362c3cf2e8d230f09033c8311cda707a
+EBUILD selinux-dkim-2.20140311-r5.ebuild 357 SHA256 c0c54abfa4b46eafab1091637e54f0d319efdfd2e76312691168dc2df5c6adfb SHA512 4e28dfc266111a06f17be9b1f14216ac49485000151e516a605a68c07a661d095ca1fb1abf894efc1f75f0c85074d467dda4a9b276296b241d5b8e6cf1c7e0f0 WHIRLPOOL 3c064ec2744e8b4d4e915cdaec2fece2d4c6822b987a645ce9ee549d927b9c95ed1f2663e0014b456337387d5240e4c64b7477e7eef8dc36009928f1452ff304
 EBUILD selinux-dkim-9999.ebuild 337 SHA256 8165b6cc3e0b9f2b2297eab926dbf08d131f80c62fb2b1dca80a5d3b2e5e5007 SHA512 29e5bbd58d4240ea2b8d529b2a8bddb253e18664655c224790b6ae0857218cc0c24da8082d2bf37be5708a27721e130df78638a537209dfbdc63c6afd596054b WHIRLPOOL eac72828a90d96473c7d5c645f9cd4b5ac6aef470b997fc02c3eccd018759b0cc22c60c323b2a1500e718a707f6214efb2e1213124e26e631da9361c44347fa5
-MISC ChangeLog 6361 SHA256 0fb2961c8fa30441b99e3198a95570a3a76eca4979d2b4b599629c75b86c34a1 SHA512 62eae410d0b91341f668278169656eed08badc15fcce39bcdcd788a20a3ab91d813b0e180cc69991d5a023511a4ecd9f46d377bc0b6e1709a3f8626f792b09d6 WHIRLPOOL aee2f8bd0bcb928291c276008307a4636b7e3990c1ac8a72d3a8a194617b38ebb8d1920c9dbdf0b84beba06c1bf597bf3bee80949b6726a7fd4a8acea769f638
+MISC ChangeLog 6549 SHA256 aa15eeb731dae4bd177539a78b62580c4fa760cb409974ddda0beb112e883410 SHA512 bb8058a642cf7cb252c45a60f0eb27275fd05ed8ea9bcd5805693a790b28429309f196bba7cedae5f126e25e4c187d9d6c9139e6906ca45981d3d62c81dcd08a WHIRLPOOL c5fd4625167778449172564d368a8d4a889f1fd7c573cd703939b6c3521a5952cd22be36cb992e277e681b2443d36294bf19180a497089959e5207327c58fe1d
 MISC metadata.xml 228 SHA256 06baa3d19e8f6756cd595b1658e2295dfdbcf8a540a0ba75f53575ec38f9377a SHA512 d62a2d8352115b2c20619562fff7764e83128953dff02f77ffe18518c2c43f17c10503bff0e19aad561015f5bc15b7b36ea5166c244f916c2e17280d26122b06 WHIRLPOOL 66265cc2c8b9f01386ef4654707f7525c3be4b12a79a47d3e06582f508aa26e10bc2c5be65da03c159324526221e81d63d24bf59a3555f975497cb6db3255332
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0
 
-iQIcBAEBCAAGBQJT5RxqAAoJEC7dUkA7aK9HdikP/18VRJErr4d/yCWrVE3pabg9
-Oh3ToGnNAs76fqZsGO7enWyfmGvOYUPrDq3WFJYjKC90hVzDcbh8PrhbSMgzaCwy
-jPoJ7GY2Kxt6xuYLnLkQRZ8+Tikwy0Nfh6fPhAufgH5SAR1WXZ8aJNWY3/wOMn0C
-iPHkFIdErL7WhrG6ktwJz1Xi4eP/YOS5QuThFFTKJ+3TdV0hFnJF6I3/ZuK1o2GY
-hdMAhGoSxGWexZ11BPDemZtQGwLjKedQZG5uDf0BSO8CLkr8uR9znXjBQfTn59oF
-EV5IJ9BPUbA9DRZhfOdMp7o4IgjWUQcbnfuX/9GgUk2shzIx1GG+JSuL/TCGaCwn
-NllzKdqA9cC/+WIIc+RlUgiJfAITp9cf+gvZlpcwwY0DeNQ6WiRDVM63SR6Q32kE
-Zkp8dN+EF1faVJngG2MErVPqzNXqSKXYA0XM8JJ7UgxVeRecLh2XLXZwYnrCb/R8
-liolmn9iYFZla/8SCkGB4HLaRTB+0xQc2zKx518nOo7F9/6dEjPYOQrq6XvQPRDo
-Z/LJ450fdm7Z2ep7X/U7rWI99BvTJ0YItzLFtdkOsJTQC1KGj4qT+rFdJfu/1VFl
-ReJLpsENvwJnOtxoW/CKwcIw+RB4lwNtnfCULWse7g+/7njUYxJnnG308vWefcP6
-7pYtNF/3+SlBiG1whmAN
-=hSD6
+iQIcBAEBCAAGBQJT5ng8AAoJEC7dUkA7aK9H3bwP/1VPXIITWP1JqeeoppA6w0P7
+0yXvlHDsW6KnUqSmgrj3/4QLAV/g+JNPWx069oCxlhUGiOQCugjC6CDgE97J1Asu
+609wRZsRyFiZ1HnpBtLRvadlinIqHYiMBF1DB7ua1zVq65TitNOPlwne1d2ixIeS
+EOTkD6yCuuphZxETBg0TpUji4pFvx9emrE7xHg8XQgG47i5bw8JlAY3P+/XKbPkU
+7FVac6/0fGQ5x26p2NZBIvRBlHbvOui6/ZwOQYIFYrxctcOl/lK3oCAXCdX7cLzO
+LZw8Db6ZKOVh97OmQ2P/QlRcO7Ngtdn+bOYJdEnDDeVCNJ7DaUdyRWCjrcVC7soc
+hEXvXw85BR2b62jan3Nvc+Ky01dTI6cN//27dWSKmhtFqTo9DxlXCemGYuJP34jw
+Wna7g3YGSeaC51/WHunQ7FlEtFS56Nc6hNyA/f+9SHhAU0DuiuCXQy2NkKlN+glW
+cv4nI2VW485DJWLnyYWBG7EUoc/mSvRt0sn/gaWLDH6Oe7aJmVrmRIa2NVFm3UU4
+yhhwV73bbgWmBz/pGADkZ0vOYBb1XDEOMxKSuP8O9aaa1rAwYhK1eU0Q23vfinCE
+aGCSqI/7d40VBK60XVBxe7bKAZeKzGfxiNQWPwW+HhJz24cvy3WSpPQSz1VvkVA4
+R8dXGXZfgSNtJ7cha0eB
+=nQH9
 -----END PGP SIGNATURE-----
diff --git a/sec-policy/selinux-dkim/selinux-dkim-2.20140311-r5.ebuild b/sec-policy/selinux-dkim/selinux-dkim-2.20140311-r5.ebuild
new file mode 100644
index 000000000000..0a24f71b619b
--- /dev/null
+++ b/sec-policy/selinux-dkim/selinux-dkim-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-dkim/selinux-dkim-2.20140311-r5.ebuild,v 1.1 2014/08/09 19:34:31 swift Exp $
+EAPI="5"
+
+IUSE=""
+MODS="dkim"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for dkim"
+
+KEYWORDS="~amd64 ~x86"
diff --git a/sec-policy/selinux-dmidecode/ChangeLog b/sec-policy/selinux-dmidecode/ChangeLog
index 1df334fb6513..3e85609b0cbc 100644
--- a/sec-policy/selinux-dmidecode/ChangeLog
+++ b/sec-policy/selinux-dmidecode/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sec-policy/selinux-dmidecode
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-dmidecode/ChangeLog,v 1.42 2014/08/08 18:49:38 swift Exp $
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-dmidecode/ChangeLog,v 1.43 2014/08/09 19:34:39 swift Exp $
+
+*selinux-dmidecode-2.20140311-r5 (09 Aug 2014)
+
+  09 Aug 2014; Sven Vermeulen <swift@gentoo.org>
+  +selinux-dmidecode-2.20140311-r5.ebuild:
+  Bump towards r5 (fixes duplicate context for hiawatha)
 
   08 Aug 2014; Sven Vermeulen <swift@gentoo.org> selinux-dmidecode-9999.ebuild:
   Make 9999 ebuilds EAPI=5 and transform to make master for version bumps
diff --git a/sec-policy/selinux-dmidecode/Manifest b/sec-policy/selinux-dmidecode/Manifest
index e05f1a96d3c2..79c845a1cdee 100644
--- a/sec-policy/selinux-dmidecode/Manifest
+++ b/sec-policy/selinux-dmidecode/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-dmidecode-2.20140311-r1.ebuild 399 SHA256 e2d1ed89e92ba164f8b9ce5c5d38f3a3c2545a2094c65ae7acf42ba21b2af27b SHA512 fb6859f04fd13d64d4fd024a557b225bacb66e22fc421504a52cd10020862141ccf3705f156ef36f71a1f72c68099a958fa7d4ac30216968785e27bebd4c7019 WHIRLPOOL 5c219ad54726511715514cda6d40914fbfa5f882962b18d77fb769399268b4b90132192360b322ee46a589bafe7bde6ad7c17bfc3a661f5ffc498c21c79ffde1
 EBUILD selinux-dmidecode-2.20140311-r2.ebuild 399 SHA256 cf160ca10661108158eb8a449dbb3f48da12ddbe07b42d08b397e9ee21d4e1d2 SHA512 692437fca3242f12ea73d998571d1f6f24331cc22998f06d1c154963b09b545915cec3fa5cd571880292f0f4fa031532c64d5ff9ab4b5724ae1d5f969dc59bc3 WHIRLPOOL 0621c56e487020aaae5d5b7ec7a97cbcf96ff8827f20145b15515b74813bd7ec7afcf301ca635b1e290e97b0d0eaa813ce2cb8d8087661480b6d7255a02e18ab
 EBUILD selinux-dmidecode-2.20140311-r3.ebuild 399 SHA256 569503c42b39160fdb17c68b9c5acdc77f31f85900dc866410c7b12fd7bb2c96 SHA512 4b624e241cf378aaa4f54351e6612c44be196979eacfc2f1e596d1ada69c013760c467caed577616d3a68dad532bcd2a864110aa985c8c31a2fecccb61dee71f WHIRLPOOL 3407058ddaaa8f8a1621d7d87a496eefa11bcc09b3ed360dd653dd80d7fa3f60698a6cc4811fd958fe328d396343706ae19c86b2cf0e52d4da9b7de241f7ddb3
 EBUILD selinux-dmidecode-2.20140311-r4.ebuild 401 SHA256 d403c458b7ba8c48243bfa9613d22266de79e0501960c74a13c230d2ccd54193 SHA512 3dff2b98248b36bd5746d61dddff16872dc9e65cc4be9a4af67f3832bc8f3a25aee0c7290e0661556c1d68779c2a73038268190d0e1893853d90d51812a1ecb3 WHIRLPOOL 2a431eb6943a893c06e26de5b01ba95651e9798838e1f7873bbea63e9203e60ceefd43ac36db202f3dc0d5914d18e664ac4550512526c68dbe6381080a1069b6
+EBUILD selinux-dmidecode-2.20140311-r5.ebuild 377 SHA256 bb80059050005adbe56fdcacdd111ac56dd31e9e8b3a21a630c942db7deb159f SHA512 0aa07164a334673d6c7f12d875f141f50fd3185a5a6ebed6b22103ef0b998cfc6305832b6e794c79e2a7020f1cb0e6c68ffa38489ecec346d248d664dfb269d2 WHIRLPOOL a48d1edd781c289ffe4f9389382aec78f698cdc7ab8972ab9ca28f3f5237be87714a70efae432bc23021619eea87872528cdc31c8c7ad0ae9c876f1219bc5a3e
 EBUILD selinux-dmidecode-9999.ebuild 357 SHA256 ec821115377ac64415749cf5c9e3b8725972d774806edf4a7408ead00a588614 SHA512 bb97502e6684fdc5da623db16a56634d3ca245a07efb5cb9603067c1a1f337fb7887d1adc44f2989e9eebdc6aadd67e8decc6862b79fd4fa5c92ac424001f8aa WHIRLPOOL 24ae7fb03a870a6a48b41848825aea48a8299a15b94aa4c900964316cc455d4a4e929b129b628ee49c0b914577797b3ac86c8e683ccb1e3e32c360efa147ce2b
-MISC ChangeLog 6750 SHA256 bfc04bfbc164ce4a951ac4a55b48217f20cf7daf66c15e91b54f17df671324d0 SHA512 569667ca3d131277e1007f46ff4f3dddaefd4e871a7ebc20a1efd4c8dae0ef3a271d3551fa182010265ce6475cfaa8c28ac5eb332f733d53fa70f293f0bccda8 WHIRLPOOL d2859d7b239fef1be3e8e1ea0571feef881cf98c02c50000dfa5926e7aa552882ab4902c45360af2678355d539b8966d21865aef1930f816fec64bf9bf6bb425
+MISC ChangeLog 6948 SHA256 f1d511dda72b750d2493687b56d0a89187e13f17d6a2301d7bdf4a1baa18427a SHA512 2c1fd63f142906b4aa327f45b907950b036b6d612cef4213372b2a3440e404d1b6967a517ca6e11599e0b704a36109092367d5b4743cc2cf420fd337303d3125 WHIRLPOOL b3c5ec4f5707b2d746369e851e0b01019458e0c7e116e3812b3cbad0d91b3a33425e56d34f13b21ad47d99a2eda2879df29ca60e42e35281978b0b0b6f4e0cdc
 MISC metadata.xml 233 SHA256 dbae88e355c936ef888cd65953ec90ee34a6fc4c4734c2ebfce65558c40fcfd1 SHA512 a381db9373b8b54f900163c8bbe9e35dc489f0029209c5b7580943a517dc72c6808489559acbf768b5ce5eec3a097d1ba0b74bbda4eeb192c68c3536346e55d0 WHIRLPOOL 84300643cb0ac80f42664c204a36469f2273d62425cf1c9518223d7e00f7860f74b82a89ef14e8226d030360c13cb094e0f9e3785cb80c610fb0800f43c4d1a9
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0
 
-iQIcBAEBCAAGBQJT5RxrAAoJEC7dUkA7aK9HbroP/RHLKUftLVmjgx/AMQ02ktlo
-OeXZLKQwHfrN+9FaJlaU9s9RCcSArfTeiBXaKFekxEZTCqhgSQ39UcNUlmANsVDI
-GeYL0G9jmqGnNL9s1Dc2zdca29Kh1S8hKI7G0Qh3r+C0Ak8vR4QOPGxe3CXeFx9y
-cVnPobOduxuSyDXtHW619Edcx4KheCAdP+aCI0J5+IFgXF3DitNH6UmRRpBJ9HIc
-PMAEvfOZLf6SUg1wIeO7Ye2pqJITlxAtOjBR/V/4aV74TcPIDfflpayXqSQf0uvv
-Ri28RKuzGfPqsjHx/xXN9irgXdezEh9mJLC/E3D6kBUk+xW5rJ1AEfC56cpNFkae
-T8YVVtMyBs43KEydA9SqnFIVS1edQ96iA9o8YG8nFkZ1GXrCf8Q2MvMJhv6GGmdm
-8dMHNgSPMkf7ugtkI5Qtiqo92nsask2ib0PvP3n1pIDljb1bGdxG3Q2Em5KdNdxa
-c5Gs4d53+HA7YKweNH+USd/Lrcdv01+b+IoTqavFIJrs2VZjYXQCQssXSa8Uq0+q
-jdEi5bLcBsrHGDVbU9vuDslvRtEoFkZ8hhxIe8KIjSm06+18+7KA+QSoPAnX8eiU
-6zG/+EZYFUMabO+2ZYuySoFnsl5ai6fCxAodSCphW9uWE9X5CTD6IE4wr0hwQHGM
-NnI3L+TBVXyBIL+2/7U7
-=aDDv
+iQIcBAEBCAAGBQJT5ng9AAoJEC7dUkA7aK9H6iAP/j7/HYluhVl6H8nWUHipjdBu
+7c4P4lVQGLTugIytlOlZRzD8CtXM5jM7nHTLFndmlHlptaHir9GvYDS7ngfDnPDe
+2vDxNYFqqLyV6nVSqoQrndQ6Bu2MzNDjxxvkfQ/DVb3FeIpGYxddI4glX6CATQ9f
+83VweSSW3WJmx7q6IvkKnmI5IkRbr9QqOnQiVPlw2qm8gpCn8awgX5l09SgD4eH9
+ERPooT8ccaJNzOF4YgThs2w3BTp7hAgZ1OLFYDstOOpN5tH6rVcuMVb5p/ob21JU
+owbPslMxOeKAPebGvj2TJGl8QnQGAsl4CDZ8uSm+FaGXiWbv4yVNIHcZ6YVMIPFb
+bMAmJUu62+WECzUINab8pbbqSjgCiKzuxAT1zk7Zm4SX7Z4UMRo6PBkHGdECh2Pr
+z3U8ksCpjaSGmwLN78a2EhhbvowqJ4hayR/gjQHl/h1kEsP26GHMKTiGeHCdH4DC
+zKXfw+TCDJhHcgykKMfw4AGCdpX7oo/g4Nsng5MNZb8aMyIKSkNoMH3OaIk4pfCx
+eUJUTjfyGrYH/wj1IoWV/bH2ILKWSiHaO3S5rWHlAW0jfxSW/oLT+yJf+H3X9acl
+CHqyFVB88oP3ZZsyQbMG1u4bw0Q066Y2MrseTkSBbF8MXeSJXjgUv9h7v67nEHJr
+zddTkDHUxMw27mgosQ8d
+=VEox
 -----END PGP SIGNATURE-----
diff --git a/sec-policy/selinux-dmidecode/selinux-dmidecode-2.20140311-r5.ebuild b/sec-policy/selinux-dmidecode/selinux-dmidecode-2.20140311-r5.ebuild
new file mode 100644
index 000000000000..b55c7553dfaf
--- /dev/null
+++ b/sec-policy/selinux-dmidecode/selinux-dmidecode-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-dmidecode/selinux-dmidecode-2.20140311-r5.ebuild,v 1.1 2014/08/09 19:34:39 swift Exp $
+EAPI="5"
+
+IUSE=""
+MODS="dmidecode"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for dmidecode"
+
+KEYWORDS="~amd64 ~x86"
diff --git a/sec-policy/selinux-dnsmasq/ChangeLog b/sec-policy/selinux-dnsmasq/ChangeLog
index 424889b5d36c..8aab32cc3023 100644
--- a/sec-policy/selinux-dnsmasq/ChangeLog
+++ b/sec-policy/selinux-dnsmasq/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sec-policy/selinux-dnsmasq
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-dnsmasq/ChangeLog,v 1.51 2014/08/08 18:49:56 swift Exp $
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-dnsmasq/ChangeLog,v 1.52 2014/08/09 19:34:25 swift Exp $
+
+*selinux-dnsmasq-2.20140311-r5 (09 Aug 2014)
+
+  09 Aug 2014; Sven Vermeulen <swift@gentoo.org>
+  +selinux-dnsmasq-2.20140311-r5.ebuild:
+  Bump towards r5 (fixes duplicate context for hiawatha)
 
   08 Aug 2014; Sven Vermeulen <swift@gentoo.org> selinux-dnsmasq-9999.ebuild:
   Make 9999 ebuilds EAPI=5 and transform to make master for version bumps
diff --git a/sec-policy/selinux-dnsmasq/Manifest b/sec-policy/selinux-dnsmasq/Manifest
index 2dab483ec68f..816ba171dbc3 100644
--- a/sec-policy/selinux-dnsmasq/Manifest
+++ b/sec-policy/selinux-dnsmasq/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-dnsmasq-2.20140311-r1.ebuild 391 SHA256 458d160e1741b3016ae99f47e99cd5508b08f225c5e1b9f77b100a7e89d82da4 SHA512 9e963f5af93e8a1f9708012beddc83ef94a5d539b46054d28322dffbb60e0087c292c8a64c0296b4fc58c3fbffec52a9770e91d93900b9cdc4bd29edcc893720 WHIRLPOOL 02ede5e90e51c2c61a62da7077a712a6b3b386f44d03bd3dc4991306a159bed923f2f5131ec263741eb78721a6f4b1a594c2619ac435af342fcc587789055853
 EBUILD selinux-dnsmasq-2.20140311-r2.ebuild 391 SHA256 5d62b11e48039744bfb24946d8fce94fb562b0d41e38261c17f9b42653498ea5 SHA512 2adfa2afd2b40df48f565121c2cbc110427cfc20b84522dcb08e123c43eb8ee51055cc6a29becfc14d560b799fb38617869e92633bcd348602944ba3d466ad47 WHIRLPOOL d226a924c640ebbe7e0cb3229e604c001e9e65ba0fc5711bca7249f610be71a364b2d6d83b1773d46ecb64c472415865a0fa1575a30207992541efbf4eceef4d
 EBUILD selinux-dnsmasq-2.20140311-r3.ebuild 391 SHA256 b40790d6728a83a82433224c752b03d5afbc6967faa9829265c5034dbff78191 SHA512 adf524f5aa08bc4e9e22f66f2e6d714edcc64abcbbd60224b4043910cbca9e609411dfa5145c3eccd6d7e854c98770f941202bbb822068d9c1485bacadde3150 WHIRLPOOL 8590884db936217207d1dfcc2e445ad66e3ebe9b94a9b25a847c46c2493f4beb614733ce3f88cb8eb33307c7157101a2dc6d2e51a023543523e4f70791d021e6
 EBUILD selinux-dnsmasq-2.20140311-r4.ebuild 393 SHA256 4dac597c0a5ced18c11535307b93400be2e151914f9ecabdb7bf303b1fdfb46f SHA512 c955311543b69d42bf1e91b56ebdba9122d51b1617af0de38ee930443a2bf946a15cfb4995c07fc2ebc82c58eb138b637e37b5140bf730c5f3778a67321c8d23 WHIRLPOOL a62f56a5eb80fc70e85c22ac59e7830ab163ac375ae7af9b2d7505ecf9fa59aa1f7fb4fb9fc3bf4543818edb0c4953fb618527c66da5e76544cb546fe2ae9114
+EBUILD selinux-dnsmasq-2.20140311-r5.ebuild 369 SHA256 d937d6910660d15c1a27aecfdf916be9e6daba125945f8cb6b8ed8215334e509 SHA512 14afbd0153314ac00bfd3399f5906a63965eb2118e888321edc709f719e22e93909aacda659c9ee99e3174ee5e038e750cf0672d4ec7debc251f39aff4ad01dc WHIRLPOOL df7753c1104b3357cfa7a63c136161a70a5389ea7ffd38b17decfe766a0eb4b475f2d5f1d6c918a5bcb29f1b9c536bec480570b19efb6ef77afd73dfcf487f78
 EBUILD selinux-dnsmasq-9999.ebuild 349 SHA256 feb7c92e647ae8c81040fd9443c5041a36758df85e2f21e3565efb5d9c499bf4 SHA512 ad84c1b5d7df8516c9cb96ba717c2d89451c5f8aff4b7faf142fcc58c7dac1e34e5566de04ec177da4eaacad877536763b14975279aef8e1868dda6dee7d6acf WHIRLPOOL f21007f6924291b6d169f7a8bed0b5ec96dfa15eb9e473df8e84fba2e28beb84d59c09ccb6e4c4a4efced453706471d93a7594bfb25b3ddb9e0eeb3724257b8b
-MISC ChangeLog 8120 SHA256 94d0a6aea2c9411ecdb2dd7457419afc93288e83de26b9e7eea6da1a5cb8b186 SHA512 6a06e129cd51858f802b163d5818004745483fea0d5a55851fd656ca211f8108e999b44f68d4130893a2e356ae31c37772377eede01b9ce0dd9026ed70474046 WHIRLPOOL 93022748d69352860f03eba04a3ed52ae0a01794d16d8aff24b26cca5b2495a3bc95d55707525341bf0d33a9acc1bdfb91097ca268614001f6cf6de9d17366d1
+MISC ChangeLog 8314 SHA256 43f50036c2e7ad67e2daf603a13285ff012fe58118055e3337f5f7b4a7a4d8a7 SHA512 53c941b7dcf8210bb644851c46d34bdee5d274ed940b333ff8cd829c4605cb7475cda75b78c9a280b324e7541af486d55ea11e6cd1537fefd10a7c5ba09edd42 WHIRLPOOL bcce9244d4f028fcfe0555653d686d6743b3ec7c976dae27d7d573ac90e03124c543a5ba3b318cdb5448d9ac48072a990a45c58c51127e375d303aae489c4bae
 MISC metadata.xml 231 SHA256 09b334b409e62438dbc0bce0a9015eae1d053a34a50d44b7b61c778c0bc95cda SHA512 1e2d64964742e75e6bdfd7409bb8833efeee3f8c2e84d0ec3c8d5ad4beba60d1d2f4cd447fd2a0bbd031f7c717bfdfe601e541de9d9b9432f943b9fa0657de3c WHIRLPOOL 20dd6142a1a119883c1a890cf2a9635ea21e8f27053ee3b6e7a6d603e369db1ebe278ec8ef8e0cc23bb46b0ffa78da3cb4b1c663c920dd821304ad5a1970c948
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0
 
-iQIcBAEBCAAGBQJT5RxrAAoJEC7dUkA7aK9HIX4P/Rss+t0n0oeH9dV4XaSg2T4y
-lq6bwUPp6cELxIZ6FN6mtZIANkzj+gY4VGYvVqMOVKrIuKte7VTt9Xl0ZBkmU+A3
-hFzbtShF8ypxSWk+Hw5iAPfBQ+ChRHY/aM9yqbKwxSOJUNArf2RE/mI+PjIWBmM3
-wbIXQ3GSYL5QAtUyiqzJnZVklk3Shpu9nq+tVNP4nr3QfRNQcrC2/C98BHsTeUyB
-61CInFg6b+jI67WBbWSN+2R3IAY8QDyBUapZbH125Kxjn2XL7C1IkaYOSgVppmuG
-IUVdR9J0azox2bDgR5iTZziKzgtu2wU2bcOtzfQ2qrptg1pB/k5SRxDjWRg7AVZ0
-AeZVgsyI/1yVhF8Nrk+dqcXdADh1decVy2humhaoXfkXqeXPnzaQEHJ8SS5WjD/i
-1Nzc4WCta0vvx15Ni7ec1ktUzOFUr+NA9DDSY9wM74IeV/UxYNrOR2G45wyNh7Y/
-cYFsYkfDiLAx/OCXptdA60o/vdGziIwB1K++LOw/PNkRigkLPmcgPjlzV9/eOiML
-vV4SRVDRoWxIcYVkD9fSwZL4n7QTAQu/+CQjNwDUr03mf5/U3m0wMagylrCacWTF
-UI01F0Bo4ojZjKXUglVYpDIT3G12vsJhiGlKiLT8vtIp4BbiPhgjqvIgchCMDkdO
-thfz4f/6Csa7tDkxUBxK
-=RxvH
+iQIcBAEBCAAGBQJT5ng9AAoJEC7dUkA7aK9HV1wQAIEnKwWIb7QzExE25FVVsOPK
+LyTqvQ5WNhspCrN76A/dQ2AEffe978EfjCNPC8Ao9MhPKPBdVLwDSAofOqTeZ8s9
+/uhzpiQJWphFIrGSiqaHbQZrRDFvl/VMMeJ5lFEkN9gPNlrF4FojFB5mO0FmNwIE
+ZzqOmq9u5XT22bW0AFDMMdoOHjHu9eh9ex30vlyivHZJ4gMzR39xA5IUC8dKUYWY
+W7w74HtwWpJXRWpHYT9KmigBgkYQanRuxjwNS59td3rhTOZ7dhog09tydwET2x3q
+Ey05EmWmYHLb2AVy9eZ5ZN4ZQN7PmyglD5FZ2RuFMWv3fh+ZdjLbhe6dbbr9Obd7
+cM6eLKJa6B3mIOK9Yg2d1YIEsroqo7UyAbEJxIXNw4418dojcXx4U0x6aI6r20k+
+HaDuSwSigBJx+UtWBOfirijEshJYFgxfP6lX4CrTtoowbxfGUsNejEct8023I0P0
+Fq+FrOUs4E20FeBillI7Wr6GCdS5bTAYoh0JnGInel0u2z56wdIZeiBVuZ6IeNbM
+2MOjrlqDaNDyEH/6Fh0M5pr625Q1p0DNODUl8SKjT10ZkHrIGzncx6/6wXHEpKOK
+lbxMhUSN/lewp6u9DCcSAXHk0KQCNdxvsUkyykTv5OhVWAGzBfuo33ciysZu27cW
+fGYUsvIKVCcYf9a0Je/c
+=/aJX
 -----END PGP SIGNATURE-----
diff --git a/sec-policy/selinux-dnsmasq/selinux-dnsmasq-2.20140311-r5.ebuild b/sec-policy/selinux-dnsmasq/selinux-dnsmasq-2.20140311-r5.ebuild
new file mode 100644
index 000000000000..156d5b51a371
--- /dev/null
+++ b/sec-policy/selinux-dnsmasq/selinux-dnsmasq-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-dnsmasq/selinux-dnsmasq-2.20140311-r5.ebuild,v 1.1 2014/08/09 19:34:25 swift Exp $
+EAPI="5"
+
+IUSE=""
+MODS="dnsmasq"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for dnsmasq"
+
+KEYWORDS="~amd64 ~x86"
diff --git a/sec-policy/selinux-dovecot/ChangeLog b/sec-policy/selinux-dovecot/ChangeLog
index 1ea2c77c4bfa..2519363c62b8 100644
--- a/sec-policy/selinux-dovecot/ChangeLog
+++ b/sec-policy/selinux-dovecot/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sec-policy/selinux-dovecot
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-dovecot/ChangeLog,v 1.42 2014/08/08 18:49:27 swift Exp $
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-dovecot/ChangeLog,v 1.43 2014/08/09 19:34:18 swift Exp $
+
+*selinux-dovecot-2.20140311-r5 (09 Aug 2014)
+
+  09 Aug 2014; Sven Vermeulen <swift@gentoo.org>
+  +selinux-dovecot-2.20140311-r5.ebuild:
+  Bump towards r5 (fixes duplicate context for hiawatha)
 
   08 Aug 2014; Sven Vermeulen <swift@gentoo.org> selinux-dovecot-9999.ebuild:
   Make 9999 ebuilds EAPI=5 and transform to make master for version bumps
diff --git a/sec-policy/selinux-dovecot/Manifest b/sec-policy/selinux-dovecot/Manifest
index 4bf83cda9f96..1f2e431822c8 100644
--- a/sec-policy/selinux-dovecot/Manifest
+++ b/sec-policy/selinux-dovecot/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-dovecot-2.20140311-r1.ebuild 391 SHA256 e4ae65bdd57500cae0c9918e034458c6640a7b98ad4f6666fa968e4e3706b56c SHA512 18bc0e33aaba4a0d01709ffbdef4f7358352ba6def3aab801922ad1ba146e7aedbd0b21972a73d486b3a6a6201945d10aaf4a301c3aa4aee76e28168a6985f7b WHIRLPOOL 557bebff08cb32b011f39ec04e58b378003d174a5aef301a671d576e7a7fb5d91742b4b219106197ec4840cc7b7ad3fa8309139ba2f8336331100e1d3c525012
 EBUILD selinux-dovecot-2.20140311-r2.ebuild 391 SHA256 844bfb829f53a645eec6267ad3c472ff2f6460d190f3cbb6806567e4c1cb8277 SHA512 87217c49d98e75c880896228605e76ab50632676d0cff7f79eb6ecc37b670a30155f2020704c28fcd62d15c48341fb9ccdc8bf2d78159f2012b4fb64b0b048a2 WHIRLPOOL 25559c4a8002f1e4a9d12f17d051af3e7be98027eead51fbba1d0a346a97e8f97b7c5e624a93cba8ba2efd6517c83e8b860b424a5bd2762447b4ee0739b9219f
 EBUILD selinux-dovecot-2.20140311-r3.ebuild 391 SHA256 38e866591be543cca3832ce6690ecf3bb8d4ef06b576dee9f970c2995287b1cc SHA512 244f748eb5f42dbf6babebff69e4adcbb22b493f7c1cf757b59d2d1054bfee4923c866444ad2fce0767f2fae1425e42789c6e0731ae651ca23b7a24bab0331ad WHIRLPOOL 9f0d70e14391f424b59b9943df6673a5af2e4e060c22bb367e7fdb22708b814b9335a0470d4d1db2dec44247a8a13e26afb39c62d347a9fb431764a27f0bd09b
 EBUILD selinux-dovecot-2.20140311-r4.ebuild 393 SHA256 2875844337588148875705e9d6a3fa0062467a79f26fee0cd36838cdf3e86858 SHA512 7c3c33246451d0cea4533ebab0e6129f64d14bd451cf6d38016af913b007e68ae6ff2e409fbb6fcdb9d025e10f31804e14d0206605fc1538c8a399c37300b4ad WHIRLPOOL e5f85d569bac32041d50cfdf62c95638cd74f5dd35b0a996fd58809fbd2a9a8dc9130de49cb1a183de862af4a217811dd3d52054f2517817e50915e249b60149
+EBUILD selinux-dovecot-2.20140311-r5.ebuild 369 SHA256 03eec78fd34b0084f9bb3f2f1e4b0e6354487f4c8f68a1650dd7c2e95ba86489 SHA512 bef1a5bafb4733df53433f855958018a13cbd274952a34ba1e29ce37b419c56e858cceef12ed4bdaa14d7390e12e77ca526cd20c947d933df6b5c7e0ad380dca WHIRLPOOL 685bbb3e02cd9cd856f74b434d6558034525ad5d3e3aceddbbb7db36828fe7876da8390b468685806a0a932167ad344745099f3c1c57dc982435e212e4906b89
 EBUILD selinux-dovecot-9999.ebuild 349 SHA256 66bbbe8ab3722b12dd45af43b6a67f1f7779f54410fc856427e10525167c1363 SHA512 3efdffe32ea8e4e776878c78f50e9794cb72cf22c2670758f20bb5476625678199a6324535c2f24397a199978e05f1530dea0918147115440e52e38faa2e7ba0 WHIRLPOOL 3d27325019c0614709c60c2b2eb1d1acdbcd953259e9d0a7e30d9a20ef8c7287a7b15555ffbc81c89540104b588bce4c0768041772bbce4aef4f57fe065991eb
-MISC ChangeLog 6588 SHA256 7b722029eadf77dc41a53f2bf1f8b95dd4a492b9055dbbea61c41b86080b6fdd SHA512 2f2940084d859b5dd2c968484a708c81e9f9e15bcf962893e44f31d9e31c5ba37b3cb235f4b9af6ea8706ff805d25e2d351faacf95a830b6c477c511c6d56b6f WHIRLPOOL 410f6e3dc1c4f10f92b665f52d585263fd47c94a88d6ba1506b535f35d9325ce42a035525e127c0a71d069a0271383362ab72a0a862c5706dc7302f8cd65c17b
+MISC ChangeLog 6782 SHA256 38b6e88d0595689cbcc4ce13627d7eb0cec2cc480baa8ac762a9891d79d4d73f SHA512 f09a1b21dc5a4c6976b81acc119c6ef0147de0f817ad308fcf98ac80057e3b919fba6e0c03f7d7a976e8c4faa9b2aeacb3823f8b5545286796abd73f7008814b WHIRLPOOL 36091aa07f466a2085b3446601183249f03570b628439750edbf142c28b55ebdc96544556e040d30b2b18307e8a520cf7f7c017042c62d7b6309858e0d1c0d21
 MISC metadata.xml 231 SHA256 d7d9c7effe1a39211549a1e571326a54b0fc1594f9eaf7cffe16d5e172c88dcf SHA512 027ff823c500b4f1de61026331fe5fe234a9bbf7bbfe16775015a7b734996bfa9e210cde520e8a86c2cfc02e151a3cea85f9771b4ee79a01a363852cbf7129d7 WHIRLPOOL 002a8b7d4f5d4fb30b54d7e2477deb045154e92aaf0e24e7332b3717617f2ad8ef25e38921684a7b46b85d244ed8416175ed69982e43d2bffdb716f3d6ee8013
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0
 
-iQIcBAEBCAAGBQJT5RxrAAoJEC7dUkA7aK9H7pIP+QGl8U/xsBtZPKUR7lM3/1B5
-ugvdZi6gbhD0PXC15Sh37tJ4LQxoS6ut/ZOWehwLLELut9ahinTqHlw8RdgJy9Sd
-zBtt6mGiX2nZ3CuMbMu3BEi2tApXX2BT4A7/SLPRZHTmb9RbwebobG5ugZh2+DWu
-QG/wfPm7QcxiepDXGuJ3ClBQPhQb+H4HytxsMNnvcA8f0Mir6PfxZWc70Qur9Zlj
-NwJH18qfFZdtJTOeUphnfCUqJHsFTweM80c2z3xvbQzuXZvjwniLhEK1v36/KC9r
-HJ1uNvwBBKbQZp0IJGMJWVVO4qjA2EFh9btdRbhKwxtJT7tJj3iUIIMnpVCgJDFv
-/SWw30AsKFjfAvRtne8O6qXN0LI+pwuE0/dvXFyIgu2iB2v3jRuDLOJD2uxG4y3T
-LawiHodw7r23ScWm/XnqCd5vhEHGIAbz/9bMO+sE8cIdHtyvUJr5o8+7RkMAkPLB
-P4fisYCt39mnrihngbDigdCdeCRFJaC9Ky6ZrM0IbNGk4gC1UilRQytPpMDtDnU+
-DgDaN+IasGA6Kwj3W1/+kap8m7wBCjursvvC7syNsocvWkJ2wG6d/l1k8vROFBDr
-d4URSPEJTpDTZTgeyRseA1U2coUdWZ2iSDJq9NF3EPMbFFDSM0GoFtDW5zJ7CymP
-EDHQKJ31kiO3ofWv/Imv
-=7dMI
+iQIcBAEBCAAGBQJT5ng+AAoJEC7dUkA7aK9HfxEP/0lLEbWKx7AFqmJzp3HVSLlX
+9WhgQuDuLAFEOQpOynTN6uTA7Pk4Oy5XPKkcm3TwnaaXyd58exUl3t1qAFZD8nQC
+7x74meYUo0lu0bxJghTF+KOsRCLxHRBBEbmM1eHLZ1IL5GNMXqmNfFzGHASbnKSW
+8MbtS3FydJLlMtc/GS7k4BLjLodsyhR0H6TtdCnlYQe/A/LLSNVDjJUxvyAf9ejQ
+VXPujcysAGpqa/6prfBW7djY5SrFyKcLVki3kzExU50i9M+vegDosApnTGpxNgUp
+45UPSwM1zdfbIikbyQOIFr0N0/Rr5xaiGaqOO8K/HcYefheRfCr3QpTKMkdnd6fI
+bHlP2bPhZ7ehHorm01r0Ou7ndoGvBek9Bq5MZvyDQwu/KyMAC2K544XkMf6775me
+8rmdfzSiZ4730mqPpV3SLobaERHnajdMc9AG8P7Pmc9biXwDTsgr3l0hW1xpqWIy
+3SFPUVV9nMIH5tbE+SmedJv8v+I9x8u+xww/kZPfIVIxqJgDzfqoYeqwXYKdqbrp
+IfqQwD0v9XFw7ifHTK/ICQLATvL0aVOBdWyXMSIeummE1pbsPnVp4AfjrZ2/IaVj
+l5NpJcQAPVvrxjru/EEblHb+YayZjH+vXJo9+DSSP2o2bcUlpkf17HXxiJ5QGPrZ
+OIg/Naqd1D+NlD1L3g7v
+=mjNj
 -----END PGP SIGNATURE-----
diff --git a/sec-policy/selinux-dovecot/selinux-dovecot-2.20140311-r5.ebuild b/sec-policy/selinux-dovecot/selinux-dovecot-2.20140311-r5.ebuild
new file mode 100644
index 000000000000..7856c8467a96
--- /dev/null
+++ b/sec-policy/selinux-dovecot/selinux-dovecot-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-dovecot/selinux-dovecot-2.20140311-r5.ebuild,v 1.1 2014/08/09 19:34:18 swift Exp $
+EAPI="5"
+
+IUSE=""
+MODS="dovecot"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for dovecot"
+
+KEYWORDS="~amd64 ~x86"
diff --git a/sec-policy/selinux-dpkg/ChangeLog b/sec-policy/selinux-dpkg/ChangeLog
index 6ca2b8f77681..0d2aef434971 100644
--- a/sec-policy/selinux-dpkg/ChangeLog
+++ b/sec-policy/selinux-dpkg/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sec-policy/selinux-dpkg
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-dpkg/ChangeLog,v 1.40 2014/08/08 18:49:24 swift Exp $
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-dpkg/ChangeLog,v 1.41 2014/08/09 19:34:38 swift Exp $
+
+*selinux-dpkg-2.20140311-r5 (09 Aug 2014)
+
+  09 Aug 2014; Sven Vermeulen <swift@gentoo.org>
+  +selinux-dpkg-2.20140311-r5.ebuild:
+  Bump towards r5 (fixes duplicate context for hiawatha)
 
   08 Aug 2014; Sven Vermeulen <swift@gentoo.org> selinux-dpkg-9999.ebuild:
   Make 9999 ebuilds EAPI=5 and transform to make master for version bumps
diff --git a/sec-policy/selinux-dpkg/Manifest b/sec-policy/selinux-dpkg/Manifest
index 3266e66d6a68..e58f00cce987 100644
--- a/sec-policy/selinux-dpkg/Manifest
+++ b/sec-policy/selinux-dpkg/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-dpkg-2.20140311-r1.ebuild 379 SHA256 490b17485e25e78dea427f9af8afb64a86651f8827439573cee95e27bb813222 SHA512 989e63bf7ce8710b3c8d4421dacee02b8411b75271e2b4a4c131460b045deddd35e2458998a0a08237bd38a166eb1bd676b344a13efd170b32ebe732ce24a8a4 WHIRLPOOL c91ecf90f6824c7ad785b5550c5dbcbb1b72c3204de932a72ffe8cf5747c0efa34797761863411507e3ec76fec3f8784fb9395cd39f7a395e30ef661d6438e72
 EBUILD selinux-dpkg-2.20140311-r2.ebuild 379 SHA256 bb01bd14b9af60ee1ff04e21a7e9e9dbc7288d32f8de91fc219ac4e3713ff47b SHA512 705bc17c595ae9ffcb1ca2badb49c6bf07ebdd52b84a91bc9574e59061348adad2f88d853755837cb764ad07be0cc2a2eb6ca3f8b23effdb18fd54c07b5aebb6 WHIRLPOOL 8202133aa4bb5fb9363918e8a29ce236a44a58e6ec1069dea1bc4c9014c75ffe019f42bd6b9621d2eed46b26d34b39c0cccd0efeb197d2a7a8754c962c1f2eae
 EBUILD selinux-dpkg-2.20140311-r3.ebuild 379 SHA256 e1abc146cb63c7fb73e3f50fa33d02bad5a755fb08f5029c12809e7cfd3d234d SHA512 8be96b251fe2ddfeb6bb107968397f0b5af57131a881bfe5aa5c867ceedb617ec9d60b6dd6cb47e2a5cb8af5f0ecc9073537d137597631256fe8db14607ebc69 WHIRLPOOL 5327be133d54c1acaa0e356de24ab733b85897a3ccabeae564a92da5a15e305472cfafe3d2a3f1697066e70b449b12f30698df79a68ab1310b45598952d16d6d
 EBUILD selinux-dpkg-2.20140311-r4.ebuild 381 SHA256 f01ceb44bb00ca71a9b0147c36eaf286f67bbb1891bb2bb772fa6834f634535f SHA512 e9d5f2b7aced2e531628df0f7b3a3cee06a8b14c17c9de2581a1d4ac652d998535a5ff2f0a744117433cd6ce82523c243787382e7d958af6ea4c8b696c9d5eee WHIRLPOOL 4aa83611e21b1754ba843273cb5cde8535252cc2e6eab69b5f43eec8d3fd3574d740d5de71a517dd059614be7c6f5a7c9dfa8ee70f0cf15b2065dd7109537655
+EBUILD selinux-dpkg-2.20140311-r5.ebuild 357 SHA256 0ec77c50bd5904eeddbc673923e66a2c113da8e6d88580f511cd2e578c1624e2 SHA512 7e3205644f535f13487da1398db5a8d45aaffac1ef30981bfe88c8440ad8aae0617379b1fb841f1863babfcbdea0d4ab317d5e63e694d8e616d50f08186dc64e WHIRLPOOL c2fbfa8ff3f7399bb9a2881ba18dc01547dd6a36ea9874b03b416d7a3b2fbc62b04524cb2297317e71113a1296029d31273ef10c810938b7550b341889699af2
 EBUILD selinux-dpkg-9999.ebuild 337 SHA256 451952e5d035b01dbd01f4f69ea920f58476a9bea08464c0a7774b048eed8451 SHA512 8c992da94c4fd0caff75596fefc7765de3073fe84f0dd991afc69a5449517d504ffa7129547d9183977c363b5bcacc7a47b8d1fe12d7b8618e3c428e288183ac WHIRLPOOL ddcb87e1a7408bc3d300cc0f507c5dc1dd6390d9e440f8c52de67a28da7cd769480eec3dacc65e1064b3abda634076bffb9113a647fbc49d2807756db2c06997
-MISC ChangeLog 6101 SHA256 51220270ba640301efab0f718554a34f082f5d0f47f3aed9084f3c2aa4f2dab6 SHA512 4b02092d26881ebb30629566f014777ab1696d5c372bb26bc773689262ec0dfff68548e470714679ab3c400781f510f372378e38ea48519548abbc3e460f822a WHIRLPOOL 362aa18dc5c0dd42bee587dacb99300a149ec35ef433e305c14accbe612d799763a95c241499c3d122f0a01a0b687bceed5b47959ca1bdd4af6cc6302e899c2a
+MISC ChangeLog 6289 SHA256 a6cde087df65d8bf551cd0d8baafe12d732c76a6a421f9dd1b58135afd7f52a3 SHA512 78d2d742497e3c79504fd606b1d638080d22217b714b200ce222096d0d154b735fb9e3da262e70d2bc337e5c9f0ba4cd06e1c3304f08d1991f6669b3bdad1c8c WHIRLPOOL 62353f24c0f8abf2c65abb057f4c2cd2915d051b829469ec5d489b7703cc91a1cd13fee9d404ab5b3bd2ea9b938181fbafd22e221c95ed8bc7b3c60a92a84f8a
 MISC metadata.xml 228 SHA256 7a98770600f3f3a4c18fff50d46d617b83a136238f03fbc171708655c1d47d5c SHA512 59cb4dc968703a6f7b8cb4fc5d9f178279adf8961a07d9e942cf99d3263cac906b731442169f12df99170f05fce1e013d2ce4afd2f687a7f6691333f6c05c6ab WHIRLPOOL 471a17bb7ecc641dbbc712d97b1166231834f3c35afe401f97b6c3c58f1da69cca70aa808d711ed5d005f1e08ed3ee338ecaca546588c250502a0075b09e9bf8
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0
 
-iQIcBAEBCAAGBQJT5RxsAAoJEC7dUkA7aK9HLmwP/1kzbmjl8g5yCcxyBpXHikz2
-PBvbu0HRoqkTudNPe06N+nJt4CNwMuzuf9htnN+TwvxD6WKsVXfya7bnrCTrrXEg
-TdMQYuhFi+4rAGrxAG+ZuxLRC/RyJYu5+P+3pwJk0wpVIwvmAP6pk73lc6yrRwnn
-4DJCOXpj8hfuS20qZbSUE6HGQr/dSLEgoGlbYCcNUa8zHmZ3tk+tarzMsVvFoEeb
-7HBGFFd5o4y5alPTZXXLMYE2dDtmhpQo11tfymZIBror4y5x1oZvPKudDKc2I8wt
-3Sh/imWbx44GOieIBU47WTa73VVzq+DjgVlLfZIvcEjGcqnaTHRnfygCjldxQXeG
-F0sCxHm9KQ7kjakAYRPK9AL7/9+DOqVi2YO1618TaHYRJeER4n1M815h9076ZCbW
-CX1W/Ssv1Q8yHOI7idqPxy2LI+aICMQUszeRHqfKyYb0CcdjuvkvObNSfF6L5Wnw
-wv5AY5U63/El1jZBgTRP+L2net+S+ExFJ2d7YyTreh/dlkfgPX9DWQBGx/qNneEz
-HcqZ1HEhCsue63LObUV6qmPSs2Dzmq0ZshEcWJmcjTH5v0CMoz5erI7fa6qScn4l
-wcEAqxuPkMxqz3N8NkpYT7fhpErSeJsrZ4FsqDWcjd4ObKulgMXyozLr9RAoYTAS
-6jYsZnU7z1nkR2MW+lqZ
-=3g/k
+iQIcBAEBCAAGBQJT5ng+AAoJEC7dUkA7aK9Hr8YQAJvUwW3/1rKqAtZlMEoc9m2g
+e7szze37YSG/M963k1Kl978V2KcWKPdnrnpzvJzDbA/3d+xdKYy6KcREfYNLupmG
+K6Zvohh6/L6jvsq0Fm5mVrvR1yyzXI+TZ4e2XYJY3Ia5ztFjG8wxIi5dEWcOJ69h
+n2Xr0gViCadBd2e6ivPfslgkon4xC6g6Ry1E/wmVqKkkLiUR4vlehS5POwxXESAw
+V8F4mAERRWNFP8eywRpphpdA8HqcA0kbC9vVtndDV+cerHVMeZ1G8UT++wP8SQO7
+s4D/GvMyTTPuKnUm97H0hmw4nKg58UBEAEN3ggnkRzFWlmQTG2nXfZJzRGKuGbh6
+SnKZpXf43Z3b9d+NGpCJLtr1ZsAs0TsBdnH5znf1IUewDWgbm5oY3FujxlL83o3p
+9MQfqAE2awaYKA6pAIGwgSS7TKx6UhVR47zh3n7jh7Wl+bzK0dnFdrQPrJkcC6Rz
+EGxBvwECNmJnpApjdXlJpM4JAwJeipA3eDJLrpAug7omfs+AiHhKzNqiOpnR9pNY
+6ps/42PLLPGODBtzj79l2tNG7gLPfojqfsh6ObHRfEa9A3B0tLI6QP/zb0970tzo
+YZR24WgCbrdnInFLMoegr0XbiqhPVVTDrwMuc1KRnk1gvdlNh/d7/Hukk9WuiLby
+zvJbs6H6sfTISg8Lfu56
+=tMJe
 -----END PGP SIGNATURE-----
diff --git a/sec-policy/selinux-dpkg/selinux-dpkg-2.20140311-r5.ebuild b/sec-policy/selinux-dpkg/selinux-dpkg-2.20140311-r5.ebuild
new file mode 100644
index 000000000000..eed54470291b
--- /dev/null
+++ b/sec-policy/selinux-dpkg/selinux-dpkg-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-dpkg/selinux-dpkg-2.20140311-r5.ebuild,v 1.1 2014/08/09 19:34:38 swift Exp $
+EAPI="5"
+
+IUSE=""
+MODS="dpkg"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for dpkg"
+
+KEYWORDS="~amd64 ~x86"
diff --git a/sec-policy/selinux-dracut/ChangeLog b/sec-policy/selinux-dracut/ChangeLog
index 2226b6180947..f157d775f594 100644
--- a/sec-policy/selinux-dracut/ChangeLog
+++ b/sec-policy/selinux-dracut/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sec-policy/selinux-dracut
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-dracut/ChangeLog,v 1.39 2014/08/08 18:49:48 swift Exp $
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-dracut/ChangeLog,v 1.40 2014/08/09 19:34:48 swift Exp $
+
+*selinux-dracut-2.20140311-r5 (09 Aug 2014)
+
+  09 Aug 2014; Sven Vermeulen <swift@gentoo.org>
+  +selinux-dracut-2.20140311-r5.ebuild:
+  Bump towards r5 (fixes duplicate context for hiawatha)
 
   08 Aug 2014; Sven Vermeulen <swift@gentoo.org> selinux-dracut-9999.ebuild:
   Make 9999 ebuilds EAPI=5 and transform to make master for version bumps
diff --git a/sec-policy/selinux-dracut/Manifest b/sec-policy/selinux-dracut/Manifest
index 23b472f8db34..1930fafc3d5d 100644
--- a/sec-policy/selinux-dracut/Manifest
+++ b/sec-policy/selinux-dracut/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-dracut-2.20140311-r1.ebuild 387 SHA256 2a0cb18561f47aa60ba43bad1578d1bcf1421a0be4e9486fa7c413438a6e7f9f SHA512 15ccf91b8f52fba0b488ab12515a677254df98c19d47b88ab9e1bfcbe80036b6e9a39e7b453032713c48152f1ab65392d77e2bd2ed19b127b3b377ee91058541 WHIRLPOOL 84b1c79dd866e948390a6c1f20565f4ce703632d91cb6c30c15c7fb1b40b802563123aeedb8503f9613043f9770d212d16d92447c874b27bd12a485ddd135d9f
 EBUILD selinux-dracut-2.20140311-r2.ebuild 387 SHA256 7c9817ed60ea7e83616c48764e4d3855784b9b3cf5e1a0d0002e550e91b390bb SHA512 451ed4c474bb051e0093b03f601c707d585fea0d03aa4c0bae24fe635c0ab85a843c5d214f8d0aca545125060771e27a3353302713b031e1e16123a35a1fbb8f WHIRLPOOL 06c779e6bd6e9f16d7fb026b7419b462d29a1ae6f11ee429e58f6b96e02eb4f92d03b00134795b7acf76af157999103bd3ddbaf4ea714674b07641dec6e56b31
 EBUILD selinux-dracut-2.20140311-r3.ebuild 387 SHA256 11fe6413390cda76314f8a64998eba19a843ca34e46f4564bc84d2e2929e2ea1 SHA512 f11015d924efd29aace1d8da4dd8796b3a8180cf4bc822bf52324eca0f2395bd23ce85c746fe2fd670f06f5be1f9cecd68f7ddff47c6e2e24b3459324eb9bb1c WHIRLPOOL be9c6b609cfefbb21b5f4a55f5981ab37cbe5cb6e77bbbe8ca78e2df0d5a8c85a960a672a472d5408013dd1262a031178d14d9853922bd11df4f7b6c56b023cd
 EBUILD selinux-dracut-2.20140311-r4.ebuild 389 SHA256 c261a8f79f4b16ab031a7f1f5f549273b0df46d1c7bae5ea344c75b8aa074c21 SHA512 f44d998fdd21c87a8959ea2608575e7478c4f7b1c758d617ace631cbdfe74e45a8d9f6dc4da31119c8c673077cf7696815da09dec3d4f0e05cef1b1486855a4a WHIRLPOOL 28b7a26e5841843df99ee7e240e6f471e83fce252236d8f4c77f693bdb0e1d5ba0f2c3cb8c823b1f57bf1587b9119c8e6190ed1dcffb9e2f201b0545c00473e1
+EBUILD selinux-dracut-2.20140311-r5.ebuild 365 SHA256 2d73ae2d2a4d6402dc6bd34274476e75d5f48e367143a79a0c1cbb757c83aa3a SHA512 32a8fda4baf5e7ba7b79807af7f7ad894cff99eb651d08a5b907a060996bfc40c53e3fae2cadfd17477ce9087adab685f70edf8f084867eaa50c1b4a3679c13d WHIRLPOOL 9ce9e2af765aeee5123dac6b8522483eb467f478eb3b11e9a3c2aeb96b7a97993154965d8cf25bf28a6559dd1cb26f4674b70c940fa1ceb2262ed9c3e9775685
 EBUILD selinux-dracut-9999.ebuild 345 SHA256 9f4990c060adb749301fb14ae9f44925d479b27086c9bb996bc35f6b90de6072 SHA512 3529f8d9ebfe4b0cbb9c0607bd113ac6c24fa2adcfbd98d7b99c6fc6d0f8981d975b309670618788ed9c0f2aba7f4d696147b17f7ff02ebd379cf1eb4d22aabf WHIRLPOOL 4cb16cfd19589675c5c3002a33838791c211cbb728ac86997ba81e2d8862898c83aff7f3275d8e7966d91011c01034c75a72a4a6856ed64bdcaaf5bb014fdc27
-MISC ChangeLog 6185 SHA256 9c426122f7e5497b6c21f899b7d235d6aea1d32f4de36a50114fd2190262af85 SHA512 fb88be3ff436322738ca0bfc5fe3c7064b09a000e1777e437a7d8d7829a53726fbfe40d7f20367ab744fa7475c5a91da07736178b280af25bbfd0dc7bc75cba0 WHIRLPOOL 85ac1a2ddae0ff8875828faef09349894d6f229928f655638dee3693ecb781be0fe6decb16518888efbb2e0aab5a4f94cbbcd177d21ca6a67f34a69adf36dd2e
+MISC ChangeLog 6377 SHA256 e763a92efe4792fca98886ad3d692161d808ec0ee9e2b8b93f51390a4a23b16e SHA512 421f5810e6a4706dcb758f82756ad7ff76a477475745b2ea46d92d635d86aa9cf3e4477bcc15c4cef098f8a0cca955299f91ace2c6ff656770b8bd70cce77056 WHIRLPOOL 7b4def6aec65753ed49cb013280086bd977263f0cbd7e38a3223102f8e5ad11f5bddb74cb1c911eb37ff508e3992ac77a3d067616594a3e0fa50b3fcbe5addcb
 MISC metadata.xml 230 SHA256 fcbdb807ee6e26889ed1b3106a983db1fd54589ac2b340ef61a73a95df17a637 SHA512 77b0c5687569414c5b30e6a1cc00c605dbc87a7994e49bb28bab220069fdd6784b7db1fa4e22477466a2379a11d2396539bf77f5d1baf80ea2706e4f6c6e7636 WHIRLPOOL bdd3c551f14af2ad782ca2c7a731ac41931a2f04ea2e009b77d1a5ae70c07d407ad3fe373754ae41371f80d9d7c1ca277e5a45af11fadaf2792570351c29ad72
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0
 
-iQIcBAEBCAAGBQJT5RxsAAoJEC7dUkA7aK9H25AQAI2thFuKsEbdHhxkPPV933Xk
-pRlki0x9XFU9Ej+GzWm0LgFHlBh/k+jfyp3K+sVO1LMFVBi7zkanM/4zsMnQQvPV
-arexstobfqqD6r1GOrz3EgE+K4aCTaxvTTOAQiApaF1Ms/xE5XovciKx3vh2GY5J
-tUBc1ZgDmdkr112M4mCm92/R+x2g9K+ph2WWXvxwj3kvlY29N3sOesGnQFvxAqso
-VwtVDYZXb4fSPm9t8PsykM7du5K8/ZAGwpncXinjc5ru8KYjHjhzF02EC46qbzRk
-+6wy+y2SCrnxKmafadJBSa7DkEGBvdlYxI7lFI4fSGoj8WmrJvtjd9zKUpe52tJt
-qS1peA8yDy3Bt/YGeY3wK3X8SJnqQZY5a05xVJxwT4gd5pUzoNJft4qDNlAU+BHE
-YsaXe6/p8MFqkf9DYc4N+/M4MIptnLlT0QqlvX2KMjbrFGSfwzqcb0pWAl6Dhw98
-gaA0FmyEiTP165Kkeu1hJ1CBotxej1XZvPqo5SORqSoztWyz+s6kr9u/9latrH+I
-/QOU0B4TG9FFAnf7QdQuBcsmjWevyfRHMGGoQCKbr5ajQflxlYydv71EndEqNAHp
-fXTyNUzL9hZoHCElBX3aNkonIgySR4sFTR6zf8TqN2ZrYFd+ymJ4TMO0QGq5rcm8
-WJERT8JoSr41c9rVVFuL
-=Tzgj
+iQIcBAEBCAAGBQJT5ng+AAoJEC7dUkA7aK9HE/AP/jlw3Dlo/z1L2pylkuJp1cIM
+6m0a8TEHl5uYK6HE7GxaScT3KSa8UpIOmPsrv/NM159oPJEwXj1zB8kReKsLKxbj
+CDonY66GBZeVlvMGLwGQaZHMzRAVzB6gv45csutwB1A4OTM+cNmzPauL+CdAh5ri
+SIJkcUFhBx28UaP97XLfZGiiosR3XGFKEfXa0pRPcfhp5c7efNs5j5ensM4drwYX
+X0O35EE9KI/Xzma3kIUBerMyWEFBnJ2XYsx/yP1Vzbh6wgZuV5aze7TURGW9l1qr
+XcazlHC9easNug4EX/DHXfvr+Mf5AmGM4uA7k2ZuEnLvptkg5Qx9zv7QRC4fWwRM
+0nxkOIgkzaLWUgNTawPf6/LHGaHRc/SpUxJCuX2ahv6y9+9h4fQ/8OCpkvGIUn6S
+IHfEpR6q0nKXCKbvfgx+nwCM4Zv6sWmSUmBwAhEmKj4JKo+haQM4Moqccc15jSVu
+dZUnrKeVjTzX5C7kdK2j+K09wvzezLFA0ONnrBPJX5flh9Wv7nr6t/dx2cXkWCN9
+lKRZLYTlA6BpPvO6OCnrIBgYO0PYOFQM9glhkTujceBpVyxWjtWktX5ndpNqu9l4
+vkRAiIOvpn5NaScnvFEkZCBGyqToQYE2ZDP4MRSDSYdHjd6oiksEjL1NXvIXLWUa
+QS1Z7PfhpkA11VZRyh0S
+=ybSq
 -----END PGP SIGNATURE-----
diff --git a/sec-policy/selinux-dracut/selinux-dracut-2.20140311-r5.ebuild b/sec-policy/selinux-dracut/selinux-dracut-2.20140311-r5.ebuild
new file mode 100644
index 000000000000..2a3f0f49e669
--- /dev/null
+++ b/sec-policy/selinux-dracut/selinux-dracut-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-dracut/selinux-dracut-2.20140311-r5.ebuild,v 1.1 2014/08/09 19:34:48 swift Exp $
+EAPI="5"
+
+IUSE=""
+MODS="dracut"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for dracut"
+
+KEYWORDS="~amd64 ~x86"
diff --git a/sec-policy/selinux-dropbox/ChangeLog b/sec-policy/selinux-dropbox/ChangeLog
index d2cce1a963b1..58578b03d315 100644
--- a/sec-policy/selinux-dropbox/ChangeLog
+++ b/sec-policy/selinux-dropbox/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sec-policy/selinux-dropbox
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-dropbox/ChangeLog,v 1.3 2014/08/08 18:49:52 swift Exp $
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-dropbox/ChangeLog,v 1.4 2014/08/09 19:34:11 swift Exp $
+
+*selinux-dropbox-2.20140311-r5 (09 Aug 2014)
+
+  09 Aug 2014; Sven Vermeulen <swift@gentoo.org>
+  +selinux-dropbox-2.20140311-r5.ebuild:
+  Bump towards r5 (fixes duplicate context for hiawatha)
 
   08 Aug 2014; Sven Vermeulen <swift@gentoo.org> selinux-dropbox-9999.ebuild:
   Make 9999 ebuilds EAPI=5 and transform to make master for version bumps
diff --git a/sec-policy/selinux-dropbox/Manifest b/sec-policy/selinux-dropbox/Manifest
index c5f8a39d15cd..e1b6d27845f3 100644
--- a/sec-policy/selinux-dropbox/Manifest
+++ b/sec-policy/selinux-dropbox/Manifest
@@ -2,25 +2,27 @@
 Hash: SHA256
 
 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-dropbox-2.20140311-r4.ebuild 393 SHA256 f9e66585753b23b0ae3bb7e859a42c1c8e33fe6269d4d8b267bffe38a79cbea5 SHA512 fc591fa45b764b0de9a14ea0d8a46c07f4eeede68f29fd72bce255ccfd3b6129104aa4f60dce42424df67d7fd7c10eb83cf64c3e8eefea1af8468513dcea214a WHIRLPOOL 22a305dc06f2f73d84912b081325be2d53da503ed56cfd93f6e610e5835d3569e3f5059015216360253d990ebe0eed654ca0655391557280abb8bb596ac92e9d
+EBUILD selinux-dropbox-2.20140311-r5.ebuild 437 SHA256 9ec220f8009d360eb9218d4ad784c94f593af75771c99e02e5e27757c3f85616 SHA512 65a0b680c2489c9e7792afd55228384c920512d2ece1c33bafcc1eaa2980201704367a42a066a70c8be2e93a13e984ad272151f033ce0c4b1a50fd3da602c921 WHIRLPOOL 20d7e5b58195de1e61d7ef0fba24c8741f3a47e7bb0aa98844e3c0db09a0861a7b29672b4b7b9938f795207ca1cee0c7068350686595cf0af91d9eaf766615af
 EBUILD selinux-dropbox-9999.ebuild 417 SHA256 0b23304f3c747a38868ad25ee5b261971808e45dbc99de7136e9d0777053f873 SHA512 6dfc8bcb06e04a7ade6420b83bf1a58a8fc44d5c81dba8c214486b2a6dc241923a114e0bd47f597a7a21d4621fc705e32154558a3cfb60389dd8c2e5f5720e79 WHIRLPOOL 015e2ab1157c674dcd9ab88698965a22e453b229c2fef43f4ac34563c3352ba77227e00b537e61e5e6fa092f16f836e5ee1b1a507aed0de9da2ff1e2c24db451
-MISC ChangeLog 740 SHA256 276869237c1ae0be85f9a0a8d9f0276861ccbed37b6030e968f36524fbf1cf84 SHA512 4840fb8b0a2a50d8367548d0a8d3dad1936304646b06da652a98714c8a19028997f257bc0e9fb4a9af5983fcef6ed652388b4dcd3104fe6bd7cfe6cc4b5ab26f WHIRLPOOL a7c71381599190c6babeeeab5f6b4c7f5aee572b7e573831ffe2c8fa715b1141ec5b68aaf83b61424c84160e5cf91d043e4dadc65f1a8175ee15f5dc451393a4
+MISC ChangeLog 934 SHA256 1aba269d8018c914f10035a6e65e38997e264b3397faf4510e93e525865a6080 SHA512 af6f21a05a4a6bf0a29a2adf393582a06970b53e7948c925a7eaa2e24530ac424844f2e92d0c91abacc5d034d4944a6b5bb1d832e406022575a2381f68a65c06 WHIRLPOOL f39bdd7b4ddba0412402cfb64da2a2aaa68ce76638afcfa28fcba0980ebdaf42bf9d2ccc5fb630e0bffe74a0a4036a62f2b689dc4e99594def7ccd9072fa9034
 MISC metadata.xml 231 SHA256 d7a8faa0e841144b1df240fb58506bf4a8664f6061ee9a9cc3a3ffacc544344c SHA512 27a45bbaec059ae3ecdf74050ad9c560c4fdc4a001527b96fb4819603a9232672fa8c90addebed39826043622e882338e4887f12c77ef02b768fb174d703fb7f WHIRLPOOL bbf2447c0994b957955aebd836c4598259e73a33814aafe4e9828b589ee5e49484acec07b236e85da29cb883879b0576315151d9a27f411430f7efed8f4e44df
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0
 
-iQIcBAEBCAAGBQJT5RxtAAoJEC7dUkA7aK9HJVsP/AyVuiC6MnJv59kAVNwsaXNK
-5TUgLRY9dN19j7zoRQ6FaM8TbCVXtcNSiLYCwxCP75b1qAjBI8GTaXKztyia3wWF
-Th7eAptlTXaBxRcCIpRQuwmt4uyPTTt0N339baU6xBh6yyIIdz56I/zSz+GOYWbz
-RSmsYyvCl+94hFFpyt8sb3h7ptw8FhcLe7jr7q3Yn1A3NMBh9kOCcOXh1844Ec/v
-nj3LfiWKKDKFlZi21CtMzgVRRbufAf4sklcgJCS2UAsMEPTTI4Xv//yGieSEjRZf
-SQJVQg921UhunKhtdsqG7iJGCAg1kTDAEtejzP9m/VEgPEv3WT+aIOccJI9Z+B5I
-+cOHqARLN8Z8gLEyRCfJ7wO+Sg2wV2ZAa0QonQntoTYALqf5dFSTYziKUlKvZshZ
-ZRlD3wsFrN+5LjKVGhhuk43z1FsUGH8baEJCZzHSIVXmWSU0oTP7CO+njyQpyqbE
-5SvIAXyshU8CRQusHVadH/MnaxkevK0CAgqigQ1lBUCudKUFXYd31IEd2uCuY/lz
-awwXnebF9RP80ISTSGZGGsgfAlTl7GL6sUF1URcS4dMmI/qGdFd+xTxDMBpa6xG9
-orjQBvk+qrs3g3KL+UoE0gcBlkuQyj/VIaV9S/R32Tq0BaaBI3WqhobjBgEhWqYZ
-MNbHS+z/dx4tK00DKqHm
-=HRbr
+iQIcBAEBCAAGBQJT5ng/AAoJEC7dUkA7aK9HsbQP/20tbwD3R3ykh0hEyoaoyrCy
+8tyTElqMTcbEUEfTmG6EaEq5To6Zg+DXcqjw3S1iP6D5WmlV5RE7WNVENij1y6Ia
+iLOA1j94dZ8GJstLgUQVCPMvlFE0Vz9yjahsbqrhwv9QSFoampZvPyhsBkn4JLKr
+Jc2UvuB3MLnasL/HmCzQK65OabJWPP6QL/ZnNc0EJIbyV5lCzsmn9wFtm1DjNCI1
+S/mnzEjP6LnMIXgXLy3+1jBHc0VNBlD7eGEul4T23WxaP75QIex8cBf4P41B3ect
+En1n7lJ7RPrjTBVhUP8JIsCHSbNpvJjbIxD7YtmJFvP/E3xqWbuc+qUAm7AtqRv9
+LqwF46RYEn/5WNj02Y6Eq83GPtRR82tjvfoG9PbY2WHqrCbN4IBZyKbj4VknFRhk
+yaG+NSj3w24QmyQfNFy2E641EAKmu5TTPiCyPanA3HmSS9J36DoNx2XcgpZL+j+Q
+eRiWfR9EOvyO2dxr7QrAyW9emmeduDZZGGUhGwGHyQ9fLKVzAze/L8fh3exgYfKB
++A8FqI2/Ml0dgGzGOvNQUrdyQ6H/oThr7OaF+SrwQLUvD6N4fWeYK0zHf6hMwHCV
+uq0KYOE20UhxzjE9DEshbtAxdfjIEWNEC6SRUCeB1RUOFOgTnibhs+96yIAnqEiQ
+MpXiawT4fFwYqWGxYupQ
+=1XL/
 -----END PGP SIGNATURE-----
diff --git a/sec-policy/selinux-dropbox/selinux-dropbox-2.20140311-r5.ebuild b/sec-policy/selinux-dropbox/selinux-dropbox-2.20140311-r5.ebuild
new file mode 100644
index 000000000000..b327397aa720
--- /dev/null
+++ b/sec-policy/selinux-dropbox/selinux-dropbox-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-dropbox/selinux-dropbox-2.20140311-r5.ebuild,v 1.1 2014/08/09 19:34:11 swift Exp $
+EAPI="5"
+
+IUSE=""
+MODS="dropbox"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for dropbox"
+
+KEYWORDS="~amd64 ~x86"
+DEPEND="${DEPEND}
+	sec-policy/selinux-xserver
+"
+RDEPEND="${DEPEND}"
diff --git a/sec-policy/selinux-entropyd/ChangeLog b/sec-policy/selinux-entropyd/ChangeLog
index f37b923d34c3..f69dea492b22 100644
--- a/sec-policy/selinux-entropyd/ChangeLog
+++ b/sec-policy/selinux-entropyd/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sec-policy/selinux-entropyd
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-entropyd/ChangeLog,v 1.39 2014/08/08 18:49:46 swift Exp $
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-entropyd/ChangeLog,v 1.40 2014/08/09 19:34:31 swift Exp $
+
+*selinux-entropyd-2.20140311-r5 (09 Aug 2014)
+
+  09 Aug 2014; Sven Vermeulen <swift@gentoo.org>
+  +selinux-entropyd-2.20140311-r5.ebuild:
+  Bump towards r5 (fixes duplicate context for hiawatha)
 
   08 Aug 2014; Sven Vermeulen <swift@gentoo.org> selinux-entropyd-9999.ebuild:
   Make 9999 ebuilds EAPI=5 and transform to make master for version bumps
diff --git a/sec-policy/selinux-entropyd/Manifest b/sec-policy/selinux-entropyd/Manifest
index ecfe8727879e..183c4954a995 100644
--- a/sec-policy/selinux-entropyd/Manifest
+++ b/sec-policy/selinux-entropyd/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-entropyd-2.20140311-r1.ebuild 395 SHA256 7d808d38c71fd2cc28808b50468c6c778dfe902feeb4ccd85cde557c9d91c388 SHA512 e494c6483336a05209eb433d591a416c30df053cc098aa0e67f3817b6fe24648aa519b9951beae8cdec87dd0cc4a0354cb1167b587e2ea60c3f2f283f4af20b2 WHIRLPOOL fb5cd59b5501fde9d036dd5f148cb6eb29893b60318be993d3f5a3a69dc0b35b120f1725211ecfa9d2de5e899886c865477a6ec24fce25f636bcaf695502cabc
 EBUILD selinux-entropyd-2.20140311-r2.ebuild 395 SHA256 e27fb0ae4a29a32560b46777aafc98d7813d2f52a35613246dd2efef58375a7d SHA512 0ff1bc35ab739d93a590b0065b166e51dd79e1382e8d03852d6a8a1dd1d2a750fee8fdecdd228242700361cfa28cacc52424561d66264caf097d25484e32d619 WHIRLPOOL 0b0b0f8b7574547b231e03b83017f24121e492f571e498578a3852adcd01c01f05ecae2966d2bb53ba2690e4c874027948aef128581611a79f9d4813e486204e
 EBUILD selinux-entropyd-2.20140311-r3.ebuild 395 SHA256 27648f3c225cd2b48bda440081f3155b8314f30108a277726883fac5b5a7c5f6 SHA512 d7516ec5759be54fbf2fe0b69a4af28ff6b9da7fa9ce910b98e9c9e87fe5fd7c9a88c7543c53901a39eec42fc4c1cda7569c780d8db86f9c388fda36eb4e1d81 WHIRLPOOL 554b8e35167a3c55f5d6538160e288250a596f73ce50bf17674acff17d3da19cab45bbe1c0432072c3ac0a899b6eaa4a91e9e4cdf04fe0b9f31c2978ed691d81
 EBUILD selinux-entropyd-2.20140311-r4.ebuild 397 SHA256 96e80d11e5fe1f12cb4c9b9cf5f8b47853bfe54baf5a7ea397e2d643985ac4e3 SHA512 ce8f320cd9d3efa2ccf8e25e1613fa6b6df696499b5200fe99e436b2894ff2c8fc4b16413a2213a3bf6392eca93b072aa5e406fded4eecc665057f367329f53c WHIRLPOOL 2dd05880691794b47cc757c3c1be6d86a07584a06190f01f3280c7db8081da6768fa56d9097f871bf45cecb711729dd3b5a9b9f52f79db07a62991a988702b68
+EBUILD selinux-entropyd-2.20140311-r5.ebuild 373 SHA256 f6426b813b381557af3deb32a5e9813fb98cfd7cd2974af2737cc7d20dfa83fc SHA512 b3234a3decf4dda1f06ac594b5f19149e88755f5ea90499541d03cc4fa760cb91f7cf9bad456e8bf672dc3a86a0ce69e8ae6263ae1a322e971c83b37bcae02f0 WHIRLPOOL 9a5efaced68dad85cefa06720b297fa57894b5438bfe6e09c1cfd3cfd46988653b056d0d2e6df517c0485007c1ffb11f32174a2a1574807294c6cb9021a93789
 EBUILD selinux-entropyd-9999.ebuild 353 SHA256 f5ab3ed4d257c9dc1c99e447ad7ce115219f81c01c4accadb58c8411849c8384 SHA512 b00de13d99287d3ded1afd8146a2c4056118332fdcdb84de5902a34def093516e6b5c86ea6535ae4aa84023830ecc6522d0a76e5c40459a552452e0a9c6fc2de WHIRLPOOL 11f5f3ded569035e638574df3a2a0fc28795ee3b435af6fa25339724020a507e870210f97a7627badc43d07515a7f45712ea4bcdf2842f99e0e27799bb07fbe9
-MISC ChangeLog 6526 SHA256 9d006656d7ea8b5be5a58141b09d237fe72cd9bdfade92703f9088ac908c944c SHA512 7663411e429713625566c793d8857042dfe10019c51ebb6388186d8ff6f2d52674627b900c26a668f9ebade8992984d9cb57ae0a7b4a5207c023ba75442bb491 WHIRLPOOL 375ee0f0e6344b0788ae577f663b14b5f6eacec203c4d00faa2303debe3e1717a125302aa32e0af729df6b1cb68555d68469c6cb9e64b374b91ecb7f739c63a5
+MISC ChangeLog 6722 SHA256 b0e12c6d6bc865c5f114caa3d910f6d29b22e763ace478368c8877c491aac084 SHA512 765f6490bae094b6a22030f659eb6fe922beae39a3bbb02db63eb303559f9c7c4b9b0714faa15a4ef6c01b64087cd61b3a8413842f42baeeae728419618b78ec WHIRLPOOL 9579a37fa8b68def82e977200ad7070ce0160428247b0f7703f05487b688bdb79c1387b3f2ae7e36bb61bc56d0cf31b4f071522fd4caa7164c368984d2d2d6b5
 MISC metadata.xml 247 SHA256 b1c2f6ef553299b47b8a51209ad6731445294c9dc2c7b3fbf64a535eb43d51d8 SHA512 a6c23faa39b542b287c254d730998c42c1463e77af9b91eadcd2039ae128736b2037629e26768817f2e0f275136716be6ec7def662ce06e4f81c687d788e970d WHIRLPOOL bd7e928903d3241aacdcf2af33986d70b9fc7715691dc6953f3ef1414f74f5df9638afe211fe985fe7bab80fd4754ee88b30ddce6b19a344ddd49b37bff9376a
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0
 
-iQIcBAEBCAAGBQJT5RxtAAoJEC7dUkA7aK9HaQIP/Rk4/wCwHGmCnmp33VgLQKf3
-X2qEwtpLzCfx+i3HDSMbYuEiJSey0pTryw8rhcb5XoObrdjXmycrVcvaNZl2Eztm
-g1SPMJ1cQQspfuus8ZSo+yrRGbe18i1i8pBQYaSlUxfbiIJIkxTznGy2kRwcn1F7
-jjCoDs18wQgGFvfnXeUAZTA62d+0pupCGj3ASEwzQPh3XG/6k3HHWONUd1kH58qp
-T4SN4b85Ki8A2Mbk6C5cFRh/lLLi4KD9LnhxY42mOhmQMKfygG/ofjCCcV5JCEsi
-PTjIs2lMnGXkzsLZS+FEc8bQmzqlUWLICsepWamOkoMq7dDo6S4/itLUE98bTYUj
-0mkMqQp9xJhZortY8AH8+7kkNnuvLWAOCi4HFw45RdeGEZdFxgyVdh6Rs8GtMWfV
-eXhvSh7k5/SEgY0EX3XR1leIsgqJh4L93ZD3nKh+9zpAuliJ5wt7QVvVAYNuvW7l
-tkDJciZ1rqkMdHvr+LV+1p1rzzhXhhmlNqnnoqqqs9rdlb1T2WBufbgTkWVAHRl2
-GfwcPuyc0Tn/jxT0VcsdxmZWTkel3MmXMZChFR/oRrFECIL/orK7rYIxyiSE02s5
-pKAZ5sWOV/10fE8c2x0NOZhIvEwPVrri65bgYsjaFmwsu5CsdS3H3ODnRrStV5Rm
-fO/Oj14WVMML8TSiaZEO
-=Go85
+iQIcBAEBCAAGBQJT5ng/AAoJEC7dUkA7aK9Hf80P/2Cxx0IUOiU5M115+gaSXchB
+8GYfRh+0UAOZ6+LxYCsg+6Rls+f3pmevw/X/r9xYOVf9BR/MOcuVjKngu7GrXHbf
+d/jKqSXypz9lwBz6NNlLCZe5pnSaa2gVW8cZ+rXc70sxvunaJo97/DgW0dYSP+hu
+1ZWpGzO7cwZRz3r2uA+e9B1RVcZe7PTldVaik3SxaC2CCv4Ex8kSl/+8/urlKg8K
+tTL/Ae9bFmMOyaeNvQA/UXDLLb6M3STfzuK4ybT8MRWmuoAW56Ma9PyFgim+kLNR
+oCoQTtmbWJrHKUg48NorzauTGH5ba34EpVALPswfH17N4Vts4fJ49UNgXUIW/Wd7
+TAaRUuusAapxo1TW3Nfo1u2eb4hxrUHsduRpYprm8nFzfVzws0NVYFaQGYkViZQr
+V6M5G5oyfyS2kFWnU3bPwJUIoYCNp7Vozfc8Ie572DJEjSARlRypzTnskLuuiVKB
+oTbTEIuT6bPrMynbjUFCQCZHCI/mJJ5jQr8xRHVaxzP7b+ngdzWYfC82HaEhLUgW
+rgbi+VOGV5jNtzuwKYizh4e6ZR32rmKYM16Ofl6zT+j2Ds3YHoAGJMXyQXBJYWfz
+/di20ZCOIxaTBM9Bd42fNXL5zBqYQHSO3ZYRvdE3VPZnzrr6NNO5rF/p40mSv0qw
+luJOVsZD2tMFMjDkDDdh
+=jgyX
 -----END PGP SIGNATURE-----
diff --git a/sec-policy/selinux-entropyd/selinux-entropyd-2.20140311-r5.ebuild b/sec-policy/selinux-entropyd/selinux-entropyd-2.20140311-r5.ebuild
new file mode 100644
index 000000000000..f599421f43b1
--- /dev/null
+++ b/sec-policy/selinux-entropyd/selinux-entropyd-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-entropyd/selinux-entropyd-2.20140311-r5.ebuild,v 1.1 2014/08/09 19:34:31 swift Exp $
+EAPI="5"
+
+IUSE=""
+MODS="entropyd"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for entropyd"
+
+KEYWORDS="~amd64 ~x86"
diff --git a/sec-policy/selinux-evolution/ChangeLog b/sec-policy/selinux-evolution/ChangeLog
index d63a064a4c55..c18d982a4796 100644
--- a/sec-policy/selinux-evolution/ChangeLog
+++ b/sec-policy/selinux-evolution/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sec-policy/selinux-evolution
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-evolution/ChangeLog,v 1.43 2014/08/08 18:50:02 swift Exp $
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-evolution/ChangeLog,v 1.44 2014/08/09 19:34:04 swift Exp $
+
+*selinux-evolution-2.20140311-r5 (09 Aug 2014)
+
+  09 Aug 2014; Sven Vermeulen <swift@gentoo.org>
+  +selinux-evolution-2.20140311-r5.ebuild:
+  Bump towards r5 (fixes duplicate context for hiawatha)
 
   08 Aug 2014; Sven Vermeulen <swift@gentoo.org> selinux-evolution-9999.ebuild:
   Make 9999 ebuilds EAPI=5 and transform to make master for version bumps
diff --git a/sec-policy/selinux-evolution/Manifest b/sec-policy/selinux-evolution/Manifest
index 71d394acd818..dbd89fd0398b 100644
--- a/sec-policy/selinux-evolution/Manifest
+++ b/sec-policy/selinux-evolution/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-evolution-2.20140311-r1.ebuild 467 SHA256 765c3e1c20f93ca36eb96c34e26e62b8f4e254603fcb9d1d573d160c6438934e SHA512 e066203825dbfa3cb0feff569861768b52271fb79d496d9479318a70d742cb23194441f77e8ca840ea5a61b3950636b9b08a6b976238e989b676560afb681270 WHIRLPOOL 6649474e31249f9861021d534198ef16817b0aa9f7a87180c604bc4a02aeeea54d32b2363e9a92af77684716ceb4abdba16b13060bf90f014e1c40d19f6f5696
 EBUILD selinux-evolution-2.20140311-r2.ebuild 467 SHA256 818231104a90fb42f8d3b8ff6c19b1011ce9a5c0bade7cbeca5e576fd46526c4 SHA512 1a0d883b980d0ecf1a230808ef1217faba1da87eeecdb772740f5a99092a7415671be5e5d06d9c293e3fb770371d9438a1480fb848a42a2625626ce4f239240b WHIRLPOOL 5edaac83b4021dedc3cc52b7f8bccaa0bc3c43538404d697df186fcdce6b7887118c68965223ba70e4ea2ef331c776a2e9ce3c30035832a18974c5933f53d3d7
 EBUILD selinux-evolution-2.20140311-r3.ebuild 467 SHA256 ff0394e200ac3dac685ab7b561187b12cf679c811044dcb968ef439c1ccfb9f9 SHA512 9541e9a630848ae6e560e1ff14cea72e099cd6896580b2ef06f8102bf863028a3f97be1b81bcd714fadcd671e2cf8c01ffad4a9371403f3dd049754b02bad2c4 WHIRLPOOL 300d714b24d629cb39f230b7500ab507701c4d06c864184f58c3d61584583dca9772d1a8b4e7f5b0fc7dbbf4ad3b368ab1988c8359a0382c3f7071f5d483207e
 EBUILD selinux-evolution-2.20140311-r4.ebuild 469 SHA256 3b8d5d01e96014e2804d11c515ffd72436be259d212cf35889dc9ad3b9ef46ef SHA512 f013fb15da02bd9e9e985f8ed3983671c3ab580c4b925b4e81d232297e40832f7b11a441565af22921ceb3b5b2f6590b8aa897493576509781bd02aac7f07788 WHIRLPOOL 71535eba1d84377304d50265bfbd39be61d28eec73d027d2a6bc33cd3f1bcc90fb4fc2b210f90a0e9ec9dd532ebaa352097425d1128e098bab6957842e0ccf34
+EBUILD selinux-evolution-2.20140311-r5.ebuild 445 SHA256 2c7a9ded01ebb8bdba547593c1158361471458c2b82dd8b068e89773af793dea SHA512 16ed1d2d113cd82ffb7594a414b6f5337e46742dd19c29aee1671b51f88df516dacd1fcb6d61b3c31ad0b5f393d0f19eea274a46bcd88589d459564452922fc5 WHIRLPOOL 3a504ab5893267dc3b5e7723316f112957fe5fbea24a14286ac70bf90ee028e1cb883500433256f990e680c842e4021671a9ecb9509bc9e0991bd645b4cbe294
 EBUILD selinux-evolution-9999.ebuild 425 SHA256 292706f300777adee16a732fa5575606723cee451343b9f006bbeead02b5dd9b SHA512 b287d469cf7c8315fe653bad877fd83a9d7328d829fc2e424784db15cd0c645e6db99c67e962e9315202ecd86cdb9b524ed52489379916d6d0c8389ff0a3d502 WHIRLPOOL 4f79088a8a998e97fa4da807a979cdbd45d8827f32f659b38b2169ac23f3bc1e96b0b9d70b5b09b38ab93bfbd9dca45e4314937576266c6f561a012ca7c80fbc
-MISC ChangeLog 6886 SHA256 6d5fd28e4500c3901749dc4e205b7b15d12b62db2723572c28f1db13127f39db SHA512 7c8866c8a3a7f49204cd87923c969336ec51dfbad0e5cd4e453dfec4d288b0b0592a3ae9ac3b43eda28c0885c76adce667484dd97d4d106a6cb8a1a65c2bddea WHIRLPOOL ee1e78fd11de8b742ac222a768c3f33028a68101c3161b66be5d666af7f440cbd82d3be69aaa23bd6083bd9b9a7ccdc1c0b35ae38e8118b5848c0cb0fe82465d
+MISC ChangeLog 7084 SHA256 8eede8a456cc29bf501f98a8dcfd28712fbb7f824008b27a3e29e4c9e909f747 SHA512 f0552f11323e472ea231910548b79c770d3fc8badfbab63d9d31fe1549e8021bdd2cf4f20d160a57c514a38d742407936d371023d4fa91b82cc32e17f7456e0f WHIRLPOOL bf62ce7580d553e485973158d3fe095bec7b2e4fdc28755d0bc119241bf769e889835c9d30e923cfab9b23194fe8376854a02768c4ac7e64631981d811604f8b
 MISC metadata.xml 233 SHA256 d3a07fa9f2330565065839d34101b1c9f93b222f9d4bd17a269020d800b8b96c SHA512 e377d1b41ce45e724b78330c00947a28215f3e6dc94e698df5eeabd4401cfd3eb81d3134f0ece65008997f42ee40cbf16382c4d0ba175df8e1162b73b9c9637c WHIRLPOOL 52b5d3e68e14fa7fca6e03ad60a5297fbe44c1f08fe4f86bf8d337384c737ee29ab9db4c293e89db8b8c37f5139eaf1eaba8635a9be4a4ce5a6fe9103d7d9d26
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0
 
-iQIcBAEBCAAGBQJT5RxtAAoJEC7dUkA7aK9HhU4P/jIdwmXiUmABAEhQIKqx9ySy
-sWdnlsKi0F1PEJgJa5Wd+4MQbl1g2AIzUO0s4BZLeR5ji5LgHduV/jtaXQPMXk3e
-MAQKCxbjmz+2LijC/z9Og6uYOqAHxXC0HUU+wCg/5h6viUn+btkdZrDy+vUAZGpO
-6LQVGdok2QDeIPasyQh/takKvzZ2vo4HgirN+Djziz75H68paZ0dYNn0NGhyIx4c
-JfErTF/aeYVePnY8di+KGPD6wsoJ/LYCAauW1c8NQOZegLP3tBvy9WtwvFemeoQ6
-2klSukojsLpBuajB1uKsg/n7QMs1ua/z0Yg30DHiT7B163idMn6TGRA7L/jAMJkr
-UY1+/gnBlsuEk4IjtvZDy2Xdmuk+ti5WRvsZJ9lVQrungI3bygajs14A/QCAC9fP
-miqQVKWNR9eeThPXDm1a33SB98eoOFqyaLhJVFbeLIJm4X3Cndyyv4yTS1+EiRFV
-Ki2Ln4llWvSU0MBZAcxNp2PIEMsgLf0kRQL/FDvHSE7+TQVLvXIo5+Z7z3w0sPP4
-n7ApURZhKUqJQdD2Cq+Givp+BpKizHwjBKaYFJx7pyQZyvathJMM8ZdODJYC+P1u
-Y0hRxmV+rEqXlF+E1eYXaue5uZWgjYE3hLKakRyjEWOWNgcMvG3SEiPLiUDgCy9R
-dRiZxpxssq7VaCWm4grI
-=pNv5
+iQIcBAEBCAAGBQJT5ng/AAoJEC7dUkA7aK9HDdoP/iKNiy7AMEcq6gh/K1k/lgPh
+jeeCRqFpQxzDBjLx1rM2IUrNwZ2DxSoL5hzbImzAlF1fBjuJ5wyD25AjTVPUNVKT
+kMxCziIjKGGRhm96L1MNVquPUpU5e3WuyBOSw4asmLbWixbu8GLUjiyrgH/GUiP9
+9WqRza7+QZIdwCDMDFn4zQQkFBWD9Msdtwjf6X7AqwS2fRC7naNh3HZ3yB6sHG1N
+b1VEkRv2EJ+fZslM9Ns/TiQZEIUXzM8EraX5E7kJPCmlKvMeMWkS8OwjnjHq/vo2
+wte8NZ3zqzgRAJUAXmf214WXjuPFw4oini7S8TZXnv94tfC1M8UOKUI9SaMcwhpC
+0nFInEtiiXzp2eQRysu9sA8E36W/h9XjzoOcQOqPRHXLF6z6hxABsoC7x3Vs7Hed
+P4dP93TFLQelKCFY0W81DSZ1vTgabmWEinPtMeiDhONElrHTWyhRH4ruaiNrkI64
+zpaqlxz0czFAWmCX8pb+u2lZZ29mO7p9oxJem/YEe3CmJBAAYB+est+u6YjFxJ8G
+vWmCGerRLjyU60EDsHZm1ccGoyLTDToVNXtu709uEVXumauuM8aVmulqtPJ1JmQS
+sjfb4RTkBXcRY12ITdyYW17Qjy5vcOODkGp5ickwG/TngrtKut0NY337nRZcwox+
+hx8AyOCIX/3L73NWPgox
+=SlXJ
 -----END PGP SIGNATURE-----
diff --git a/sec-policy/selinux-evolution/selinux-evolution-2.20140311-r5.ebuild b/sec-policy/selinux-evolution/selinux-evolution-2.20140311-r5.ebuild
new file mode 100644
index 000000000000..45161170f906
--- /dev/null
+++ b/sec-policy/selinux-evolution/selinux-evolution-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-evolution/selinux-evolution-2.20140311-r5.ebuild,v 1.1 2014/08/09 19:34:04 swift Exp $
+EAPI="5"
+
+IUSE=""
+MODS="evolution"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for evolution"
+
+KEYWORDS="~amd64 ~x86"
+DEPEND="${DEPEND}
+	sec-policy/selinux-xserver
+"
+RDEPEND="${DEPEND}"
diff --git a/sec-policy/selinux-exim/ChangeLog b/sec-policy/selinux-exim/ChangeLog
index baca8806510c..63a9784cab64 100644
--- a/sec-policy/selinux-exim/ChangeLog
+++ b/sec-policy/selinux-exim/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sec-policy/selinux-exim
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-exim/ChangeLog,v 1.42 2014/08/08 18:49:24 swift Exp $
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-exim/ChangeLog,v 1.43 2014/08/09 19:34:37 swift Exp $
+
+*selinux-exim-2.20140311-r5 (09 Aug 2014)
+
+  09 Aug 2014; Sven Vermeulen <swift@gentoo.org>
+  +selinux-exim-2.20140311-r5.ebuild:
+  Bump towards r5 (fixes duplicate context for hiawatha)
 
   08 Aug 2014; Sven Vermeulen <swift@gentoo.org> selinux-exim-9999.ebuild:
   Make 9999 ebuilds EAPI=5 and transform to make master for version bumps
diff --git a/sec-policy/selinux-exim/Manifest b/sec-policy/selinux-exim/Manifest
index d0dbb869656d..bfc821a3d8ff 100644
--- a/sec-policy/selinux-exim/Manifest
+++ b/sec-policy/selinux-exim/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-exim-2.20140311-r1.ebuild 379 SHA256 69b9848ad842f798dfda23d52f015c395493ea28bdaff4d779925bf047874d58 SHA512 f263bc71d170b9ef2ef793d778843ea1fced289145bbe00d72f1592829f4381e6c55ab7e66796b6dea1459c7b0d9b5cae7fb11a7051efa8966acf020b698bda1 WHIRLPOOL 609ccc7dd27e08893ab06bf92c31b0f616a7cc7dafabccc519db95d6f9185d226a7b6394eb2f1a8c0122416f9d2a17904b157802ab3bdfb5ce662deccc783dfe
 EBUILD selinux-exim-2.20140311-r2.ebuild 379 SHA256 828ccbebfc9b42f753d50a7c1ef5221d54b821290a9d6915a6a3e4217af880a2 SHA512 4bd03e61c31cf1357e0fbacfcac32aaf377e753940ced9402480a503b9bb2f9fca706e80030df073bd0372a88e1ece500e1325852df5d1abf1d29f7841efe798 WHIRLPOOL 7fb721cdf1cf8466057f02565e2f91df46050e422da4ee32520703e7ba82432be2384eb56d75908858d84550c6f4075631c2505cb6379449ba56006b1e8ad283
 EBUILD selinux-exim-2.20140311-r3.ebuild 379 SHA256 8621466035f8b8d9e6a065757cd8868d0860e26eec9dc8259e9825d11b8b9cc7 SHA512 860568afc433570eac2a5f3f5f11cdca8dfa54ddbe8e7e423544c646f650a7e0692d30610dbf98293244b88e982716c4ccf7400edcff0e54aa44166be71c0a03 WHIRLPOOL 123f2bd657fd480433c85714ffaf99a0ede7eff3e1e8b8d094ae2e80875dfd8ba8efd34cc5c8bc940feff3594f83675bf2724b2d91f2971da0a379383257522c
 EBUILD selinux-exim-2.20140311-r4.ebuild 381 SHA256 961072542f08409dcd235c99d7e7026f1b1a987ff86d9629d314884cc9f2f861 SHA512 607936b5c593a7369aee70bb0475b47e7290c3f10b4344e43b64b3acdf8fe474c6a1c5e387492775914bc60601d11056243497aa2525b70e157cfa91304058fe WHIRLPOOL de5b794d47c1c76982912403cf2ec928ae60c2aab99379cea86028052786fd97d9bcf4c5a7b78667b7d69eab53a0cf72967192565a54360d91c25c462e51358e
+EBUILD selinux-exim-2.20140311-r5.ebuild 357 SHA256 3125345d1195bec885b0a076e48b9efeb05a8e655d730e76b189ad8793edfc80 SHA512 ef5f9589f5a6eae99e1745888039027458d4622f309c9ba4c30bb79976029704b42626b4c4de14258424a212fdfb0fdc1121d04f5ee27e8902bb5f08e232d109 WHIRLPOOL 800d58ce3fd4284123cd209f838094b80e73f36900550e7bf223344f7541dec4c50448f6cb838d27bff50a80122e48c47243d94f87506061697299f4d2d3227d
 EBUILD selinux-exim-9999.ebuild 337 SHA256 d354ff7631b5937a025669f867637c73e7c643c6d186f1e4a89f28462843a906 SHA512 50815fea214707a6795a1483cabf7dfbc880e14dab664c1c592ad542f443a8d48a6ddaae77371209970639017e549792ea8ee80d2e9732350eb038221ccae3bc WHIRLPOOL 311dee8e2296275ba48a833e3f267137dc7cdca792bc86860f1c98cf903cb18da1fbc18396e4f716d0ec5e90811f73266218e1c22b67b5fbedd736bc68dc158f
-MISC ChangeLog 6361 SHA256 0416aca2ffe57d11500235f6f313b2a8ca849aa00fd34ab439aeab657f573670 SHA512 29a5c4e299e3f8a07ac805ceb44330b4de7537c2d6db0b39c48b2af0ab79b08c963770e2f68cb4aed37241dc2f5b7730301df1af2f3f0f02950abd20fcbb4ba8 WHIRLPOOL e4c693279d281b44ca627769d5e905428a7f76842649c125d6c6d0e247b926e1b4f7f8ca9fb8f7836a1df1edd698e92702ba5464cbd7d39ee06b5d6e5bfe4370
+MISC ChangeLog 6549 SHA256 8ab4f808762e7f78c68858e75f0a55d51092fc7648f0c4ed5c64fc8a1b91d029 SHA512 78e2eeab78b0c1e8dcf9a5a4923867f1022a4b4389f628980bef3ac42d8755ee74482e5c59857d464f41cfff457d16e8c51c6f8e9746c1b47aa7854f75e0ffab WHIRLPOOL 6c96d9335001be8dc925d34c262aee456f6d642adcfcc908b7bc6d684ea70e5dc4db878a2b7130b90ed03d7c182320d53748d37b7a0dd21f26db43b9e070a26e
 MISC metadata.xml 228 SHA256 cada615cbdbb7f2bb14b7e8e402412242cf206f4b9f177fa80fca53964c5f736 SHA512 6424390975b910261c90c18255c31807efdd41e2ada537bea88c19abdcf669e57d7e07d69ce0c9021e6af753c81629593b102337b933c280e5ba592a2e5ba4e4 WHIRLPOOL d69776a485e15f61fab1869800a5f2e6b7818bfd4dba43ae8e2701efa787e9928d7cf3c0770543898e7d9a4030d5d22d8d0b75cf249eb4d043a641cf1ff76b32
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0
 
-iQIcBAEBCAAGBQJT5RxuAAoJEC7dUkA7aK9H+EoQAKGPuXisg0uStZ0ZaD7Iuou9
-KN1dMXb4DEL30bWNeVMKdZXaFRZ9+Fw64qjRQyYfhiPWxgZ8qKfv0UKxKVJYv5oP
-O22JYipn1iPXJhzxtSzeqb/c6txtJAuMFdomRj2uniCCuVJx4mtl7gdC5StrRr9v
-ZQ12VEd4xxN6FaZ52B5cK/9sP1k0UQKw1Wbq2R3/tCbau31jaAE5MjBUrtvywtH1
-O5WE32bHDl1EWej60JeacC4ndR7oUhxmw9qDML0B6vxrRZhz9AznEa7HhX6aEUXv
-r0hPtdGPbp2VOja31joGC3XEek3Jvzu7FhvhTfCsmK1agjmvov+toZRd1Fr5TiVW
-EbDy/u0QlmWrqH4wh2yPHUIgmtybDvm9S62PYSlRtmzs1BMnNIyCasMCA+i/S2Zw
-Pq4AA8Cnk6BIWgFmiM85WMvMeWVnVMSdXAW2gojuLA671DJUfw0hoLmYA5yaFw7H
-v79AuFxiyELj7WsZHKjIwkM4lygZlxzGm4O/4wV0Eo5kIO9TXVjUjZnvOFWVop/B
-nEjsV5v/6/2jp47qtvXIScg34J/FahkKBFLg4f8enuCoIrbPYHyRcyQWZx7f88wC
-6Wn3VLa7e8kyNzdZTNzpoD5mPadLTC9J1z68vdDHsreDSV3ZGcviPr8uYQvWTtNN
-PQ5sp6kmRi16wjXedZCC
-=7d+K
+iQIcBAEBCAAGBQJT5nhAAAoJEC7dUkA7aK9HIfkP/jYfqm+Yu0RjxiZzkZaRk7qq
+L69ZElauWaYBPIKI/Qh8wn4xRX7/JMQO3sMy+NcoUYUjIAgvvLBd7fBfr5x+Exff
+BlVtvfGzm6ixP5upadUCLyGbTrZfRPErjQ26h/vXU/8yNlj9Ki77FedUzIGpRCZb
+jv8GqCJlPSoVy7dUp8dBGkVaGdjxiim5/oJIEo9+C8ctICidTijFy5DtaJlvhly8
+i1ZFFfvwvQcSH/McRPuJ/Ar4QWxK8DCrYjNHftl/KbAa0IMIJ8mQX9MI6QM/A5cv
+HaS9/h4S6Kq8pJcJoBJBqn4H0p4emBNBJkRJs+J9AgAez6JFHRMS+kT2vBPtafUV
+FNweUNN4oqNVIayUJ2+P5KpeMmJTothdcjTkyGLzUPtUKe+WBXMwPT7kKuN06qXr
+411ttcgv+4wqeU8aNM/ZrQhZRdej93ye2HPSNvLHIIghAFOHJJ+budLFDRyUfiJz
+CkWWjTH2ogrD94YrdW/mQiltCk9pPvFU40MU+Yw5eQb0pRvIB1AJ+Dr5YCnuhv3l
+Ew6o+fMvqCrX8VUfq/Sc4Tf39UVFo/BeTGr4lQ0LVzezit7ftuDKbYSQrHymtSZZ
+7n+6dplGTXK+RENz6tQKDGXMiTFEIc2DhVGCnAf+nwj5k2bH0TTl/UsxZrTSmK+V
+NeKcj6NUYHoF8Yx6uhtY
+=YOw9
 -----END PGP SIGNATURE-----
diff --git a/sec-policy/selinux-exim/selinux-exim-2.20140311-r5.ebuild b/sec-policy/selinux-exim/selinux-exim-2.20140311-r5.ebuild
new file mode 100644
index 000000000000..d3710aed6870
--- /dev/null
+++ b/sec-policy/selinux-exim/selinux-exim-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-exim/selinux-exim-2.20140311-r5.ebuild,v 1.1 2014/08/09 19:34:37 swift Exp $
+EAPI="5"
+
+IUSE=""
+MODS="exim"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for exim"
+
+KEYWORDS="~amd64 ~x86"
diff --git a/sec-policy/selinux-fail2ban/ChangeLog b/sec-policy/selinux-fail2ban/ChangeLog
index 0a32355d8580..b5d0ccd28a61 100644
--- a/sec-policy/selinux-fail2ban/ChangeLog
+++ b/sec-policy/selinux-fail2ban/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sec-policy/selinux-fail2ban
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-fail2ban/ChangeLog,v 1.47 2014/08/08 18:49:55 swift Exp $
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-fail2ban/ChangeLog,v 1.48 2014/08/09 19:34:05 swift Exp $
+
+*selinux-fail2ban-2.20140311-r5 (09 Aug 2014)
+
+  09 Aug 2014; Sven Vermeulen <swift@gentoo.org>
+  +selinux-fail2ban-2.20140311-r5.ebuild:
+  Bump towards r5 (fixes duplicate context for hiawatha)
 
   08 Aug 2014; Sven Vermeulen <swift@gentoo.org> selinux-fail2ban-9999.ebuild:
   Make 9999 ebuilds EAPI=5 and transform to make master for version bumps
diff --git a/sec-policy/selinux-fail2ban/Manifest b/sec-policy/selinux-fail2ban/Manifest
index 0a1309b3b246..4711048c9ea1 100644
--- a/sec-policy/selinux-fail2ban/Manifest
+++ b/sec-policy/selinux-fail2ban/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-fail2ban-2.20140311-r1.ebuild 395 SHA256 4f52af21d697b8a684bb8a44c021312c88918c85af98ac63476ce5ab4c234c86 SHA512 adfc93ccc09ca2ef58dcb4260d75a1e70a618eac2a682b21eff850c6ab986d021d7da545be822ed4652c8de4669339050a95a1686e3072804cacd00c75f974c3 WHIRLPOOL be6aa5e5dcea33a20f4308086f5e7b072c9b255365ac186311e48bc10b0ac5b5b597c531dfa04f97179e7c19ccf2fafadce712e2ac4fe0ac8e894a7da1fe0b5f
 EBUILD selinux-fail2ban-2.20140311-r2.ebuild 395 SHA256 9678555ae8fc4bbc7dac27a64d727c9ec58bf65cca251918c039ca3a86cd0bc9 SHA512 bd1295cb1eca5950fb408e03b9deddddb15df2217989ac00dc121e189143b43f37cd797dc15b0d6d8eed85d3534e0614e923e9aea29ffc9016000dca874bc28d WHIRLPOOL c87b7e7ae615c9c926031c39a6af366663156a65c683a9efd5424f8d951a448e77e9deff8603fd26962bb482a03b16a5c04587a7f303129a7da09c98f88ef315
 EBUILD selinux-fail2ban-2.20140311-r3.ebuild 395 SHA256 6190d4bcbb3d2fe2bd7a5b67fa4918ef2347d01ba680b407c48b3e2847e3ec57 SHA512 41790ae34918d9e5c7930451f7e8d93f6f0e2c2e3675b6bd8e3434dd489771de113ea492c8508aac87e5c85726ebc93d17a764c05b7e6608bbec68963c18c86f WHIRLPOOL b8dc960561f9cdaccdc1d19282af1ced1559b67b88cb55ce94e08f6293ed4afed44bad32a2b40aec6ca5771a448e3fbd2c327bb1eaeb43265a7744042a376d54
 EBUILD selinux-fail2ban-2.20140311-r4.ebuild 397 SHA256 37ad5887e0a6075a4d4e28d02e64403d7200d2c5422fa2a0b91687190f7e34c3 SHA512 a48d298c2e026bb3a38a49449512e46ecb816cdbaab102e720e33a09fd7f5cfc80477087a99a4f9bf8b0d38ab05dca1f7338cda0dbe365e85941a64d5f65f61f WHIRLPOOL 9c8d582d30e6f44b5bea2a0dbcdd31a4fd23f3a8f9dedd78d49ddf88f2b370b65af67f5dfcc468930c222d39cd8370414395f877a0aea4274f20dc991c48c49f
+EBUILD selinux-fail2ban-2.20140311-r5.ebuild 373 SHA256 cf96f48fe6d6dc7f12f1cddb6708a3c4b46b58a901929089f1ef8aaa70326f56 SHA512 b55e0bcc419791af88f4108e5c527cad6673e8831e6f45348b16f8aa49654d8b469543ba5ff6db74cbd4da37029ed5ad499bb242a78f30d4c7040ef5d8933d3c WHIRLPOOL a6511a93ceaad9ad82976bffdca41f1b97b3a4bbc1059a12ca00b1a920445ca6c0331206f71195d769d9baed31fba78f9aadc09527a657f7388eb9f6129d9fbb
 EBUILD selinux-fail2ban-9999.ebuild 353 SHA256 784526836ea89c9e04bce5db8bd7f71ecce3d1e29ed27470ecad9b3b11bb74d8 SHA512 6853abd82925435d4b7be78b4180014ccdbd87023298af80fb24ae549b26201b0ffad2eacfc3248b8f28726c77fedd46c81a7663a3f84b97563ad78296212cde WHIRLPOOL 098083466c81ba9a9fd033dcb1f63ca2018e4a3db6e7f0d1dc50a70cb821a0932bf02e13807cba725c90b5f722c31d7f1e207d38fa0217b2c536022781630f7e
-MISC ChangeLog 7364 SHA256 8793d309d98e7a1d34813d426046934cc61a71ace314a6277111196a2add7e85 SHA512 f1a649f6362f24bb827fa02374c64a4f359841cd2783a01672f0c11a87c2b23443e3040f8f5a51d9ead3ae0c3081a812bc74859697bea833eb5980fb03fd543f WHIRLPOOL e5590f4c3cd9c255c7b0ccc0dc1535ad2ae071626f5c8963e67c498e532b57902653a3ba73c35c2ef4a13cf3bcf9c129e864016444dd6048cba97ad8abad1765
+MISC ChangeLog 7560 SHA256 023b5eaeb4f819f4be4b0ea5dd82dead895418b3fc5635e3b3ccfb3676b6f23e SHA512 a7424941630e1d4ee9c1ed074a89ee42a2c979fdde71de1fde167fe2253cd4dc84376cf261e91c9c9f69bfb5ab506a27e2cc16ed994a883b1206ea24c08255dc WHIRLPOOL b424a785b1d29ff1d42506a024808ecc0cae7658d9401ad0a9cc026aea587beae2685cbd1ac4c195998d85feea16e51e62040ea705e76fc6087ab23dc4b19252
 MISC metadata.xml 232 SHA256 74ef9c7259739260ad14ebf2de081f8a24766253e19a30e021816f6513b56270 SHA512 8a892867d4ff29d5ba23ea87537c019eac96a64a0c84dace14906ac4090110381564abaeae201283c3d60294f3271f9c07d14ffc871c96f8c49868e0ad34b101 WHIRLPOOL 723e602ca2512763cf8028ef75779dce692f465885bbd1fd3594deb1636b99fe7f7b036567b3d65b2e0a035662f92ef07873cd6a81f098e42a0ae07bd958fe46
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0
 
-iQIcBAEBCAAGBQJT5RxuAAoJEC7dUkA7aK9HXv4QAIyOfzJI/5Wlrrt/2OlbEDc2
-vHomMbsHz7ChUBiTpBSm/O37Kof+QaOnaT2dV8+lAfDeKbPhG86IpSihyhasCumR
-OE8KVp//itsTyrRIb76edzEjebn8r/Ss8NhL0gGKUOKRNusLHS8JPVOlMldf0dK4
-z30e8wIXEVyh1za9RBqEoPJanfLJqatbxzl+Ukk2/YyJBE+2bRv1Um07CXi4jdGZ
-okyPVcBdAACVCW2lA7BUNWJvAcZ/6HXLxvHoCzc3Pkk70+fplKWb6CA+Bn50vqJy
-KShxBgWOS3c7Gpc0M+SQUt6L3+MIcaEghUBXQ3GYrGNtPwluC+c+cKlgXyZhsR32
-ZKa5eTTUVt6+e2Wkch/dTibv0EB1HJG9LMmH98W4xA1+gM8PcqepZVF76Te7AXsS
-Fy7NVkImA3iHBtN/f+Txt0prXLy/qQ9IubMOjysaO6k05ZMD2udC7MwQf2TPEaSp
-XOZkJDi7Dj8zZt1Rjp3YVZcbBdrkw7gjoa89jQPWPKvU90OhP21Db/cN0Kiv8l1M
-40fVaubwmljUxK0UWBVmhzs6OIRZSLna1G0DYXlCnU8DwH1p1EILov22irdTYajQ
-qNuxSb8AcJ3YYVMhmAHjui3i0R5taRvUVVq2KS2ngCKeJkYudXtNf6fitVq/wWcN
-zbknijWOM6x9kUdkajlj
-=RNVC
+iQIcBAEBCAAGBQJT5nhAAAoJEC7dUkA7aK9HNa0P/iaVKQTmjs2UNKIb6KvVnb5E
+UPxLftC6+6GZewFrDMdelk+uOXVsklZGAm7/pAhoiFx4qglXn0Q1wCeJBj/5Wp5w
+nZzUw7PG5ROXqtyyPgH0d09bQ6CwDlUS2bH2xLvpi5QaAT0ZPx79bUyq7iz8fSpO
+dYvpUbF+F50T4dRZfMz4To89at/pNb2YKGDpye5wH2mOQWUNuVojKTQjuBIVhhQR
+4y2ao3HZuB66NuPh1AvVjOOc69arbrkDcE2Gta/W6E/w487+y7OyMYJVNSQBYPe4
+81WCJu517wvhu9H6hK4cIxSeGfSFDwY7PuxYtRVg5KvAzxU6uzYCXUeyphNpOso9
+WU/3Bo66zc9clmz4ADvJojXOdbmBQFKbD68GRCB8lXn0gzpJZLi+7Ps/AWcsTjOe
+P4zYAIR8SZl89IbPk30QXhoJq6q+DZBB2kBUUo0njIVQS/x7ZOM0E80U0dD+KMYv
+nwUOoxv7sVcZuhqPpe94G3nLKUkBXxHSw+jDAU5W385lB90LbGxfKVF5AkbTF80W
+HUcB75m0lqQ/amho5HrmteRRyIKhtDFQ9uG/0BuxQxkWFiFifnb5EQ3g9msGJS8J
+hS4OlD+s7J+ekkGJTK8HfoyAh84819EdwOBcf8n9n4lEtEteQ20DM8omV1urE+9B
+1Uy4854sYzgKZE6NQMq5
+=csAa
 -----END PGP SIGNATURE-----
diff --git a/sec-policy/selinux-fail2ban/selinux-fail2ban-2.20140311-r5.ebuild b/sec-policy/selinux-fail2ban/selinux-fail2ban-2.20140311-r5.ebuild
new file mode 100644
index 000000000000..41e356d61615
--- /dev/null
+++ b/sec-policy/selinux-fail2ban/selinux-fail2ban-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-fail2ban/selinux-fail2ban-2.20140311-r5.ebuild,v 1.1 2014/08/09 19:34:05 swift Exp $
+EAPI="5"
+
+IUSE=""
+MODS="fail2ban"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for fail2ban"
+
+KEYWORDS="~amd64 ~x86"
diff --git a/sec-policy/selinux-fetchmail/ChangeLog b/sec-policy/selinux-fetchmail/ChangeLog
index 619b36ff68fb..c00c55e7e388 100644
--- a/sec-policy/selinux-fetchmail/ChangeLog
+++ b/sec-policy/selinux-fetchmail/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sec-policy/selinux-fetchmail
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-fetchmail/ChangeLog,v 1.42 2014/08/08 18:49:41 swift Exp $
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-fetchmail/ChangeLog,v 1.43 2014/08/09 19:34:12 swift Exp $
+
+*selinux-fetchmail-2.20140311-r5 (09 Aug 2014)
+
+  09 Aug 2014; Sven Vermeulen <swift@gentoo.org>
+  +selinux-fetchmail-2.20140311-r5.ebuild:
+  Bump towards r5 (fixes duplicate context for hiawatha)
 
   08 Aug 2014; Sven Vermeulen <swift@gentoo.org> selinux-fetchmail-9999.ebuild:
   Make 9999 ebuilds EAPI=5 and transform to make master for version bumps
diff --git a/sec-policy/selinux-fetchmail/Manifest b/sec-policy/selinux-fetchmail/Manifest
index ab551b2039d2..01bd5921dbc5 100644
--- a/sec-policy/selinux-fetchmail/Manifest
+++ b/sec-policy/selinux-fetchmail/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-fetchmail-2.20140311-r1.ebuild 399 SHA256 5246138e008707888e85e9b2d2cfca7618abcd0186b364548c3457f9f8d6e39b SHA512 cdb48630993249182814bb1bf8a8b4ead0ca801ad40452bc8748f725dc8ecaf1b6c1043734b49b2dcf6483a1068e556797b1c7612a5610ffb19f2cfa32f3364f WHIRLPOOL c3f7fad8ce12738af89d7ff97b19facfbcfa84f3213c0ba760542149416b126d60dde00441997c8344f2846c3938bf1419df86000bd55445e3d2973f850f0c52
 EBUILD selinux-fetchmail-2.20140311-r2.ebuild 399 SHA256 73a681f3a4eec5f12e6a1f88b39f100b264e3fbe9e4836e97f1e9e01f6bb0de4 SHA512 7c5149217dc30042aeeac7ceb750c9b0f34a42ec225a56cc02b3abaa9aeedbb0f14cc2ac602e4af68942bc1e6d40dd7abb47a58149fbfb12d8525254f255f15a WHIRLPOOL 2ebf101428ffc6341d6dbcca07de285a5b5ac27436d085ffd84747b744d856551f8a5ff067c321971a4ebb8564283cbdae78c283f88612acaa345cc199ba3bad
 EBUILD selinux-fetchmail-2.20140311-r3.ebuild 399 SHA256 9b7a3c0041322641e543892f1c8fd5f47dceecbf8dc997fbb5363db0f4676241 SHA512 fe6e4bfe3e12d947526f768a342c3e55b287c8286727cad59f6294081bd29cbc9ec0d19d28b101c5447bacb3b1da9df345320942f957abc18fe32da4251772dd WHIRLPOOL cae30677139f3af05ef013039f305d31e46546dad64e19aa17cf6de495de30a7d10a3ff470334eee23cb29005e9700bb7e0cf257f04627952e8fedca7ea18d12
 EBUILD selinux-fetchmail-2.20140311-r4.ebuild 401 SHA256 c038e205aa51be891ccb8776eb2e204973d4a1f116ec3d806a34e332397ca0a2 SHA512 c0d4a119785404dedd5284b951515c9d45e649f1278a74e40fabbebd55fc967d2759cae86a5d8a97a29569559d35027f0e48a0c06e714b3809402d9dec89c716 WHIRLPOOL 88f4280d690fdbbf180c5273f550bfa007f8452a2ae487560b06e3ba0ce9373c0f65c9b68eefeaf688d13227c1142fc52dcd0b10df097ec0162cb19383867a1a
+EBUILD selinux-fetchmail-2.20140311-r5.ebuild 377 SHA256 d0a243288213d943f8ec4ea5b611017013120fc276293c6fa233bd418c169ea2 SHA512 6c912ff999d96c1386499aed772f4ef6d2bb29b75ca055b9398b4a8d86e6356fc706d90cb3f54935252a9b4b373d20a6db66ea2267e7e4a8b66fb4c230f857f5 WHIRLPOOL c28f1ba3ccd082cec3fc8cd18ab5e811e72522709fed3e713210a3040bef9fea24e461d4226b130a9225456240a521f67deb0438072b8b8b8c04fa70473719bd
 EBUILD selinux-fetchmail-9999.ebuild 357 SHA256 a099b4034c9a76f40e1ef768fe41015c694818dbb0f21b8278671811ab864554 SHA512 5a0d8f5658e7ffac71c11c14c3bb6395004bc468469d3cabf294f6129bcf92c8de67a7adf8f544fda1391fd8d5d0e12cf427dfa6f97af778d34bb6d1f828dff3 WHIRLPOOL 5d98b974d31df1d0dc26451618dff04db5918ef2a576dba6c4329fcde29c73b2909a8b25bc1fbc6780c8f59d488baf857ee414f3d9f173908a2f299637619bb9
-MISC ChangeLog 6750 SHA256 bd1465cbd4bd2d4f6e68f2fb12b8db0e851b3bb4dbbe50e35645601a1640e993 SHA512 67c1801fc991c72f49f85d4245f62104be3ec9b2510797bd9bd29518e418ef9d3503f6b7e9537894841d105c1218b84d4bd16a8cbcbb5844687fe9e27eecefe4 WHIRLPOOL cc1561f6d8978c02a4520285b33399a1ba56828be3431d01dbf05c060501fc906a5f85c7fb138ec55e14d34707899f66dd49d7267962eff93c28f4f58990a6d9
+MISC ChangeLog 6948 SHA256 ab126c1620825b00010e54e3df5dd952972e162e052b523755d9fef9b68fbe13 SHA512 f58b4df92aa30a135d4b41e1a853ad8528f1f9f9ebc315369dd2a3e9be83b3283a06806dce86935c908fff240a6a65be8e57a61c22e377807acee9db6487dece WHIRLPOOL b4d36544e3644a4620a2c9b974140b8d6720b8b2013d357af059b45f1b29d71afcaca91432985065227c60dedceabd58d452c8aec8de6a2ffe6aacc63147090d
 MISC metadata.xml 233 SHA256 e69e1a9b292d80ef9e4e282844fa1779de754f2216cfe6dd3fcd27ce4af0e8f7 SHA512 734b786d81dbe875e695fe7da3940d5c24dd88861cbd7ede7002e45f725f732b96c35746ba9ecf112fa490ad160f55f1f9cd8e344efd758c49082e8ce0bd4db3 WHIRLPOOL fb08dab30b58bfda7e8de6668777eea6e940ecd7b012e310e1a418f9133cbf17628c247cbabfdf26a8a9ac3d07977423368d912cfb794dd49605356094897987
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0
 
-iQIcBAEBCAAGBQJT5RxuAAoJEC7dUkA7aK9HcN0QAI+IdsqrAQ6yi08QI1d13xaw
-cwYLreYSC7YJl0MtcThGvL4/rhvKIofOkTJsQsIzBQ6X0tO6lgtwVAzTWxX5nnuO
-t7KyOAzShSDGi2TnOm0y3yC/cDo+6t/WHckTOmORYgLb2/ZinADivNws4drBW225
-iMTjV+SEQ/Zvz74ErXx5EEqoJgqkm5t6kcNHrovbAQWB84C0O5nsEBc80I0vWGqs
-PZsIk8SrLq4mS2sG7J+YsslHb+b+IL4rYWgxfDp+96rH5huInvJCfL22FK0pEFNj
-bPutp0+cPkPbKUlT39Lz57OP/aD7//QEyyB6T9G6QKbjaVQ2tGF7PSa87bdihbxi
-3nvQnn5xasHB3A4ln//bsGXw7IIPOIC1H9GEwRtoUV8BsCDtkxyJn1/ldNQJCosZ
-2IEmhmna/ioQuUFFsCraSQRi/sFGv5oS2RJi44GiMFn0Jn8DV8KBYjMixolHXwjz
-t2/LUzbpk5uviK3qErvSltOrzgOziKWxo4ckhkjJNYwiZlSl0XLKdGi0DgYBUzfE
-P2aEysZelNyHukIHr0e11UL3zhDFbZayhobb2jXdB3CzbiKI/YMTft0D0IO+FZHQ
-B3vXptEPXZ1OyzCLDfs/s+tSxRcfrOAua6klxh+R1dkm6dJO0snkL1KIphBmshhJ
-pLP8KIXPghp7knpV0ubW
-=mmWJ
+iQIcBAEBCAAGBQJT5nhAAAoJEC7dUkA7aK9Hp04P/3gCk7Dx3yJfQGtmTUmv+61C
++htHab6+a0E3nNUUJWfgw7oknTIJ8B33K9crWcUwBi1874sIrcZhJ9zdu6HplrmY
+RaO6QYr3+bcOw+n0wDwTHDeylyy+XIX0x3MR7QOlvk3OcW/1VXQL7eO9L566UDb/
+WD+yd1zsMuEXuEE1V6PyMpVqXlkneXRtS30WDMKGbvA6seibMwtrwy19+sC1SgBP
+Dbw1GRfWei6hbudqLXZPVi0H/ft9+of2gZrqbE/kijXc5y3zKT94NJg7t4qh2mrI
+Uv1i5Cx1+60rXPM1/XzWWMtY9mXeCeOxvl8nD5af3ah+lHUof4zFq9OtYHiQldTZ
+QL91yUdWL2oqht5pWUPrs6J1Y6nCfjal2TrEoc5FrfkZvzdktz2Z4SJ1nPDqWuMJ
+YxArg8Q393tt4d88zVeuU/edaFaLO+i/MUfYLLim/AbKbj9WstwtwAbGhgTW3Bab
+iHs2ZqU0LQZyy9UoFwbUIFW2Lqqy7BFFPlLA03ke7AEJeOjBo5jbPEs5JueZEmt+
+g8xBfJTn9AlveORpe3CTQ9q00JqiMmza59/beu1ZebqsOS5CC9g8bNUrYfxlgn5H
+FrNdifcFLqOzHaj8i6U/ZQHchOPC9ayPz8rZmjL+KI2hE3EdWfCLhKI5m87ugLuD
+t/EVvspmzCXKq+Kr87CL
+=o90o
 -----END PGP SIGNATURE-----
diff --git a/sec-policy/selinux-fetchmail/selinux-fetchmail-2.20140311-r5.ebuild b/sec-policy/selinux-fetchmail/selinux-fetchmail-2.20140311-r5.ebuild
new file mode 100644
index 000000000000..7de2257a54b2
--- /dev/null
+++ b/sec-policy/selinux-fetchmail/selinux-fetchmail-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-fetchmail/selinux-fetchmail-2.20140311-r5.ebuild,v 1.1 2014/08/09 19:34:12 swift Exp $
+EAPI="5"
+
+IUSE=""
+MODS="fetchmail"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for fetchmail"
+
+KEYWORDS="~amd64 ~x86"
diff --git a/sec-policy/selinux-finger/ChangeLog b/sec-policy/selinux-finger/ChangeLog
index ff3192e8f479..3f90934d6703 100644
--- a/sec-policy/selinux-finger/ChangeLog
+++ b/sec-policy/selinux-finger/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sec-policy/selinux-finger
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-finger/ChangeLog,v 1.42 2014/08/08 18:49:53 swift Exp $
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-finger/ChangeLog,v 1.43 2014/08/09 19:34:03 swift Exp $
+
+*selinux-finger-2.20140311-r5 (09 Aug 2014)
+
+  09 Aug 2014; Sven Vermeulen <swift@gentoo.org>
+  +selinux-finger-2.20140311-r5.ebuild:
+  Bump towards r5 (fixes duplicate context for hiawatha)
 
   08 Aug 2014; Sven Vermeulen <swift@gentoo.org> selinux-finger-9999.ebuild:
   Make 9999 ebuilds EAPI=5 and transform to make master for version bumps
diff --git a/sec-policy/selinux-finger/Manifest b/sec-policy/selinux-finger/Manifest
index eb75511dd0d1..214889f1fd4f 100644
--- a/sec-policy/selinux-finger/Manifest
+++ b/sec-policy/selinux-finger/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-finger-2.20140311-r1.ebuild 453 SHA256 1bec16e56a79891fa5281545fd84b6d851096637421714c202be35dcce47c678 SHA512 e0ee1d6918f3994e439c94efb590dcab5a507d259178c620d7e301fe92a631e14a141da35379b458c2ffc0dc4ff045013827f8f3b83d06c383d6b49d76b85c8b WHIRLPOOL bcb5452dc126ffb31be47a39c1d7e3f6f8144dd513f7f899986762fcb7411220296d579a7066644313dfd01bed67a401ec7cb111df5ecea6987afb75e19cbb31
 EBUILD selinux-finger-2.20140311-r2.ebuild 453 SHA256 020f9a3e1c495942a9f146e4468bccb471ba1f47b0da398aa4dc9c787f0dbba5 SHA512 9440be72e2ec34c179a9530ac8b5efdfc13e62c3e36a8ccc45beb28784cdabaf8a9266fd7d69e5f3b66c2dc85a34b75c1bd974a3888d3bb4efb0e469148f73b5 WHIRLPOOL 54b6a978837386d2ae50a35234fd8f99095fb657f2a0886ab20b2c1d26ce401c8b731715706ffb977e3ed952bd3352ed2552cb629a2c3a4896aa6694d75045e8
 EBUILD selinux-finger-2.20140311-r3.ebuild 453 SHA256 569fc602be4b428f234629f3702c5ebfe00e70741962f6435012e43dba68350d SHA512 e2131fc88d2adced18c961286eee8db6de3fdcca53e44baace406866d5b7e6ef7908c86d2d63dca535b83c055b967ba5e5d1b78376226a6d85cbb9114cd88d22 WHIRLPOOL 4d213a4613dfe71c15e27a064049050c262efc619ef8213a05b79e9ae3a80a230d310d3da9a6c3788138213cecad74b7be0cdf9d4203f175e21f5d4733a1319a
 EBUILD selinux-finger-2.20140311-r4.ebuild 455 SHA256 24a2cf7b15c76744b350769a893c8e16e3fb65a1bdb87d5351087f84f1ab1623 SHA512 4850f2980d005aa0d42b86b187d36fcfbd88e44358ef98f114564f9ea33b3f83cfcf9a4770e90fb7fb02197a333925fa2a28c00d299bf34b1d38a7306e4cdea6 WHIRLPOOL b0584e5721b666db1895de6746294baf98a6d1ee0e90c5f5d98f5d2469ec9d65fe40982d284d284219e20a5be9466423ebf55a808fb1925ea7a2ce115370790f
+EBUILD selinux-finger-2.20140311-r5.ebuild 365 SHA256 f27d8b80d196d219f3a9cb67c6aea684d6c7c19bec49bb9ed9da1ebeac7f29a2 SHA512 e6d602799dedcf7135a9cc01cc885b7b802e34e38b3757d346447e3e0313496db50ca8c4cd1fe20750f0ca370fd4116158854016e8e41ca6bb4df28ef2aab13e WHIRLPOOL 0a3b217a0857c8ce5a298db67989fe051b86c921489e7e7e073150d5cb38c2f6844209f5352e15efb9fd3dcc0191982d1ea22b5a502f623c8fad86b912f95659
 EBUILD selinux-finger-9999.ebuild 345 SHA256 fb0334b9d7a5e8a497d832a99e512ec54d32987792cf99d6b44f66a91433aae7 SHA512 0a377f87c4ae7bd5a33556eadae207bbb503d5a21c631a199960846ded4b38066a4069cb14f8c40f6d698f4cfae615cd83e57dd95580781c865cfdcaf9e5c448 WHIRLPOOL 9bc9fbf41975c5c2a09634ee262c0762783b4e954c77c80163e369b015c12be3f806989326ec2061a3ddcee7e9128d5268c420db8899a3c118ec38c6d93e6c47
-MISC ChangeLog 6511 SHA256 74718c057e7f17daa38f19fa0c8405cc835b218498c6d1a9f415226d2c332cd8 SHA512 807486c7947fcfd7788718b89251d64e29f8889ba0a8a2e706061e05d477b1ae3cb427d27a5d9e54b33117f25eca8e5e9bcb998b5fbd3b89776358f1bba194ce WHIRLPOOL aaa300bd00ff3be59d34ca9b5d91a6a13df52f89a05b2db09b57db48d248677538708f8d42e81bab5767041ab537a232c44e53e82d4dce35c9a00176475cf7d8
+MISC ChangeLog 6703 SHA256 c1efb281b4fe2427f47096eb62b3d64e74741b406a0c7cecd85f2ebda9949bcb SHA512 6d209decb3697f740796e380f18fdcb90a4694482a726a125cce3af7d989f1f2f1221857605ca80ba55f6d4a0f58fe1fe4365600f06ad564c8d30d3f4fbf5865 WHIRLPOOL ef5e3bda402771a50e6404e5cfb742961b30f0183d3cacb02dc023c616fb5060ee0c740ba3c7181a2ca7cb5f52a77730de1857defb3263184106523523b04a6d
 MISC metadata.xml 230 SHA256 4fd944fde397f53c493c0ea72a67c4d6e0f4ab0a1419d18ac08f6b757ecac294 SHA512 88e078964936e4e7ed6bdd90ba87e833866c8be87dc91d3002f75b5456e64bbbb2f4a978d6fdeec7ca16d5c09b319ffe23e3fc5db0f48d2a0076f53c88addb86 WHIRLPOOL bfca88c8c70f3fab802584eb73164a94f5b6fbaac190d4a6a7727f8d24f57640618fe7995b3766e7e5510682b281653624f3b9ee8c0137a11e63085f0a2a52b6
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0
 
-iQIcBAEBCAAGBQJT5RxvAAoJEC7dUkA7aK9HRH4P/2PKjySgLgennRsxQLNSksRc
-qogH+QDte6GQYj+5cgFpp3dbc339CGI/BTTDUEdrmoHsr/NgkJi+z4CT7Ulsy6LJ
-92en0r317M1QfR/IfuFjKOUZWRhewb0Ar/sHgcTjY6JQnyV221aN9GLnhr470i6J
-KeuMnhVNDD0c3z6U+obfkfwGLsRjQ3IkWm8tZWzIhsk43tsP6Llh01E0VIA+OSuC
-hPHyBoWoovo16Rp3bHWnFTJE0j5EEgvGKqWXeHf4YS6XKkqKfnxtPpKdSXSH3RPS
-UEzbHkIFRL2EeFa5o2tywHG8lqxBVag3gT8aX74RIeH9bDCNOTfHQKtIctf7ZhUR
-XaamkXr8XgrwyGorXxeck8BNhsYj9n01P5VPta/oOutveNjlb24iCU6/DMATSXBl
-65D94Jof/+bYztfXrPUdc58Pq/eS5GWhMCQC2ch2oV6QJLM0IWUko15YA6vbTWQU
-QwH3aJPvT8sc0YOg4TNKdHlV7q7lb+icdXIyh2ELGRHYnAiJOJMO4iQhRGtsOjBI
-GR6IhewrCB2v2e/RbQofanOYegzYNz0qKL/ZjmZRGQXUaFUxh+41qFdbRywhKS7x
-Ouaddrvyr+FGpLU+upiu0CAIXXTj1KYXmahZpJ03nHLY0JgEpEEKPsjQz5Oz6L4W
-G2lZM5VF+MRq1dlf4bgf
-=2KGQ
+iQIcBAEBCAAGBQJT5nhBAAoJEC7dUkA7aK9HPOcQAIg8ZbASUY1qFOSugyz13ODJ
+L1ZX+MHy1bS4CswfL1s+5iZK/CbUctO/qFFjf1QE7RZyQtJbo+CEMEaI5sLVEa1T
+2qGmlKs34xCrkffTLcqrr/QMB2WsZp0NH1ZQFkn3O2DUV8Wib/fNfPbmpOzMOB2p
+c+ZyNd2j3YKI6uTkJGvDlh3tuwE2WaNIW+FzGR9ho9ZRPkSTzhoU14No4ix2DiBH
+uobZ8Ts311ffBG7zPoBAaFiRk5NO8ZCzQFZax//sFKsRiVwioyXOcH+YRnYJNv/E
+bQohEe2Ep/3gq/vcEqixh/gFh3mhdSjO1X4zGCe/zckuOTEgWXI9u3JSoQvEYVWy
++y883qK90Ys+spJVY3VDOMvLCsNZz8E+8JdWwAZzZXAOtZR9u7PtLcHrhIPpe5X3
+V0r7rKdWEWO2BqM8ybxMvxG1xLu9ddBRmDMyCsEwTX8FV/OZjkxr5HALuI9IB/mG
+YLGfSsG0juMO1qnlQJSRprWIY3ADvkRtI38xRiMb3agcHK/G/uX1Q51K3zRKsEMv
+AyHbCIN7o2HJc1qxVD2JMPd5GVzlR898NSAay3MUlkQxscYq6FGemZ337XLP1F7p
+TIICdvZZKw+6NGIjnrZ+Qz19a/9mtgS91NzqY9m/z84+7SenFfH+lKf8zzM2603H
+ptj2BmBqk8bXojpuKvlR
+=3C+z
 -----END PGP SIGNATURE-----
diff --git a/sec-policy/selinux-finger/selinux-finger-2.20140311-r5.ebuild b/sec-policy/selinux-finger/selinux-finger-2.20140311-r5.ebuild
new file mode 100644
index 000000000000..2a46b38b323a
--- /dev/null
+++ b/sec-policy/selinux-finger/selinux-finger-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-finger/selinux-finger-2.20140311-r5.ebuild,v 1.1 2014/08/09 19:34:03 swift Exp $
+EAPI="5"
+
+IUSE=""
+MODS="finger"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for finger"
+
+KEYWORDS="~amd64 ~x86"
diff --git a/sec-policy/selinux-flash/ChangeLog b/sec-policy/selinux-flash/ChangeLog
index f7e70be996d1..5e72ba2db3c1 100644
--- a/sec-policy/selinux-flash/ChangeLog
+++ b/sec-policy/selinux-flash/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sec-policy/selinux-flash
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-flash/ChangeLog,v 1.29 2014/08/08 18:49:39 swift Exp $
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-flash/ChangeLog,v 1.30 2014/08/09 19:34:08 swift Exp $
+
+*selinux-flash-2.20140311-r5 (09 Aug 2014)
+
+  09 Aug 2014; Sven Vermeulen <swift@gentoo.org>
+  +selinux-flash-2.20140311-r5.ebuild:
+  Bump towards r5 (fixes duplicate context for hiawatha)
 
   08 Aug 2014; Sven Vermeulen <swift@gentoo.org> selinux-flash-9999.ebuild:
   Make 9999 ebuilds EAPI=5 and transform to make master for version bumps
diff --git a/sec-policy/selinux-flash/Manifest b/sec-policy/selinux-flash/Manifest
index ab4315dc49b0..31e45f015af5 100644
--- a/sec-policy/selinux-flash/Manifest
+++ b/sec-policy/selinux-flash/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-flash-2.20140311-r1.ebuild 383 SHA256 fda5d692491098f50e116f31aad380b6f82264bd85110a49bf777418e5f5b1e6 SHA512 2dacd3d63db7b5c5e418454de484cee88dc63ba8e0477d746e96f65080e85643fe8cc2ae2208800b2d6ba7cd8bf8f0b247d12125e3645e0dbcc827f0709444b9 WHIRLPOOL dbd742873ba47ed9110c60e104482b8eb80c9bca67dbd785f2c733f054b89a8873565ea108814ee0f9239dd0094340960bacbbe9027931feba8e9507518519e9
 EBUILD selinux-flash-2.20140311-r2.ebuild 383 SHA256 3d591892cec67440707330b94ea1b9cbb5a75676be952c84aa2d33b8bac4e41d SHA512 b94ae44ea10d818eae88f3053ea8bcd6ed7f45a029d6f1b6121639a16122026f259f345fd2e43509339041799d4581b982afca9df04b65334a4c57a927943032 WHIRLPOOL b1b671138adce91586b1eacd3c44d2dba495870f7feebe1091c0357881cf9058f76ccb860da4e2b0cafaa4b97547b02c18f29e8c79cbe0e8468df66df42e28b0
 EBUILD selinux-flash-2.20140311-r3.ebuild 383 SHA256 10f1461314c4fc0fe898ef836fe6eb30547254d090b99d1ecd39003a8c265343 SHA512 207f92d2f7491a142d34141ed013d5017360d66d3b4ebc753b5ee23dfbe96b4d6e57aedeb714d22f14c69650e844e773580f7eea86cb2899ba269ecf680cb7b2 WHIRLPOOL fbae42d287dc8abd8a2d398843a244a112c73521ddbac678d084b7c0011af985a71a6fb4ae07fce2acc0d14bcd102e73787c06e81e026d58bcc573c17a42b80b
 EBUILD selinux-flash-2.20140311-r4.ebuild 385 SHA256 bb2ce96c4bd034ba60fb8b3e7f70e847072d9a004fd3a015a40eb9afc32988f7 SHA512 7d4a131db5067eeb7d9658b3eb5f9e7357f49d80b3df0345888810efb688240e44967022c7974854213489e4efe060afda5e18a7d395474e23e66928439496bb WHIRLPOOL be0d994f76886294f29ee64f5339cb33bad0f4a77ad989286f98fc8291ee7b2c744feabba332c90debc008c9d0c06568b4eb78eeae568c379fb9968b00ac8dd9
+EBUILD selinux-flash-2.20140311-r5.ebuild 361 SHA256 36ea1d18ab9f5823f752aa190c7c4125fb3a515a2d689f356798ca5aa63150dc SHA512 eb426a49d2cdc545be05fb9151083d04bd69c69e5d8904e112165c05e13accae73bf201469811ca66c1a6434863353b152ea1b86219e98bcead0b533bd778975 WHIRLPOOL 8269271b0e5b3cf3da3a48a9a39f1c83a1d079c411ef7d0e5b1b1698c19780fe472aeb174ec074d29d32f29e76fde48c54245a42670005156c6c017fe1e4abd0
 EBUILD selinux-flash-9999.ebuild 341 SHA256 a6cab51a9216f4ebab6ad67f0c49ab4b772ba5c94050f324bd7615f0219f26c2 SHA512 1bf115f7b4fe05f0d57c84c5c4fd43c1817f92f513b86a01ff407c45a4754886e02aac411f4699a1a79fc7dd9224480f474966311494ae0c259e8358a7c03c3c WHIRLPOOL 210a8ca3ed1ebfbd3e738c7351fe6d8887a038f95fdfcb7ac74d538c9920bcf375079684f7e66839e38a7974c7a11d89d69df3beccd446727bae7a7a239c5be3
-MISC ChangeLog 4810 SHA256 12aad29214e6b1e9e5f8d90a1606d8974a3eb78bc831e3473ed7290491255334 SHA512 600f5f631f49b5e3083156800c9f0e88fd8519214f4357fc63828c9160bd36ec849e192ada2a3113dcc8489f5e697c4996d96bfbac8bd4545819b7056cba88e6 WHIRLPOOL 1242aa79bd698339a0d090cd1cc015f3e984222fab4c52e77fa5431bb63928a23ffd5884616c3f4bcc7e4547314a8b4b9c70bd87ebc979501c4be885a60584d9
+MISC ChangeLog 5000 SHA256 dec3b9e6977643bb43b00234d34b910857588943a24e50a1d79a29b484e38cd0 SHA512 0e01728482a549612f937d477d49128e91a4ffe637297e9bde4df37820c8e07e14fd9c0bfb9aaf4ab7db71879712ed2e120bb27626a15cd34616ea869786858e WHIRLPOOL 066d51da444de3747e7c0906065b81a8dd1cf3afd66f328f433b85a3c98aa1ae1899c833423f1f6bee25c30c060e9d187e62679307a01a9b37e93359fa862f26
 MISC metadata.xml 240 SHA256 01d385d8ae6d71bfa890324ebdfbd645d7908d3209cbe5b3a604b797ef14c9dd SHA512 703cde52d9d5cadb13b181bffbcd882c76e64e1e127a0ccf4e1a5cb7a83470d79e56757c7c4be3b2bdc33925d9362ad571adb63255d8f38da80d0054d6ccee35 WHIRLPOOL 22bcdcf1535dadb121aa8c660c383e4d5dd563682b6b623c5b970079d537cdaae2e89c0b84077e83c2ad2b92772e323c530e7dfb905a3d7e6ca77d0362168fde
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0
 
-iQIcBAEBCAAGBQJT5RxvAAoJEC7dUkA7aK9HBn0P/AzjlCjxFhve4jraEK3tnlz7
-+a/HKjtAXzAmyflnstn1ud73A1N7JWSV3UyduD3G6S5wpEWIY6/vq4VjpFikFFb5
-mCYGorfmUbaFNuN5lrsq4ojtXpUMJ49drLQXT8VKVz+MXw/8n5XXF8sQiVDM36Nb
-wa/LsK6sXhzEfoyWkdrdNQNjDAXpiLZ9m/Fz811Q7CZ9Kn6KO+mBhXo5S2zkRYnX
-kp1WQmdtLwwH3i2JDrwAzvSR7DerwgdPei0l8N6NFaTnq99lp8V5F0p9RjgjaR/R
-8bwSk9AEwgxj6E4x6walAS+pJBrmHM25D8PZECAOfVomkJQ+DL3G4y7dVCbvJlZp
-9yxGFBaOcttEpIz3JpJ0uNv9Ss5ksvX4maT+Zt2sgmnw2e5RGJ4oMkv3K917ECPI
-xFt57HA2B2ezbgmEaH7CSqGi1LTZqLQsENU5gWXe4WijtMFcQHJ27AgThuKRc8uI
-X/n7uqhwlZqDewZ6/fMQuOZDBBZenYXnJnlg514wx5uz1eygAxkR2MeR+bbhxR/F
-icOu+utMKVSdfRzVITkA/Yawq8ITyz39pHbzZobU05Hm5wCBsWAHJZ54t0hMQF0q
-5XfsEYTeRQhHJ8ft/RwHm7g25Hc63yKpI/13gwkVBEIyQAeXCTf5TM9vTvY5v2Ri
-M1JE3cpQQKXswE4O3ULv
-=etli
+iQIcBAEBCAAGBQJT5nhBAAoJEC7dUkA7aK9H5x8QAKT79RvBve9tOcDP6/JD1c29
+m+H7Gzddsjey44gKzsVfrFBcvkYM859GTJy5ObDCb93U1hbGwsTTUfIwrU9Mlmod
+tcX/BSivTE5tOH0KYH6yAZCTfbHie8wAL/ixnR6aedJn4E5Xeq2ld7c3JX6c+/AF
+uyEGYlWAlW5FXyqt9e7h+DZbItvKLkp+KuY5eOBbYPx84k8XhRXzG3EfOieUmTSg
+u/TNyNiO1ZHyyAVr/Fk/9q//QXTGMPvuM8YU7fV//0ZeRAVk9gUMLMsmXsy1yxbk
+hbNjhdMF7G0PzfrgJ2EiljzjrpCHIAJpP0ghx+MAof6duSQF5Fqtzv+nFkzisGDD
+50s+pYS+qKMXdhBqfXbbNaIZXsGxvyJT5Fe909SmlD/G5kQIHzF4iXpQ12IzVRTW
+T6xB5nLFEHfVwni0CXPJ+DNeJg/BpXN33Hly2ak25/AD17nITwrxu0oqL4BckF/Z
+eaa4i+YouM6/ypG1g7NABvDjOWUowQCZDoU8WeNm5A7u9xD5I40AJMUqGlugtHlH
+wcXC29JKIEuWaLZr77ubCS4xUqGWQpn7p3xXowibF87Gnb2TJuz+pdPsekK0wdjT
+XrVMKFn7/iXNQut+kFlwhpramjLs/ChKhuV8CNH0nV/rA9xMD/AL7nyeuWQyhJse
+N1GbSK2pQaO99xIz1fPh
+=NDBU
 -----END PGP SIGNATURE-----
diff --git a/sec-policy/selinux-flash/selinux-flash-2.20140311-r5.ebuild b/sec-policy/selinux-flash/selinux-flash-2.20140311-r5.ebuild
new file mode 100644
index 000000000000..edd0f519073e
--- /dev/null
+++ b/sec-policy/selinux-flash/selinux-flash-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-flash/selinux-flash-2.20140311-r5.ebuild,v 1.1 2014/08/09 19:34:08 swift Exp $
+EAPI="5"
+
+IUSE=""
+MODS="flash"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for flash"
+
+KEYWORDS="~amd64 ~x86"
diff --git a/sec-policy/selinux-fprintd/ChangeLog b/sec-policy/selinux-fprintd/ChangeLog
index 19ddc88cd3b8..5e42ea5ed5e5 100644
--- a/sec-policy/selinux-fprintd/ChangeLog
+++ b/sec-policy/selinux-fprintd/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sec-policy/selinux-fprintd
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-fprintd/ChangeLog,v 1.43 2014/08/08 18:49:36 swift Exp $
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-fprintd/ChangeLog,v 1.44 2014/08/09 19:34:34 swift Exp $
+
+*selinux-fprintd-2.20140311-r5 (09 Aug 2014)
+
+  09 Aug 2014; Sven Vermeulen <swift@gentoo.org>
+  +selinux-fprintd-2.20140311-r5.ebuild:
+  Bump towards r5 (fixes duplicate context for hiawatha)
 
   08 Aug 2014; Sven Vermeulen <swift@gentoo.org> selinux-fprintd-9999.ebuild:
   Make 9999 ebuilds EAPI=5 and transform to make master for version bumps
diff --git a/sec-policy/selinux-fprintd/Manifest b/sec-policy/selinux-fprintd/Manifest
index 1e8a41299657..283850b7544b 100644
--- a/sec-policy/selinux-fprintd/Manifest
+++ b/sec-policy/selinux-fprintd/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-fprintd-2.20140311-r1.ebuild 456 SHA256 5303885efaf199b51c672cd862758eb26bd06ae666e4aa947b3fa517b01c64ae SHA512 5b060442b092701c3b55a95614befbcc5800f46b30cc1923973b27af798a3acd4ca6025b89f74a1640ee9054b43785c786e15bd9e23d4e335afd6afb7809179e WHIRLPOOL 7d7163fc8495bf666a3bebf4c3e4d817b6e83960b2b9284200d1c2db90b618529aadc80766665acaeee649001d85f1715524fb047643c27817822244251e8058
 EBUILD selinux-fprintd-2.20140311-r2.ebuild 456 SHA256 934c63b9a1c64bfd889d92abedce61d02f8772308f1e1434c49b77380c859be3 SHA512 439544aae862b0b7d26d9e7e7ee038d93a31c2aaa15e05951a0276c2dcc95e6d772526aada1e362ecb9d19ab7d0dd269da81c36d409bda956f960e0af43a9349 WHIRLPOOL 0e229c8aadfde1389a2953d1bc983d26069a8e2169e0fd03653b7bf0af74a22db1c64675aa3163047295fbf1fee5bc8a50cf759a0434bd3dbc220d1bb2ad77e1
 EBUILD selinux-fprintd-2.20140311-r3.ebuild 456 SHA256 a40632bef3917df80b545e0fd4866a1b7d87be45dd1e87c71424f8a7585673b5 SHA512 e08f03d2b3b29724593333327d0d011790c8fd4ce3ed2ae999455861a7fe6aed73ac59ea7f0b14ec155e5cba0458216cf9b4102ff4fe2d1972255c098c21aa96 WHIRLPOOL 0055a5d04741c2d3d271531d4b2737fdc59e78e469a23f0ef7cc951d3f6774d78c52caa6017c330779e8161c69f0480e20fdb3886a75c6a5d80c0d1495a56aa0
 EBUILD selinux-fprintd-2.20140311-r4.ebuild 458 SHA256 b4e382377fa1521ff40304bf59ad5e41e2b77fc5922dd6ea13fc433960534b59 SHA512 7a7eb52b68ceaf5a1d38e3e143fa4b4f8bce37e69fb420f72275ec4c155283a873ea9aa0848fa76844126a844c9f45c3922cc33728e5404332858552e24026ba WHIRLPOOL 78ca28038ade58341d1dc30b5eba7eedf8a0021f18c1ee5dc37ecf950992f44c218b4186df0c535612ab9812a5ead35c23c7121361d82fd77570ec8608d321b6
+EBUILD selinux-fprintd-2.20140311-r5.ebuild 434 SHA256 80bd9a8693ee55a81f1fb4509e8b86dd2c730400a85607094517347c1355cb95 SHA512 68e91f3be2da94803326e38b3ece98799ab6aa9faf0a620a5acfbd4add3ea5cab5c38443dac282ad84e2b43936416e20d8f47da6c7bcf3e911ac81a66e98433c WHIRLPOOL d4843594fc6395c6f1ed0c1eb09b8acd3c4bf3561f93d955987326e2e20077b0d93a81c7f7315de06a22594e14bb830b50a8a6c53f0f1695f74c60647b1b4e71
 EBUILD selinux-fprintd-9999.ebuild 414 SHA256 8fc68b90971ace4d9b52b4c4243e7ec01ffc18cbc826cb66ad43ea5038f04650 SHA512 46dc661d814acfbee041aaf5fe946e4847c060c7a62a703a325840dc028140f10339c5a41dfc4f83618ec06c4da912940962eaff7651f1a9405e238eec200ddc WHIRLPOOL 8f000cdbf5265ebac7cf5f99759f570bd85c1363ff4c8ed9e2c7770816e31085b434c7fcbd91289c265bb04bdd59845956b3aec4bdadf389a9d162d546349406
-MISC ChangeLog 6730 SHA256 d05a6168dec5fe950e78811e4432fe9b60b8017b74432e9482e3346a38a6de00 SHA512 a0e7818c7d25e8554825de9e9ab7f71456f0925cfcfd15eec7c373117cad053c389a1daa1c9a2ce0b7d2b932c0a62d2bceb3f8921a06172b4126433e3fee0dc5 WHIRLPOOL 74256a2c74be3a49fcdf76235a56444220885e89efa9803e949fb3295da54120d4f5692ab3c1fde76028e3036fc0d2f28cbf8ba63c3ba8f016a34683a9587049
+MISC ChangeLog 6924 SHA256 0d82b5885611f518f9a7b041fa657ed23772ec944c1888a07709ef4ea94983bb SHA512 4715031279fc850bebfcdb57125b4530dab470ccde91d9e48c8a17f91af090da73b4266ddfc5815374ce62001c889da9fcfee322fcb8526b5601201eae3fbc78 WHIRLPOOL 4938eb7ce092ca4ab55fcc2e51ec7eb40e557101032d117f999be9b466fb77bc22d07937c10a823303263ffb84c538a3844f8fafa87c10e2b74c3535ed01ea8f
 MISC metadata.xml 231 SHA256 ab76f6acec4e15659f5da9c18248574ca18503d92dd8e74f509c1473d50e5610 SHA512 e935196f3d9778ce5df0712d385cc2551247126de46edd38b1ed44565a8956c68540d73e9d36b9a182e08dd2b3e40e725e5e069c81c9ef3030c372db135c2d25 WHIRLPOOL ff850021cc3e8a37b6bed0aa955f67e13e77b33171b7692d875a2b528a9effc33e176b328561cc13cb0bd242687093ffc0059b77aa32e467c410ec79e780a587
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0
 
-iQIcBAEBCAAGBQJT5RxvAAoJEC7dUkA7aK9HnJEP/16eurGUfYAjwcowmcV9XvEs
-R+yt4y3B+LtRhnmItUJGgdQ6bo/BRm+UkmuWBo9SIO5DqzzOCp5qQBEiy9GejwMJ
-5HdD0JK9XFvAiUXPxJ+J5Ft0BZVH2oLva3wcTlV0YnZIqZDJah1F1cSDqvxfSlb/
-LD8MkMrAl34+m2gFDlFL2SjuCZOgZokER9HCswApXls7DkNqFa+/qEL4vBLI1r7S
-E+7NweJ8FcYfceBgJrGEYgBtWRW7CYZxGd20mFSEyT8gxE0JnbW8Gvyp7zUu7tIa
-zhuD87t17Llmkkd62IsZw3rcuhnt52iw13gSRRH4FBMmdUnxP0I4CyxPuZl9oSpv
-Bbiz8yRNrjoam43Nn60ddrcWV2vCkx85nFoqEakf5vuEG9dUcbQ+7L0MpQWQxA6B
-TPm67s764WamgZJnTgK2XVBWrZOj/S1Gze0QBCbedS1iHgGM4Vv3W5PbGcktBSVh
-ZTbdz56CHm09QJaZn/Cs2QoVqT8eOqhyH2akvXr7O8oOEGAkwqgYtH9/yhb9Yyrj
-Kk/M7sKHVJY7pGYalAkBUFKi/Di56VH1JZM9l2AYtzXoOIgqGf8C4anPZ7Mkcd8C
-pT0gx4AcQoqNipsn9VUBECufkZYiiDyjZY6906usrPosO6z6m2Vglf3l4TxwKyK/
-MKWGqXOBdacJDXiF9DlV
-=i36g
+iQIcBAEBCAAGBQJT5nhCAAoJEC7dUkA7aK9H3a4P/iNschAdL7o6ggfIErFYAP0r
++6tpb2CBfIpNn+/t21fefIGKPYR9t3Z/SAHNInhfvI50cIz4AsNJF21zKBJgwVYL
+f/UKDmFuYsYUz3cTdHl1mBsuE+pbmePyx2Qba9Ux3tu5E85dyY3lpD+YOBWQALo3
++9EYx3ixeplInvA/BfQtTq/4FKEhbsXDU6Cj55aFyDCb2uklHqjElkK8pzONiKm5
+0gdA50NYJ77bA7NDm1WmzEwzH28xQQZu0pNYi+vmQWBnLEc/6Eix906xHktFhNFM
+RIu0uqneIT9wPQKn6EiKK9inhMsM9ULBg/5m867pla3LOt5p8Mfh3N6Z18PjMU4d
+SOGTSkDwb2OI6LOVbtORzxxGzPvAlxRwF0Uvj37VKiGBp4k5XnV9J2haLSCGzpCw
+UzsO2ITIcTcsHUjADNW0dB4t1JCElTL0B+8o4YPJ9VLYwnJzVZzCOtMPuwV8jKgr
+YU8IcKVK+fhLjnRRIirVlG64syho+OQQy/t7OQpD7+4U7BoPP5MEor7VLmF5UYcz
+khgTDdFqXr0ruP9+5/4dT3xw6vWFV9bjTyZk6ckB75fglsBpEjmKhZ8+Py44tZWn
+91XSG6I8wxTbgvPQUPLURr32uWxuhxpOVGdtYIcIqMbEd6SONhcj/HaD/m4/yHUw
+X1ve3Nu4w0/l8dk6+GwP
+=sC7L
 -----END PGP SIGNATURE-----
diff --git a/sec-policy/selinux-fprintd/selinux-fprintd-2.20140311-r5.ebuild b/sec-policy/selinux-fprintd/selinux-fprintd-2.20140311-r5.ebuild
new file mode 100644
index 000000000000..84e53815f1df
--- /dev/null
+++ b/sec-policy/selinux-fprintd/selinux-fprintd-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-fprintd/selinux-fprintd-2.20140311-r5.ebuild,v 1.1 2014/08/09 19:34:34 swift Exp $
+EAPI="5"
+
+IUSE=""
+MODS="fprintd"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for fprintd"
+
+KEYWORDS="~amd64 ~x86"
+DEPEND="${DEPEND}
+	sec-policy/selinux-dbus
+"
+RDEPEND="${DEPEND}"
diff --git a/sec-policy/selinux-ftp/ChangeLog b/sec-policy/selinux-ftp/ChangeLog
index 5e8abde55e95..158f6bafbb09 100644
--- a/sec-policy/selinux-ftp/ChangeLog
+++ b/sec-policy/selinux-ftp/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sec-policy/selinux-ftp
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-ftp/ChangeLog,v 1.40 2014/08/08 18:49:43 swift Exp $
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-ftp/ChangeLog,v 1.41 2014/08/09 19:34:33 swift Exp $
+
+*selinux-ftp-2.20140311-r5 (09 Aug 2014)
+
+  09 Aug 2014; Sven Vermeulen <swift@gentoo.org>
+  +selinux-ftp-2.20140311-r5.ebuild:
+  Bump towards r5 (fixes duplicate context for hiawatha)
 
   08 Aug 2014; Sven Vermeulen <swift@gentoo.org> selinux-ftp-9999.ebuild:
   Make 9999 ebuilds EAPI=5 and transform to make master for version bumps
diff --git a/sec-policy/selinux-ftp/Manifest b/sec-policy/selinux-ftp/Manifest
index d9adbe572df8..591228ce5da1 100644
--- a/sec-policy/selinux-ftp/Manifest
+++ b/sec-policy/selinux-ftp/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-ftp-2.20140311-r1.ebuild 375 SHA256 a97942dde77b77cf0bcff6d064a613ce14148fbf6f1d6501ad83d49e42b02051 SHA512 7fcf64102908b330c7f4106122d8d7e5d21505a9d785f7bd5fd3bc5e90596ecbd4dd97adc685b38a10ec4271b78460d5d689147645a8d9595ba4737bd8fcc1d9 WHIRLPOOL 66e767ef362209c3eb86f32f43de220873ba18bb85f089a2c9f0cee3d6cbecadf7e56dda047976ba34cb6a6cd34e366311d9fcfd56f12aeb95e063947a6cd512
 EBUILD selinux-ftp-2.20140311-r2.ebuild 375 SHA256 c1f6b08f410716b4a1f740f092721f6e7b410f2e55b1e9a1d52a7708b6743a63 SHA512 e067c1c2d917d5bb2ae7e1fc0609777e8f040f8f310a8d9798e1b1579e7ce0772d474bc32d2f960f032384decc6d82bda6600e9a8ad1b2d796c1cf51aad71095 WHIRLPOOL 9c85dcca3bfd7a043b4f93bf77060d0898771d54217ec284170ae2713498af8825e0b8e88b44deb758a066e795f8f58c26866f184520909ada72d35518e553dd
 EBUILD selinux-ftp-2.20140311-r3.ebuild 375 SHA256 03a31fe9997222e6799c0437991b4f90bf4079492faeb8d735a4199cac8ab486 SHA512 98bacacc6c0c351f5748b7626dc6d823d5263e787a72c461ffbec60ed96f535339933a4436e484cda7abdac7f81795d819786edbd28f24f8f21d942447b0e045 WHIRLPOOL 1973b90d42d529b5599be44be752874ac405bb0a3331213b90a570612ab0bc04b4674189bbff524af041cdca254a87062f5b6110d5b092a5ff2f5e2e51098ecb
 EBUILD selinux-ftp-2.20140311-r4.ebuild 377 SHA256 cc301ab6204dea5c037fb3845c65bd006734b8bf8daecb805ec00d5ec0b52569 SHA512 29a4d527b072695cb31a7e1dbf99f0271519ed81458b574ed974d2442575bb6e5fc7c074a88c1bc0688e2849a48b4ed1efa8bbc3c775fc5152598571514bb89a WHIRLPOOL 1676da33d05afcb8eaaf6f452234c8c87a09dd2221ae13b1f66baac4ef575b5e070cc07e917e45351723b20151f9e1835646021341fdcd3c143abc251e9d46f4
+EBUILD selinux-ftp-2.20140311-r5.ebuild 353 SHA256 8dc4e4837c2654b81092bf81947c60bc5f9891684ccab2ee4826af228b2358a8 SHA512 7e4e5f6dc3d56a14c518bb89248c7f9a18535bf09c405fa1a1c299781230664109000b5061ebf51d4c5608a1a00d9fc61f3bdb334003c3386a0fa62a733a6862 WHIRLPOOL 8c55ef8b9ab054a1ad7a1972de7b7f5fee860751e60bd1fbdfa17a5c993c13798f0d0bd79734f6de2b457a7d7eb3499a9f1a6f9cef5842996a390d7ac0fee8f4
 EBUILD selinux-ftp-9999.ebuild 333 SHA256 95dd12ef7189173ab603ef715f6d2c1f0e1280b3186bbe4e00727f2a5a54a8bb SHA512 cfa14ffc0e117de6baff22b6c3db71560e750bbfc8347015875cef93f4cc763082b26814c0b3b798eb5cffbd3613c393b40afe1142be5eabcd139d012903fd38 WHIRLPOOL 7bc039f33e0eb1c754b3284bca8fea3a9d2be9e136f6c47024447599eea3621a0ae99638aa42a58d7a9b9cab363a9d509d77d51793a88a3e9df728aea5988116
-MISC ChangeLog 6322 SHA256 4ad0d9e1bbec61106603c6075410191b39a232995e6e3550779871231aa84e82 SHA512 2d049e81545d5ff665555b7c5982f42609b3c692fa86b5a8142ea8661644c2676ba1efd58fff7deb9e907b5b844626851c107e6341b8304d50f34a030f4352bb WHIRLPOOL de54f91ba2cdf6d68bf48696b3cea4516e3796caf0fd7b3484d687a3c8bf249c1303660248dbf162fa0dd3da99b0020d543e1a0d679f8e89f53257227d3c8ac5
+MISC ChangeLog 6508 SHA256 8c8db0fd365f24bc79af5aa05986a90d8b0f40cfedad19769dd01f1be7bb25a5 SHA512 1cb330cd1ad2742d9100862a50d5dcfaf32829008553a0e29fdf26a45cb064a2aec4614f549b7643e781a6f22b63b911d5eeb8d61a8254e79d2869ba42fcf0e3 WHIRLPOOL 0e7af992e769ba217325d85994d742352ba096125618d4a9f47f1341cbe1cfe42b3f8ef9f242053212a26ebeeb10e5cae9353f0849e125af86fa4b6b2eed9378
 MISC metadata.xml 227 SHA256 002e4f7e181704fd4b4a75b5eb29510c2c8d4da96e3216b7c188a7a5ae27845e SHA512 cdd846a92403d4b5a383f32839f54200f69abebc65fb0098aba7d5a45efc31e1cdf9e4c916cf2fe36449167aec9cf9e73cb9ddf9882e5e05afb8726a4de2e516 WHIRLPOOL 5d1a325458f62c34490383e05860c7caace523212e42986b4f8db62c24537c1a39135fc19ba2d1d9270d0091f322c9e4238d77b4716b8eaa1da731c75bfc7df2
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0
 
-iQIcBAEBCAAGBQJT5RxwAAoJEC7dUkA7aK9H8SgP/3vMNNGEO/8pUWT0hchWwkKM
-dtmst9kV4Lu42pkiI1Yy8N8rmta+ldyhdkyWthTlvNlNWepLXOSQF4rCkHW6UFi8
-t+9ZWGEaUZ1OPqpeYXr9Xm1kiM+GVCfJbNm8AKcgpxRxnSVX4JXeS7MTL1ifV3K9
-hE6WQD6Ztnw1AVAByUR0/fkFBfL1cLuC3RdzoYYV92GEYaobLnj9qSpqEd/2O08p
-5Zd+phKQfddyMNhWDXip7/lZZN8kVqP9HyaGUbClzKoM3u3eYuHg/KoRTUc0xWFB
-aNukQ5D+vAPdl3AOVf2OODF9AIGJ2HqNH2WyoK+N3SXTe5+ZB93GSIY5Hg11mv7q
-7RzBT8M1d6+KIBYLpsnST6jdZIBweuGNlp1K2+VOanuiQU4QtN5o9GpBj1VAlqr1
-sqL0ZGicrHnb0VupkI/q25GAFUo5pSwdX37RCrOzOstY0FgBqvDGNr9W/g0L6bkn
-GhykRLbQNR99O9/KjnPoJaIPv+rep+oCR+NieLzsOBXKvrn3HF3c1vyvCVPOb/Ly
-MG6IpW19ie9OxmRNVuz3RQ4rVl7pmHM2G41J7xcuKoucdesE4bJJlhWyYvKuvrFI
-TOnyKMYftLUPABWWo4CU6b/FdWjpvLtHFrIk0Ic4UcM9lKIEyBVvSs0e0n4kF/qn
-3csbNFteX3xqFGYo3ivc
-=U934
+iQIcBAEBCAAGBQJT5nhCAAoJEC7dUkA7aK9HyZsP/i7cktAHfn3y8ZJTLsg5SfBF
++f0OOXm/nVxpf+wenrRIwmdBBNcdCaPzzLbYSlGpbtpZMZ46BJOraUU7RBNYhE5V
+noCyT4Z8JwBqg6lZL8o1Yi4z8J7g/mIKvHtNKgpMsrc1rBndfjvRuntPZpVl2c8V
+0SSQre0vifD+znE8kbtKux+ZHtCZzQP+8u5yFjGjfA/0nDN2jhmh44TMnMXSE05s
+QJ7Q81mZ1iCzJfUe35qIpGRaYUInCKtY9q6W262xMHcqFdUoLPcU4ID/9oTOScbF
+oMknYFYMs/f7eDzKONyhKz3JzhYs/fAvWoIj0/NQFkDy8l0F9p7z6XVmWwz0C8qy
+VTiO7kOza18DE9S1jHKQKMpPnRqeTcu9NbjJL+NMVFyWMEwecwkXFL+J7OVunW5p
+Jyk7DnclMgHlEWt4aEqP4AmXG9zSohqOiudb2lsrftfCuzBozH+po0cRroN9+FaO
+andoRfSHmoNoR2KsAFbA/ygCUCj8SPS4XLjKQhdEEQHBBrwIf433sgHvm+rmxrJQ
+DB1qJ+D4zuZbNfo6DhEEmDH4Xvj5RrcwNqXW0+fEi6YtCCdFa94YW/VgIHATW9oq
+10F6CCXyN2BNxufiRIqnkiZYf7to8IvNiBuivvHIXsPrN6AE38q1TD7CzugWHhus
+OSFa4M5Qhb9qE15LELxx
+=xxiK
 -----END PGP SIGNATURE-----
diff --git a/sec-policy/selinux-ftp/selinux-ftp-2.20140311-r5.ebuild b/sec-policy/selinux-ftp/selinux-ftp-2.20140311-r5.ebuild
new file mode 100644
index 000000000000..5bde9a5437a1
--- /dev/null
+++ b/sec-policy/selinux-ftp/selinux-ftp-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-ftp/selinux-ftp-2.20140311-r5.ebuild,v 1.1 2014/08/09 19:34:33 swift Exp $
+EAPI="5"
+
+IUSE=""
+MODS="ftp"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for ftp"
+
+KEYWORDS="~amd64 ~x86"
diff --git a/sec-policy/selinux-games/ChangeLog b/sec-policy/selinux-games/ChangeLog
index cab2b50c1a28..8317ed45a546 100644
--- a/sec-policy/selinux-games/ChangeLog
+++ b/sec-policy/selinux-games/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sec-policy/selinux-games
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-games/ChangeLog,v 1.51 2014/08/08 18:50:02 swift Exp $
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-games/ChangeLog,v 1.52 2014/08/09 19:34:27 swift Exp $
+
+*selinux-games-2.20140311-r5 (09 Aug 2014)
+
+  09 Aug 2014; Sven Vermeulen <swift@gentoo.org>
+  +selinux-games-2.20140311-r5.ebuild:
+  Bump towards r5 (fixes duplicate context for hiawatha)
 
   08 Aug 2014; Sven Vermeulen <swift@gentoo.org> selinux-games-9999.ebuild:
   Make 9999 ebuilds EAPI=5 and transform to make master for version bumps
diff --git a/sec-policy/selinux-games/Manifest b/sec-policy/selinux-games/Manifest
index f0bd7f6739fe..22af9875146a 100644
--- a/sec-policy/selinux-games/Manifest
+++ b/sec-policy/selinux-games/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-games-2.20140311-r1.ebuild 383 SHA256 29a6ecb51180a1499fceeb0d3f734750f21295a4229770e01ff3e9513acbc537 SHA512 ed92979581565b4f4b564c089ce44c7c85e64cf717b7f66927c1da40dfe6895b144a2b5bc90778ed28171fd66f6538eb50d40c385720640ce6103d38612263a3 WHIRLPOOL c58e877e5cade602d38fc52c456a3b60988f89e6ddf0ae6f620bbabe8302d8e0ba63586659167fb4d813c269996cd5e303122850917e32c0bc222a55b15082e4
 EBUILD selinux-games-2.20140311-r2.ebuild 383 SHA256 52636eab8d981ef7678ab280e2e8022a35dba3c66839646888497fdd0dad432d SHA512 04f58744e87bdfe3cd689c55acab4a155c2882e1abc266006bc60c494837ddcdbced51504a62114fcb19c84a3e21722be77853cc0a269f1569d3fc4ba56c73e7 WHIRLPOOL e85b6e6f7487433865d386d0b19111af6ab806ba5c439af756ea07cf88d431c94d6eeee2de4c34080a977667f8d27b00bb5f698431f78cb2f72adc10f6681f26
 EBUILD selinux-games-2.20140311-r3.ebuild 383 SHA256 f639984daebd9597c8613dbd2d248b087bd2d06a19322cd0c3f2ed3b806f6d80 SHA512 ffac50661905edb672260c33b484cc6f2bb2a94bb0d7b4e2381833c14baca8f4fea12435952365b1a3efde3b6ac5b48f5879b4f8ea01437c1f9803971be05748 WHIRLPOOL c6ad0b350c45303d0d5383619296be6abc62701124f6ae60888306e6f658d79b5e56f65498b645ea798344bf322dea4d77539004204953f8c3335888448d45cf
 EBUILD selinux-games-2.20140311-r4.ebuild 385 SHA256 606ce30419e877ecc32f0e62f9f7060135a7b1399f1da0237f1515451568dc94 SHA512 d6178328448bff748a3ce3d6f0ec920285daf5f55c72f1030e2d27c22fd009c2b6333c1947b84930078930a2c487023b6cddea92b62b9ce204704ca26e1a49e7 WHIRLPOOL 714a56c4323dfd8a161eebe12b34f94777534458c6b0988000e739477bc8aba44a4c7706fc6fc18dd0c0a4d26374143a2988345a3609edf53b1b4554bcac591e
+EBUILD selinux-games-2.20140311-r5.ebuild 361 SHA256 19b2275f2271e3af15faa9f5abd8fe935065c30ec9bd174ed2527fc64ab325a2 SHA512 0341d81e9789775f8078cb08b9776bbb03a52b25356e08fed9cedc570459dd62825e448087e3a11a2b94c44d72a1bfdf05167e2b0050ad6b8c670df3f38c354a WHIRLPOOL 402be7ac4e05babea4a511a9f5cd98b7775c7c3f906aa1f4f4de8f5b446531aef48cda71639d6fc6c52e553846b1fcbe7e010e585208d4d141029cf257dbbbc9
 EBUILD selinux-games-9999.ebuild 341 SHA256 2eba07ec096f381ab134ff320384c21efe996c0fab9a00862683a851bdf9e73d SHA512 d8e351023b2aa9ed3187d7e2d4c26890aeab9428c3b46bbd8e769373d283816910fdf2a1049335f1a7332f226cb200101f7920212a545decbe30d9ec66798bb5 WHIRLPOOL 82ddbdaac8f54ec627e7fd04a4c25991a5b7e5c6dcaceee8e354992c941e09349570b6c038c329a8772405fa877ad0c1b9735536f85e4510b501bd90e41a50b4
-MISC ChangeLog 7934 SHA256 8b82095b1a1328ef885d5a77a557ab977a1c4c45efe1f69ab2333022b32bd24c SHA512 f8d1536a108d894d55b5d3d91f6c26c48c2d460f2c1a1c2eeefbcd7e3fe1015f62fa42b93d4e3226b2bea260c341fe94c2515ba1c4ea1179d199cdac8a7fd539 WHIRLPOOL 2de2e287380f9a8612c21e51575ae920eb2cc355102223a51f86f44d4ee723616c0322e24b0be054e59d019c347ffffecce878bdb48f0a16d8de846e3c19df5b
+MISC ChangeLog 8124 SHA256 48e4e81180960794935d6bbd42d0a575cf441395c24ab87d0366cbb663e7b05d SHA512 fe36a8834ebf97cbad7f69427ccd909749db9b70ccf5a08a9c3e25d981a10c52e88f672e54f6f0cd4f766db8f487e6548a0e3ac0b0715d8b34fd5c45e06314ef WHIRLPOOL c62d0a0124a42bf2f70e1ae75c3e82d171928638b35427c091d2ad96d4dfdb0c841c4fda6ad08062e098aaf90d6fb3f69cd35368d076556f58e3582245cea803
 MISC metadata.xml 229 SHA256 d8097f8052ab53f1cd66eebf393a8ff030214da30ca22167e7343c675fb5e8ef SHA512 ec45747e24d9d8edb4ce7685a394f8c8ce7103c2bfc1d6c12ff0890dec66bed122c1a51a7915138c22dfe54562cacf77f44af81d8fb242a12e3739ea6b900041 WHIRLPOOL fcdcb9aa731807bc55c63405c6796407f15b9f22f10f261bd4b8f24401a628e52a3ece1f535f3ddb1518ed9b001437b70b9a916eaaa3e674f3a3e8ac7fa77ce8
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0
 
-iQIcBAEBCAAGBQJT5RxwAAoJEC7dUkA7aK9HUN4P/2De+gzZhBlcOaHZJIuA7I1Y
-0QPaXLIGEURpS/0HP8zS52fK2OjfCDm574wR2wzDmkHrER0qHg6O8yyWJ4uqgB/0
-+TLq9xe9YNK07AlJX7/5nOKU9q+PKwoglBnObo7dNh0lZikC4nHKwrScKmfxZSB1
-NuzSo/bwcoHkJ54kVwYq2sq4HqBigrw41jr6Y4eyj1hEwwe4XkSPHy0DEabO2RSx
-4Yqx+ujQKwwPkRLYGfT+UPzi4tpmYkSnfXjKVy2VFGsVF1XiWJWPSJtLqI40reBi
-Kw4lASlr3rF5HkORsEWgoGsnxr+IdJ8tWbHZn2I5uayq0Wiy947AOtGEH7OxZE4B
-D/q6nxOiAGQt8M1tzFZ2Il4wFsrk4JiPiHCwrA/c6XZcKNkMaTXi4/RXl5fA62cY
-uXL2YCunaKEIwhbL/kTUs3NXAXIarMFCo/wfiHkGlSeXTLXpHx4hriteoMQNAn5R
-Nk7WhQGjXw3J6rB24pFz6dt+PUMaQZV0cWtBkT3YOaPsNWg19sOtLXk1gpawgTzh
-w3yYrWhLcw/8gOC6tuPNt/U/yT1KX1zpGPNBoBIihZdE4kht6Gskc+jDEOM815HT
-lypwxlIkyWu1Y2PRMSXSaE7x7L+aKU9u3NRrQL8KKlT322vE2Jaxie+zHiGJvzn3
-Gwc85Ia4N8xf+DR9rVwN
-=eu2W
+iQIcBAEBCAAGBQJT5nhCAAoJEC7dUkA7aK9H+aQP/36Z0FkAixsgoyGJwEfgwe9K
+RUlXb29zqEYf2VkNnVrYJ/ZjI/gR4ZV/otiX7Np9aLmlAG0jrMQ+bGcNy5P59vtp
+IIok9oh/0GaeR6sAvbDPe1Uw/UAHS3TqlS2A7N+g6cj6rTLX8DzB/tU6u24G/E0l
+ZXBOy7nPUv9iFzDzlpiq1Rd9mbklLvRDOZ3VUzNUIhcZvzWPb6uGZHiq/Clqmegw
+kyIQl6BY7lZQqVyFelj6PKSklo6omI4RN68UKsm0Q3hFBq72VFv1DVVxQ56j7cWg
+vQMJ9H2A/dCnw9Ql4RA1JejsC605hPMobZTCi0i7g2sP3B4b1gh1vA8ICB+APz0s
+ut97xqRy5JvXm/Yvke+/srDfbK9iYW/5uc2VuGlAzixpLOu+ggDTanNm6JZYgyYU
+8WgbG3uytPtgJjZZW7/Z5EJL8C97BLHSAkPtXmn9OLtEnYcrYP+kalMq1p3PZyCF
+g4gza/03KW0kvN0LXgD07wbtrU6Z+xLDQ4QrIXfYw444xeJe/JvCRaBdGGl7OKEU
+cMshUeVLYGVM+IrfxaKOdNBe4X98Hv9xtwqOIoWNxT9z3+alLAv5btLobx0EBOt1
+wxBJAjME0LHr3FoL4F7hPitO0VO/p19nlm4unc20C8qg3yNnYaQkyKZRvNJ4UL3i
+wbStSJ5mS7xbTA9kpQQp
+=C9n0
 -----END PGP SIGNATURE-----
diff --git a/sec-policy/selinux-games/selinux-games-2.20140311-r5.ebuild b/sec-policy/selinux-games/selinux-games-2.20140311-r5.ebuild
new file mode 100644
index 000000000000..5f854abf4d4e
--- /dev/null
+++ b/sec-policy/selinux-games/selinux-games-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-games/selinux-games-2.20140311-r5.ebuild,v 1.1 2014/08/09 19:34:27 swift Exp $
+EAPI="5"
+
+IUSE=""
+MODS="games"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for games"
+
+KEYWORDS="~amd64 ~x86"
diff --git a/sec-policy/selinux-gatekeeper/ChangeLog b/sec-policy/selinux-gatekeeper/ChangeLog
index 52d80c36c47b..444bb6cd28d2 100644
--- a/sec-policy/selinux-gatekeeper/ChangeLog
+++ b/sec-policy/selinux-gatekeeper/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sec-policy/selinux-gatekeeper
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-gatekeeper/ChangeLog,v 1.42 2014/08/08 18:49:39 swift Exp $
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-gatekeeper/ChangeLog,v 1.43 2014/08/09 19:34:14 swift Exp $
+
+*selinux-gatekeeper-2.20140311-r5 (09 Aug 2014)
+
+  09 Aug 2014; Sven Vermeulen <swift@gentoo.org>
+  +selinux-gatekeeper-2.20140311-r5.ebuild:
+  Bump towards r5 (fixes duplicate context for hiawatha)
 
   08 Aug 2014; Sven Vermeulen <swift@gentoo.org> selinux-gatekeeper-9999.ebuild:
   Make 9999 ebuilds EAPI=5 and transform to make master for version bumps
diff --git a/sec-policy/selinux-gatekeeper/Manifest b/sec-policy/selinux-gatekeeper/Manifest
index e050748ee113..716ed6faee45 100644
--- a/sec-policy/selinux-gatekeeper/Manifest
+++ b/sec-policy/selinux-gatekeeper/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-gatekeeper-2.20140311-r1.ebuild 403 SHA256 bb5da2ac95ebcfd1055cc011381af75252aef31b63ab23346955eac947a51a84 SHA512 b45831b97537bc48e6cfe4063568c9feaef7e3f767a427bf75818c95f54c31abe60db01fda4b714acc4b31123febad4ef1dc0951fb752044b3f44c05acdba956 WHIRLPOOL 9a4539ef16d0b1cd9719090cfba76f58d9e42aa9ac27d4d727f83254f98d1b86b64fe4d07773aec4e86fb18a15d77898795c400c4a80b208401ea3764739daef
 EBUILD selinux-gatekeeper-2.20140311-r2.ebuild 403 SHA256 297677873b8dc519464dff329a6e3caabc19a2427678b6dcf7aa6491e776ca1d SHA512 8e95a8d14227345a037aedda9a36eedb8dd370c04493d6cd63023b093e659572a0336fbc55e38981ff218bda8e10b5b8a1c08532f19d1dda35d76b2813c60a58 WHIRLPOOL 44fb61c6e7dfbe47bc0601637342f5dc14037997b61f44d27de8859edcd95af8513472bf5af21b18892be0db8dc3a9b6a326ba01d931424f3cf630df7b998cba
 EBUILD selinux-gatekeeper-2.20140311-r3.ebuild 403 SHA256 b3ce34be65443c93e07f68597fe77b63f3615ea1ef131c027c32eec0ba5b1216 SHA512 76d2e75e1631fbeb4b8cbd6e50766cdccc8c05365432efa1158d36ed8f842748483170aab0208d96358e1f442782b48810a77fc10068eeac8e3dfb9a129277ed WHIRLPOOL 03d8f98e15c9ff065ca7d8b3dca8de8f4b5b5d55056cd505e3644c50918ccd32bf59c9a11818a1d00df465cf3c747ec019f2a34bc92d3256954a47d6e87b0670
 EBUILD selinux-gatekeeper-2.20140311-r4.ebuild 405 SHA256 da6e8a640e50f872d69af0968c76a9edad63d825dd8f1d859290820b0ffaac92 SHA512 120a83ab3d9e0ed61f61ad772cf90e9dcb27c3e91dd900bf4075e7c3d4ca3176c40d582acd471499edf8b0f45c0018f943db569b74b549c7dd2f0ba9ff17cc13 WHIRLPOOL 5c5a16ab9348388f0ac1c6b6b1150166dfe92e31cbac1463d784e1b2780dc4f6681ad01415c6948fa975cf43338f30fbe547701e615c36e231d273d752ea2935
+EBUILD selinux-gatekeeper-2.20140311-r5.ebuild 381 SHA256 099f478dcf3c2f6c9bdecd43cc80707483516da22fcf65c28236ec46ef29f665 SHA512 7c904a45090bb2de8f0c07151b97fce20756ec2c91cc11c76ad49b507e91c20eaeaeffa7bd6b3350bda39e720d5d084bf4ec7a49113060037f9ad89c2c83d304 WHIRLPOOL b6f59f8874dafdbbdf8182e288aec703ed0667a1431dbd3baac3ec402413eeee07136b0fc0031d3217203e737770bb142ef05a376e69b52f0bd7007efa172a12
 EBUILD selinux-gatekeeper-9999.ebuild 361 SHA256 e72b1974ab9a2d559f1d4b29db76f3abbc4c774edfc26cbbeecd4bac91b4bd34 SHA512 cd680977d29e084d23d362a15ccbb8a9c241d5320418fd0c3f9f1dbbd0dd26ae5282d14de1605829f5d7988eae8416d0fc1ba193a1bc8d504707d3e5f03ee486 WHIRLPOOL 9396c3d03e533e77ba0b920e6e334b898e28b0a59fdd464200730839bdb14b8071d43cbde39aed132cf667a2f70a349830dd81be82c638051f67064071c4f853
-MISC ChangeLog 6825 SHA256 1efcef40045713a506ae96642b67682642579065cd3fc5f1d022c89b66e3a57a SHA512 f25db9736308b2ae816ce559a330c67461a78317e2828e0689ab2c0eb1050fc57864919be600a92146373d00e013f2c905106c52f1de4ea028d943a4206d808e WHIRLPOOL c94799e5b98b677d3e8e7fd4711add8ca0c29310edb9ff12ac36c577afd34dd2424596ce84410e056a20f22d0667577110e0a9f2a26ca08997ec75cb23a91f00
+MISC ChangeLog 7025 SHA256 f04766d48617aa56efc5dc95b0f14fb7956050d08e19d8af5900eb68b8d79194 SHA512 a91212e99f6fd9e89c0f304037dc11b8bc99f509d3d352111782cd522f27bd72e697d769ac34dd85eb5a18c2f20b5510a13e2f1aec377f94ce10c4eead71cf4b WHIRLPOOL e097e977c2ae73ec20f37d3f9841677ca1677f6fd71b33a6daa19107f0645f5d5a3eaa5628a18d87289c5457d4504b7a371bb9f51482225e1ff0760c26e988de
 MISC metadata.xml 234 SHA256 77696a90f6284afa1a3f023a5981fca3ab7fddd1fa69d5920ac0e6c3463d5a2b SHA512 f88dea4a61f10ccf26a31a9c61ba591abd604e4f809d66487f128f71d0fb2c0dff6315aeccf5019bb325b2614d4083629d137bebb14c8f875f8c11d0414f53a3 WHIRLPOOL fa13edffcd9fac6bcddf8e20696e98e391830164401ee73d4c11246d2e91b20d5fcbfe1bef8ac1da18ed20ef2cd91cbb7b481b1a8c3a81cebec89cd509872f43
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0
 
-iQIcBAEBCAAGBQJT5RxxAAoJEC7dUkA7aK9H+h8QAIkU8qHyQiX9oTHRZxQLfnHF
-050lmRDVbM4XlK0fXlmG8vRwiTRnWau51mxJqbDqcQNipEOJO0MOZmp/1D+cHdy/
-h40gRpBvdWZTMhuq9BI6X1RxBwiwAlRXnEVsdkTanaL5IHQqKJ7u2MRhQmDybA/8
-vCTNAelfFY1qg+M9LkfzxcI1Z4Mt8CddOWmRsaxdNWlt6VBvJuQJ/thtitEtLPnu
-ZC68CkwempLnXTPo6mRw0JkyUbXEaunYGsmWkazhZm3rHTHWGjbX1MTFRJzZNXx9
-YhkyiKlz4PauVjFXGFuiWgPzhIdMPiaN110q007hWRxvY2kepQoQ4bHXWjT02CHw
-ToT6LNn82OHaFiCKOyOvkg0R99eQQqq1BtLbjSJpCNRUARh0DJg2pTG8M/eq6z3p
-yDzEgnG8kC6AWsMYcnfMMiLzMJSarYmYYAeiQm0l0aQERkfd2IrVTJIlw8TTUtt9
-z8iHLEt8g0acC5CMXGYwt6kNNj3k7Qjz7SWlPslE5wx+/L9LWToDI/EEzi8SgfDc
-lW/V92j0iQD5Fjtdi6gRU40hv1MJToNy/M1JDtqGf+NfIx75DEy9ws3lO+P1F6cc
-vtzVBGjAhdT0Pr6wSsep/WI8Z0fyxtjHfQtvZqJ9u3MTVez6/AnLiSEdHUsPiyAp
-CWAlRq5/UBxIRivmlnQ1
-=yagk
+iQIcBAEBCAAGBQJT5nhDAAoJEC7dUkA7aK9HXDUQAJp68MGOvZlUNqJ4ROcqFRGR
+g1pYazLn3LuYrqOTfpsg7av/a1f6yF6GtcbBLicz0429QvpiFjwrm3OSJBMboKKG
+kEk3bkhGNI+lRzFSIJBRmoVxnpx7ybD7BsTUZmGlTmg0Ri+kAykHyHyc6sKzFrrA
+BBjMVaVL5GNgmhL+09mhOzoj6gquDw1Uy+UuHCm5EWmDkZbBvMdDAfvM/zRMOim7
+FhXaGuKTzYow1crtYn6gyCwYoaAxb1jLVfST1Se8KaRAlKGU/IkqkHEwhBUkX61h
+wJEUuIjUWWVcHwqXjvAJl6xOux7cN1n4SNRx1NlGToc4Gq7BXRtySFD9IHjml+JR
+FPhXX+Vd47sgoPq5MJIzP9fGkYDNxdtzogP/Tqm8Nf+qDEGgTvZQroKCKlp8d3rY
+zn3zCZrNYcpB0ouq8DCSFgZDul8bLL+b2+QKKQdP47eB4f7wgOD8BBAmW1En/2q3
+AzfCuIwqYp4qyFsVLK8X1ueVK8gEiVZroUgHBJZH0Ctb4rB7YWqT48FDa6jm+Osg
+5srYhzVwwknwGouUvwNWhbwwU7Y27hNhNk595ao94P/D4dkesiOsYKE4inQ4irBi
+ppj/IPPdX0dQejTYrIru6EQZm/saLcBcYxTZF92FKK1YQGuQER9pwF6ainVztZ7Q
+5d/9buQd/lOBytYIAcGE
+=TpMY
 -----END PGP SIGNATURE-----
diff --git a/sec-policy/selinux-gatekeeper/selinux-gatekeeper-2.20140311-r5.ebuild b/sec-policy/selinux-gatekeeper/selinux-gatekeeper-2.20140311-r5.ebuild
new file mode 100644
index 000000000000..b30ef247731e
--- /dev/null
+++ b/sec-policy/selinux-gatekeeper/selinux-gatekeeper-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-gatekeeper/selinux-gatekeeper-2.20140311-r5.ebuild,v 1.1 2014/08/09 19:34:14 swift Exp $
+EAPI="5"
+
+IUSE=""
+MODS="gatekeeper"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for gatekeeper"
+
+KEYWORDS="~amd64 ~x86"
diff --git a/sec-policy/selinux-gift/ChangeLog b/sec-policy/selinux-gift/ChangeLog
index 36f9a51c78fa..7918ab0b0ee4 100644
--- a/sec-policy/selinux-gift/ChangeLog
+++ b/sec-policy/selinux-gift/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sec-policy/selinux-gift
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-gift/ChangeLog,v 1.42 2014/08/08 18:49:56 swift Exp $
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-gift/ChangeLog,v 1.43 2014/08/09 19:34:29 swift Exp $
+
+*selinux-gift-2.20140311-r5 (09 Aug 2014)
+
+  09 Aug 2014; Sven Vermeulen <swift@gentoo.org>
+  +selinux-gift-2.20140311-r5.ebuild:
+  Bump towards r5 (fixes duplicate context for hiawatha)
 
   08 Aug 2014; Sven Vermeulen <swift@gentoo.org> selinux-gift-9999.ebuild:
   Make 9999 ebuilds EAPI=5 and transform to make master for version bumps
diff --git a/sec-policy/selinux-gift/Manifest b/sec-policy/selinux-gift/Manifest
index ebb89237a70a..edabcdfe021e 100644
--- a/sec-policy/selinux-gift/Manifest
+++ b/sec-policy/selinux-gift/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-gift-2.20140311-r1.ebuild 379 SHA256 72460368cd1a377475f866922d47eec41ededa21e83c742207086a8239c00c98 SHA512 665b0399392bf5265b1588833222f2bc00e29888a3ef02bc38e9cd7f36d4007334a05a7d7205f6f39f4919c52d6b06f771121bb2d6f1da874f59170d4c799532 WHIRLPOOL 1e15d550fd3584090309658d41ec8d16a1acc16aea46b96cb009a847041bbfcd26cc4f96a21cc0c781eb3276ddaddc0959eb1a0ccc5e039431b5e11621c7d09f
 EBUILD selinux-gift-2.20140311-r2.ebuild 379 SHA256 229ffdc2861dc95714766ec9271d066fd4b74b0d7e3072fe502d260b8b2eac6e SHA512 d00e369f71c32bc90862684860c8abc6c4ce506b09df23439ef2bf2cc0670b1b10c1b153ba035d289cf438b6a3671a3483091cabfdfcd16c4248e8be2b422ea2 WHIRLPOOL 70e4b20d962a59455b4dec0ae4966293d7cf12aff3afcd04ed26bcd3c64e2b061248f70478b7934837133340576f2c54a67c500f047c04b860fe70f435487020
 EBUILD selinux-gift-2.20140311-r3.ebuild 379 SHA256 88607a366e3027c171b308ecb4fbbc1e092f0fd22254686d7e71749c3eda3dd8 SHA512 f317eaf38febed859c3ac92f00218fa044b8ae745900d0a4d1e53ade28e1707257be669e186a8e35fba374b53900ba3dba7bc6c568410b706288b21800494cf4 WHIRLPOOL 29d91055b6e10fc809c84529c2523f443af59b807882666f0833cc684ae1d278773c0bdfdd8a82a6bd6b545bcb50e06a2ee70b7405f5c17f7b8ee3ce492280d2
 EBUILD selinux-gift-2.20140311-r4.ebuild 381 SHA256 57266b791273f666a454447dd3ab779ac12c1ee1fc2f5faca6376de6e3a1bfbc SHA512 b72322458f6291049135cf3f40a080ae86abb9d6c970d67147869c6d71dda94ddff0e5e4d885a5be92d70e59946436ea79d98a7bae1221ccf4c56304e6eb131b WHIRLPOOL a2c2e5050c658fd18bacd8218047105486e9bd31962abc6f2b427bdefbb0eee62d2727b6b80ada892b56df8a75bf99e4a9de8626f3648742991b8bd645319597
+EBUILD selinux-gift-2.20140311-r5.ebuild 357 SHA256 e4a7687cdd68518f16be00a53a1ab7a5973ed22435ccb47fcf966b94031bc8ee SHA512 f36ff1034a0732572b84396ac89cacdcf3211ebd0d61de75f15066a36870ecfca67d980e9d9d77b11b6d12749e5500e06f106d4c33f1aa3a1ce2752d04f0f3be WHIRLPOOL d2d44e482c92374d43682d96d79da2dcb84724a4d2e49e692d103842221783bfdf42b0627f309c54a40e8ffc1560be08e80da148550db9923951f55ce7541b2e
 EBUILD selinux-gift-9999.ebuild 337 SHA256 78ae6b28b9ff6b246a6ffbd3607e4e142b26f961251b70c6649ca603c7d4c7cb SHA512 21c0bea8883886c8277d021c2c65f2c92d6f98082e0b031060151a516ee1a4e2e954a23e4724212a67a277c06c9906550af7fe79e7eeabeca9ee06483ddc6c51 WHIRLPOOL 36cfcba653ba1f712812a53bfa81fa535ccdb4873b38492a516912f690c8e8f6e14a78706a71e7dbbdb2d8a9d6b6c021914dd09417cb3bfe4c525af67a94899c
-MISC ChangeLog 6361 SHA256 74d4185b574a41266d6410ac77cca07abedaf331615b59cbfc72f184874075c7 SHA512 aa6dde7d27bf628581635636957cb2ee2abcb875e63a412f7b929624e37109fa4f483d9fe6d12ac5618734f0e057a90194edbb8ccbb13697e2f4e4000881a961 WHIRLPOOL 19f9884deafeea111afec88f49dbd709fb55612bae473d6f06189f2a1b29bbd48f886f686c61295e502292524e49dc03c77ddd141f9d414fdd97ac0bcebc888f
+MISC ChangeLog 6549 SHA256 5d51eb673d30b036b26b05a6a41a3346bb71a962e5c08f72a88ea454275c8f95 SHA512 2cb4d0aedf36388673f3fecdd1d8b7e1270b55cfeb03f0de57b08ab445c7a2b0099aeb716c6a05817ae8c24a30885ae7982571cf7876e843b17d6f7776fe57ab WHIRLPOOL 578ccbf9f4465d533e789ad77ebf050c137568f170edc8a10dcf160f7e9d5d3a00555bf436ab94972da1abf0323ab07a4f050010a8a1e7377de9adb03dfeea32
 MISC metadata.xml 228 SHA256 f0a7a2c5721ca0caba4892b1f83ca649de878a4147fc10e6fbb90d9b8532d092 SHA512 a9071a05949f5e42278af10c18a3e520ee1352e32fbf856fb2de4f652d7bd221f314b37358b1c95a3530e0940ccfec6d34a7dcfd5096bc41fa006af8bbc340d8 WHIRLPOOL 3b3d9d65eb1a17b30b4b1ef2adcfc4278a86dbf3a61ff9d840484233c743b4fa41cd266d504f32e2f4210b1b3f694e1d73701b2a85fc40d3c4b672dab8047f62
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0
 
-iQIcBAEBCAAGBQJT5RxxAAoJEC7dUkA7aK9HXZoQAJh6SIqjrRTeMg6dyg1StBIw
-qZALp6ufPLtCvfu29rq0ieRfmduLkxfgtJb6kmATAsDevx9oh+QAzG/6n87pqZTE
-j/12DuBndJaWHq1d1y+rTAFXBX5CiFbPZ7k41ag2zgo0zMJh8ZvyOArbpHcnNZj/
-cUZfZmMWq3Oglpu4iZVYMQ3LW+XPaRL1YuLYXGdtBTEK3ml8oueWB9UKRnt8cyHK
-0XBGXCdSvtI90eTvSikhgzTLCdX1IGYRewCnJbj16NQXeRHHwxS40mcNZ+A0/dw2
-3DmIKBgWmoHVb4Ine5QtmRSpsGPm7YroZpX/UQg7wSvqvbgH74N3vEcgoihOpJWB
-PfyKLhiFjiq4daQ7H8QHRhQmh80By1YI8zqiUdmP0ckOv3WhpgyLYSto1txpBms9
-ZceHSY7/cTvlbdRERq0T5mABkNwr4ZERFQaiaKjSFaPlAcEFtB8XOPJb76UmJ4LF
-/Gqk8c0ERw4Z+ZGwEBoivEQEbcM5CrgN3PVVUmCKPHR+Iie6s/gkHSjE/KS3C99e
-zIrXNXa7pz/8VAk/fNVggx74eoSCkeQIao8h5MNNDYppwOCzVaqKTYkbYxAbxIYZ
-382rPZDEhGbMc8mib5I6xnBEA485MJKjv5Cp0OicNiGSejVsH0cCaSWsrpbdhW8X
-kqkLZFXe6tMCpMaMvKz8
-=/9H9
+iQIcBAEBCAAGBQJT5nhDAAoJEC7dUkA7aK9HLRQP/RTCErNhGZN89RpGzRCv/2zY
+SinGkrKyDjrqaczhKUmXS5uf+CyikntfRgX8sp77dJsLQsy13g8vJNHbQCSiczJN
+i26NI7Mk0cTCK9b7KjjHJOUmCEYDzqi7HEXp06w1tsTBTSKnP1ILm30JCh4znirg
+nqD2zq9OPq9cayNYSgPo1ptLuwGZE5phKtxTgnpLazPpgXpiX1D6FyRmY0P43/vn
+AkKO9bKyLwtwW2cFiPNsXZyRBv69dobNjf/Wy7zujDAyNwcwvuqx1d2OSXg3MhX/
+DAxEwmGEs3BX3NXUXI1YVYyBEbVP4L0nP2O3pQFv2Bu0dAmeICTUAEKr8aLXLXVx
+hz/XPVJSBfhaskhy9aQsiaJNJjNgimyWNIwXTrZwuA0Ghg540/xjBWr5sXgjOft6
+rkprGxLE3rXePn4C0CFy164Jdq9WdE45KjlL5HggmLIkUthJL7NbFaXJshMxNL6Q
+nG12TPYbiyNOGcfJtnoTsWTOllS29YCw1/dZEZP9RERbZW4qZsqAPZXG/lDUAyo/
+MvRBhgiKuWIENi+mOhQqQ7grBI39UZX7yOa8QFGM0IfMl6+NodpGywS/s0yeCDkf
+bEUVcfcC76mITlaVc6G0MZVg54QWfTDqKwHu4v5ZxmRtcXcvRtrBpO3cIS4x/gKO
+NiLApEPk4U8x5P4k2LEI
+=/Wa/
 -----END PGP SIGNATURE-----
diff --git a/sec-policy/selinux-gift/selinux-gift-2.20140311-r5.ebuild b/sec-policy/selinux-gift/selinux-gift-2.20140311-r5.ebuild
new file mode 100644
index 000000000000..a5fa64565cb6
--- /dev/null
+++ b/sec-policy/selinux-gift/selinux-gift-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-gift/selinux-gift-2.20140311-r5.ebuild,v 1.1 2014/08/09 19:34:29 swift Exp $
+EAPI="5"
+
+IUSE=""
+MODS="gift"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for gift"
+
+KEYWORDS="~amd64 ~x86"
diff --git a/sec-policy/selinux-gitosis/ChangeLog b/sec-policy/selinux-gitosis/ChangeLog
index 6330fe267534..3fd571b3164c 100644
--- a/sec-policy/selinux-gitosis/ChangeLog
+++ b/sec-policy/selinux-gitosis/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sec-policy/selinux-gitosis
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-gitosis/ChangeLog,v 1.42 2014/08/08 18:49:45 swift Exp $
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-gitosis/ChangeLog,v 1.43 2014/08/09 19:34:22 swift Exp $
+
+*selinux-gitosis-2.20140311-r5 (09 Aug 2014)
+
+  09 Aug 2014; Sven Vermeulen <swift@gentoo.org>
+  +selinux-gitosis-2.20140311-r5.ebuild:
+  Bump towards r5 (fixes duplicate context for hiawatha)
 
   08 Aug 2014; Sven Vermeulen <swift@gentoo.org> selinux-gitosis-9999.ebuild:
   Make 9999 ebuilds EAPI=5 and transform to make master for version bumps
diff --git a/sec-policy/selinux-gitosis/Manifest b/sec-policy/selinux-gitosis/Manifest
index 8cc65e8c7d4c..1ddfd7cfaca1 100644
--- a/sec-policy/selinux-gitosis/Manifest
+++ b/sec-policy/selinux-gitosis/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-gitosis-2.20140311-r1.ebuild 391 SHA256 c6edf7fb1f92e9bf23bb0c3eaf8bdbd7a4064a82e11fed45df736f6e4feda926 SHA512 aeab6c97086afb8a4aa4445e49c46a5b4ac5b580c55b15df9dd688b5b5790f6e34b1b9a161c584d250bf100f43c8049c7b5b66a5e41166864b47ba26ed2ef29a WHIRLPOOL 9b3ee9a8deee878820b8afa5b645b38308c30525aff740a8b8521798c59ccf27a19b9a30e24b1721899228f8f945190b1e2366ac0141f3a9d50cf9e23d57eb09
 EBUILD selinux-gitosis-2.20140311-r2.ebuild 391 SHA256 d037bc9dc77fffa06abe46c671f18656c74862d2ba821c4137741626f67b205c SHA512 c84819854c1dab3841e8037190096c6ba33c829f6522eb83874b048c5a86d5d2a815f2b0ec21e5449cab74ae624dd0303e80746950e6864c0ddd08768b2dc019 WHIRLPOOL dd46d3d36d6b26afea30cab9b0f0612d33864376f42219592a685274ae30e5ba4b7c483390f95a919339a20399c0a1e7fca5ccb22831e570d147c6ec1043b47a
 EBUILD selinux-gitosis-2.20140311-r3.ebuild 391 SHA256 0904b935b1b7278f9fb632a8e48979d188585e03af1b7f9160a0ec153d9df00e SHA512 83977122c87aa62e415a0eb840536e22677e1f3a7c479de60c756a7ac8f43295f57c427cab4611c7a27913c1cda6862f0d9405a69afba0b781a1e9c3df3737d9 WHIRLPOOL 424df6c779ce43cdc2f3fadc726d1d58dd05c7234575264f485e51f6156a22e9b984b13111a40939b535c971c02a51cfe099a5026e68a892bcb00147db0a454a
 EBUILD selinux-gitosis-2.20140311-r4.ebuild 393 SHA256 d9aa57722cf8000bfe832e30de5f85d558f8862946faf0e5fa522bd6478745f1 SHA512 08edaf38d92df6b37474ce5e584283ff6e5c2f69817d19eb894f225784b89c3d734400a47379c37fc97f27cb99f3007e5eab1a569a15bad8d9cfffbecf820dfa WHIRLPOOL d90b0af0de5ac676e16dd81ab8e7bffa0cc9b44b2bce4e31939f479a4eb131b6cafe48d49e424107e334cba858ee0ee7695db1bab301f1f73bf8512cedb16108
+EBUILD selinux-gitosis-2.20140311-r5.ebuild 369 SHA256 e2b2e47b64deb0cc783c4589e52eec6c4cd00c5a09e29f4781e0d48b79988de3 SHA512 770c558b22a6543b5e3ae8474cfecef72c7d5a3564e512fe53c78f6948bf3840841fd381fa71af964daf27a1aa2620697cad1740144d3b48c534b974cf72e6d0 WHIRLPOOL ccad161c536eeadce455452ecf04a6bb1f90c3152e244a47908c39396781abe0b2c02c956f1877a3456b6dbd3e72e2305d8de973fd955ba98d8b3c20fd0bcc8b
 EBUILD selinux-gitosis-9999.ebuild 349 SHA256 8111e562a142f53838b13568dd8f6795d961105bac1fe8a8c8462a3e256ed207 SHA512 72562e8aad2601b0d6a45f76bcbbbe136bf398da8bb7edc6d13971bf5c51f6384698b6687bc879a29b9764e22a631d06e912858dd5fb6a829228603e77b3360b WHIRLPOOL 8baf85b81bc1f59be609ceed80e9143edee70ecdde143b7645d8127889e32be14eef26617710fabc8902717ada722190d4b02d73ceb6113799a2f3595d3115aa
-MISC ChangeLog 6588 SHA256 d7ea2d079efc801bb7a28d48be76f3ef6ca2eeca89e9ba5a192448e069e1cd55 SHA512 1ccb262a328991a781ab3054c2e95bad1c5c56eb0519ae786492a6820bc5c57cc4ee71a39ffe0c77df474ff9441cb033dd9a08625c566acda46ac1947018fcf0 WHIRLPOOL 612766f13f5f3aef76573f4d3f9cb95aba7aa3e41f22784a7a394918fc9dbc78c7452c5f6b32a17aac512e07a1aae5e081403aad00b5c16a0c0b434ea083f2d5
+MISC ChangeLog 6782 SHA256 3184da089acff65876a3f2b38e23b83bc2ca03b60efc0f7be71c9e8aa2421629 SHA512 9b89f55a35918ac4f09ca3c2d110b0d8e288fa5824c0e5cebb642f1a443934f86abbf95e03eee8162e0470f61c93f3071cf2587265f3173782a9b05844de62b5 WHIRLPOOL a67171110f6a59473d3d96e081e43ccf8e7fa5ec3b9bf22c33faec2edac6879ff37c6e92c89aa01b92edc8f152e9baf00257176d9661c90f7dc223227e1d4f55
 MISC metadata.xml 231 SHA256 20ee88eab7de2afbd3cd083a36deb8efc328e83458ddc8ccd211e4de0d97f8ff SHA512 18aaa777a3f6964f216ef1223dd0702d3db078b8ad5afd9d5e60cc2f73674b541f48153c917a9502632613aca3ab251f6f2d3134a4d9e2620e10844c6cb4a8c1 WHIRLPOOL 6da648aa0e0dfb28184183db8309ac2138a56ea7eef4623ce39ff4119049098d8d7d5da130cca7145e03faa120921d0edf993cbf31d4871b30b95d58eab32576
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0
 
-iQIcBAEBCAAGBQJT5RxxAAoJEC7dUkA7aK9HFjMQAIsq5l4gNGI0vaLQzWcvW7Ib
-GwS9fnKgNpPJJDyixOrNoYpSw0aE9Z2lubzlAcFWZ1GgaG7u6dit8CTr6e/0dOFz
-gq6NVbXrSnyz5rZMDVa1oocKuFWXXwMHHt2wVZTLSNBrjZZFxy3yqcN5dFagivn0
-A2pv2Cf4wDM5nYvtObiGRybjA3AOmFLnA8YAyGwifKkqquo9FcblmEllf901T8Xi
-1h+AsVCxA5iD7JQa2iZ3kvUFawuST2dvtVBuPHyLKzSz1kXAbB4aW59Fjpovzpqy
-XFEYoc9YDOdU6W3ljB0iVhhSJgUVqA7LGbieV+MiNVcw6RyUTl/tm1JIO+8RHIxm
-KfWoDxsW2q6IjpF5v2mqEi2a+0+oNx7cSdWntvwndk2n4j3txOGSoefxRMrXjVsB
-MscTzu7XcZPWjtbfjbxD+FqmI7GgYSBOfLHhe72cEs/Sm1HJdJd4Kj7b+mQlfBfj
-3Wu8j1fU4z5iGo5N7P6nmWVMJEmExJokys8LXlDWdNMGBrCwKkrHp0jQMhez3HoO
-JVA2BcOJMT61f5wWLa5X0qbPWmaTOdDmUTq4zFi0wVBDID0hfKwtdIEopn30CH0q
-GlENRCH8nF8pQWgGImwBKcsqNGPMGvsxqm10Ey27BlzVAgGuEkC+egWKSIcjunwi
-qIdstD/B31xsG+SQRb4u
-=qRIJ
+iQIcBAEBCAAGBQJT5nhEAAoJEC7dUkA7aK9HZq0P/Rm+aDMv2yqbaDWmKLfdk3oo
+stPgZ5JgmQpvvCfSAkRwqQVDSMi25QpkMj/j7ydHQ68I3EyBxVfgXlgp1gFeuom+
+CdL88Fp5xJcfcvi95BD+kv9jk/UkAvn0jEYEdnr2Hv7NUs+eN/HfzH0rpgSFdm3N
+iUTCQLPyzGtARmmedH43BbYUP0rWbmb595qHS9yfE00LcaHOlLKXB7FMN+xQnmsG
+0g+GvnUV3ulZ9uKSJNO5Z3SmzXUR5xd1fmbK5uRMoG2m5vOuxG253sSCGAgurbWP
+S2Mg60mQoJykX8JmMoDcGyp3rrV0jcM4CFg+F9J7Zj4zhK/c3XFzKqchpyxW3PkR
+1n+VcOt1Kd6rqhpGOK/O823dmDAKoKKniChZMG/P8/7KME2WFDG7F2O78T6JgZe9
+QVPlIwnpvxUcI/w9Q4OuMzBG6YLrVpgHposohqYte+vSH5bUlXOy+p7GNyGWtI7J
+agMusM9Z5AE+dGciW/t49ByY34Ulz/MDKi/rHbgw7zhLxJbdsoyEHE0o4J3ss2TX
+rCbLK9EeI7lF0F/250+IFXZIEWV7hDHQp2hf+eXN41rezG5yFcxJB1ZoBZRiwwEu
+3X04CW0R4P8xPwUoUCgadxksOVTzOYcE4wCjz/h4kUaiV7wB+DhP+iAzkiKpxwNn
+u/2lhVIrjPd3zMyYUmk8
+=3k4R
 -----END PGP SIGNATURE-----
diff --git a/sec-policy/selinux-gitosis/selinux-gitosis-2.20140311-r5.ebuild b/sec-policy/selinux-gitosis/selinux-gitosis-2.20140311-r5.ebuild
new file mode 100644
index 000000000000..896d556c4fae
--- /dev/null
+++ b/sec-policy/selinux-gitosis/selinux-gitosis-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-gitosis/selinux-gitosis-2.20140311-r5.ebuild,v 1.1 2014/08/09 19:34:22 swift Exp $
+EAPI="5"
+
+IUSE=""
+MODS="gitosis"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for gitosis"
+
+KEYWORDS="~amd64 ~x86"
diff --git a/sec-policy/selinux-gnome/ChangeLog b/sec-policy/selinux-gnome/ChangeLog
index f0fcd748ae87..cc74c0198b10 100644
--- a/sec-policy/selinux-gnome/ChangeLog
+++ b/sec-policy/selinux-gnome/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sec-policy/selinux-gnome
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-gnome/ChangeLog,v 1.42 2014/08/08 18:49:45 swift Exp $
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-gnome/ChangeLog,v 1.43 2014/08/09 19:34:41 swift Exp $
+
+*selinux-gnome-2.20140311-r5 (09 Aug 2014)
+
+  09 Aug 2014; Sven Vermeulen <swift@gentoo.org>
+  +selinux-gnome-2.20140311-r5.ebuild:
+  Bump towards r5 (fixes duplicate context for hiawatha)
 
   08 Aug 2014; Sven Vermeulen <swift@gentoo.org> selinux-gnome-9999.ebuild:
   Make 9999 ebuilds EAPI=5 and transform to make master for version bumps
diff --git a/sec-policy/selinux-gnome/Manifest b/sec-policy/selinux-gnome/Manifest
index c3a95be04c71..aa5de271df48 100644
--- a/sec-policy/selinux-gnome/Manifest
+++ b/sec-policy/selinux-gnome/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-gnome-2.20140311-r1.ebuild 383 SHA256 b79d39d676771a81df4b3492b83d784da92f3e2484bbdf34805b8d0a0bd56318 SHA512 2dad7e4982549fdbee27c06b1a788ff688db005f3534f6e3402ddd4f89c9edba95111774d31766086aa40fe61d45969ac70987f2364da634ca9001a3ca118572 WHIRLPOOL 8917607b4c92883f0e4e51b7825430ce611ea22f85f38a258802bc8b84b90c7a23e342a6c38fd850f890dadd37c7c7b8cf8b0490c7aa82fa70e8770b9cb9b527
 EBUILD selinux-gnome-2.20140311-r2.ebuild 383 SHA256 ddbe05d87bdba2d7808aff2eb59267e1f5e8984da68a62a8dca5abe9972f7022 SHA512 e7ff0e69a30d22a6b8bbeb9b7febef9df3190c9fc900e0a9ca793a74c87e607944936e6acb98a5629de30bdedb9d84068088a5b11ee7ccdcb0f60649766babc6 WHIRLPOOL ff15d5db837fb796d8952b18731a2df58a1f7243fab011c816de809e35c52279aae4adfe17d7139e04db84554f8ce3d68474aed6021e5352e0dfeef31ba8d3c8
 EBUILD selinux-gnome-2.20140311-r3.ebuild 383 SHA256 ef4349732c6ad36534e342929ad9afa3eddfebcda112991493c6fe3fc177f740 SHA512 bed28839acaa1c8d644a1c3be083b10b4546f03fa7762dde9038ed5ca3fa0837e92a1912367299fd62a4cbbd1efbc70bfcfac16f2718b9257ef7dcb1cb3ac2cd WHIRLPOOL 62915083accb8c0cc6cbd74abe4799652979c53946b7599c6b9e6bde916fa9252bf6df01c0c4bcc514d16943ca745054c52d68e7d6f1e6311e45750d3d253941
 EBUILD selinux-gnome-2.20140311-r4.ebuild 385 SHA256 d2febba6543c49b87f638c43738e005e52903362edf704cfa53c0bbc89029103 SHA512 f0b73e8f14a87c11ef6ed6c0dbf032dd7d410c6692951bf59275dcd5de1f7219fbc292a56a036f3b035ab6f2ee178a4e118134c25caca011884e168781eaa75b WHIRLPOOL 58f8a8130724328caf3d9e93cb071a8102cca1ac7ee0d91a666bbd2bfe51cbba834385bb2be7927119bfacac2d067d7a0b47dc57b587912ad987c553f0aef852
+EBUILD selinux-gnome-2.20140311-r5.ebuild 361 SHA256 c4e7ee77c25f77ffb3f954beb8bbd08a63b22bd53f97f8f1c892126702ad5167 SHA512 f7578706193952f48568211c63613136d0dd5c502dc70399e403c300fb778873e6d2a8e80639ab122cce99a9c35945a318d09ede4506540cdae2a8110d21d452 WHIRLPOOL fee042a43fa9404a5c1d2090aa3b9f9f86d2c95100ac65c54e3024461ae399f7f11c9ef7d87c13b612ba219cf741f86a045a2f29483c1a116eaa8116b501a9c1
 EBUILD selinux-gnome-9999.ebuild 341 SHA256 661099f1a8760c142ee39483a0a4a43b48b7170f7ab350ca199c91336e320263 SHA512 608aaf60c0c780aeb1c4d08e61792cf0c5eb4360313593a35db31e0f0e91ee52cf8eb491bbc39824f3bc420a57ee5078e0c90fcd051f1d47b5ed91043b7e6c66 WHIRLPOOL 03a36bc709a28b037796c7df37b3a191f2199c8f57e1c17bbbe60dfd8fd515f9595199fdb4a3e8c7e68f7a13315396058a166f2eefe87e6852a799b41ff32f5d
-MISC ChangeLog 6615 SHA256 05427bceeed22cf1f454c6e0132f52792c7f88f3b8f6854c8600ee82098eba8e SHA512 e3126b23e3419efd0be718541cae8675fac6df447eead3b845bda7b07abf9d92cb0d2c5cf00c2e9150263dba1d15e28588f1aff3ccaf629cdc6a3a4dc9399a7b WHIRLPOOL 3878c94c8c4eae4baeb58fabc4542e06f6d368af7ce33e75efce7f7569f66c93825eb0de43690f95acd30f3de7b20c2f12e49d8b6bb8fab59a17dbc8d7515db0
+MISC ChangeLog 6805 SHA256 ba6613ce89536905f00a3b9353fc18092f04ca942ebcd9ed5975b93b45ad86a1 SHA512 53e3a26a50208d496f3244a81b383ec09015e00461cd1068c980c69cbbef775967908939953f65dc24aeb7200d80007db5b86c8807bb719d2ce1361d26cd7adc WHIRLPOOL 27b0ce26ca7ce8133209ab02072feda0215b0d07d6b416ab84bd46e1b2920a09c2945bb43c6a38f5db5da645b7fed1649ad079d761f913ec2af30066bc08456a
 MISC metadata.xml 229 SHA256 0769275800ebc7085ff2e58fe6cac2f11310a3f9908efac4939571f9aa90d935 SHA512 1b158a9edf41daa6c578ac9c5ea502b3578affd7df919d50424d927b80861ac70abea79c58ec9b49cb1936e7888728ced68a7b7668f6e998a91063a0c2972459 WHIRLPOOL e5c30e97331e5c7f2c09e3052a6cdf97729da14cc5338703a22870f597723c9f098b45da701f50cf72ca068e52fe2c4c6758b42ed39b823aa7f15f4e58a659bb
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0
 
-iQIcBAEBCAAGBQJT5RxyAAoJEC7dUkA7aK9HV8YP/AgXCzN1IE3yKKW0DcVEaho0
-VS+ZVGL/le6TP6r1fJVTTljYYXZ+Xpo/+Z+R4XIh6A07fCVIudIJcFt7/Sxf+pJT
-0S7DI9zdHh2+zG79VTOL69Z9DOYen70JI6vvxxvuLN41SboYNFI+FqZjXyJ4d6Mw
-/F8c3FpmsPaIccdIrBV3B76sds02OCP2cq+w+ryKE8uyKZY2W3wyWobTDPTUSad7
-cbLRtA00yc2W1PyyZ1VkEx8K8zP5ye1rcYg5ZKwl6NZFqpva5Uu/vRPMEPzXZ/gt
-tS/oZVdBzrQLARAL6UTj9CPnO61fguhh2NKKBKmYfaERNUMWIG6AoZmdjxWKvKZL
-xLnieUZkgL9PcIXC6LoyAG3OL9FZhXWWyCJbsMWBAd5BJYmrXaP18yD4s0k4XMAw
-tLybAjbvE02bAKgKtFDfD/cRzXCKXhyEsD/7n3sI6GLdxDEVmckECiqKQIoTJ22D
-FZGWBZyQqRC9GJK3xEFB1RVhReCKd/V6ayUODBBV3wX1Bjs80q8+q4QQ63CIrpiZ
-PHcAkh4LDzhy//9YPyDvjVYCQzME/QC3Y3tTNs749GtdE40Y5duxnRznpIcbMkIu
-/TYuCOJMzEq2q/0x+MvhYPRTSps52/tWqvxMOgV2+CYtDtR7zusTkQU0Hn+Hx+Xe
-M9iamt4wwrrc1Rk6V2Op
-=fHI5
+iQIcBAEBCAAGBQJT5nhEAAoJEC7dUkA7aK9H5qAQAIsJqGum1FhMlEz9ibW0V/NI
+Ma5f3u0CI/xJmY/Ncs2u8UgqUc2Ok6IQTJVGwlJpN4jlBNF0s4xV/hz4REhFo3SM
+9yzh6YDuC7sMebFNdUM9239rzHcNEZWmSWhQE4QIuQtxYbVu4WvttPM0fmNuInqz
+sG5qPEZ1yPa3jlHArLMITXYWsBQ4ypniMkV8q2p4odCH1rtNCXiDLg2HkicEXGmK
+gzIPBwnWVtY0k2Ou6TCORGDVj3OpLT7z6goXzfxW7q+EYa0ZRsQX5Hst6DQc9aWw
+r17ZzH3/uGslkUve+Foz/BbitNTYfe5EpeCM77wM2zAakbLqmS5RvkZpJVFrOhk0
+vdgKXnCNki7IJ5sfIBggj7zz4vguZNhA83LgIj2n/4sWm96VZcLRcdpvSTSbt7NM
+zHuCmedqmLQl/56E2y0HGocAbe7Eo8KUYkklzGTJ/ODoN1ghGm+iQqJVADH48S7u
+ZOHesnPxvZZsFS1REhjPQdQ1zQUdw4btg2uaPsgOel7Kp/OSYOJ8duGaeMUsumO6
+dhKBjlPfdCiBRswfYS/YzRFXTkVNyJtTBba3SStdEi1miN5tai1XyKWHO87isY8i
+uQ8/XS9vjpTXde6sCDfXIac+CrJzKsCa/OEngRC0bRVLaZWwdFDfznTJS8oi2fQw
+9vh9pmLWgbMo6+q+uJWJ
+=D58W
 -----END PGP SIGNATURE-----
diff --git a/sec-policy/selinux-gnome/selinux-gnome-2.20140311-r5.ebuild b/sec-policy/selinux-gnome/selinux-gnome-2.20140311-r5.ebuild
new file mode 100644
index 000000000000..9a9c4ac38d7e
--- /dev/null
+++ b/sec-policy/selinux-gnome/selinux-gnome-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-gnome/selinux-gnome-2.20140311-r5.ebuild,v 1.1 2014/08/09 19:34:41 swift Exp $
+EAPI="5"
+
+IUSE=""
+MODS="gnome"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for gnome"
+
+KEYWORDS="~amd64 ~x86"
diff --git a/sec-policy/selinux-googletalk/ChangeLog b/sec-policy/selinux-googletalk/ChangeLog
index 7488b6915524..4babf41d3b99 100644
--- a/sec-policy/selinux-googletalk/ChangeLog
+++ b/sec-policy/selinux-googletalk/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sec-policy/selinux-googletalk
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-googletalk/ChangeLog,v 1.23 2014/08/08 18:49:43 swift Exp $
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-googletalk/ChangeLog,v 1.24 2014/08/09 19:34:04 swift Exp $
+
+*selinux-googletalk-2.20140311-r5 (09 Aug 2014)
+
+  09 Aug 2014; Sven Vermeulen <swift@gentoo.org>
+  +selinux-googletalk-2.20140311-r5.ebuild:
+  Bump towards r5 (fixes duplicate context for hiawatha)
 
   08 Aug 2014; Sven Vermeulen <swift@gentoo.org> selinux-googletalk-9999.ebuild:
   Make 9999 ebuilds EAPI=5 and transform to make master for version bumps
diff --git a/sec-policy/selinux-googletalk/Manifest b/sec-policy/selinux-googletalk/Manifest
index 7f9fad9e2f54..36f5f5f7ac49 100644
--- a/sec-policy/selinux-googletalk/Manifest
+++ b/sec-policy/selinux-googletalk/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-googletalk-2.20140311-r1.ebuild 403 SHA256 0d2385e88ad077f48eafdd183d91b9a60aa1839455f3078a05215b35533a0c4c SHA512 d64987c8e14e4a3976bd7b36fadb9d269eae67f74617d37be8dec7b7ff3acce7bb023953e769cb6323f9c06768bfa06cc47d452c663db6849b9b9d9a898bd6a8 WHIRLPOOL 5c8df509ac47f97aae48b32ca447db21f367b665ad07a2a6c7d46427b6d45cda37843296996eb58e324d78d6f2c79c76307d6c42f309359a0e50650c3d4f9db2
 EBUILD selinux-googletalk-2.20140311-r2.ebuild 407 SHA256 8d3f8ae5e08f4eb132317798fb9ecfeb6034242795720eb1724e15d02174077d SHA512 63282e6e4464ffe094db772aed9ba60c8a11cfa32017735fbd822eb03d2ac194e5ebe888595f5e8e313ec1c8b987e01fd49827cbbfea3af248103df4ebca304f WHIRLPOOL 4b075feeb896c098482b08e9f07591c2a1ac235b5678d62a0452ae43458ae5d50bd3925db16d04b66f8da0010977d1ef39f0a7a78062e7c2e9f8735abb74ce6f
 EBUILD selinux-googletalk-2.20140311-r3.ebuild 407 SHA256 dc2a697e8aac57d5375a8338d6da2e6c178c505be9f311fbc460fadbd18d1cf4 SHA512 90def33dead7dd67b36e23c2241b8cbe037f87d89cd4bc460999a2cf8d7d4054a8d9f3e5870f8aefe5a751e39662d96c7b96febce34ba7068263ee2daeb9827a WHIRLPOOL 3782ab487a974e94c6f14f0fded79ca365f917dab0e55c538ec4ebe2792a620b989058a7f4c5dcac24e94780e12ea23173fb9a7833a1beaf79dad46fef141f5b
 EBUILD selinux-googletalk-2.20140311-r4.ebuild 409 SHA256 80094b2a0b0184fa6f71b21c70333ff3d2ee610b88f1a3c60776e234f57d11d7 SHA512 3da3b5a3d42fbbeb49871ed978cf8a233cc491b77f0062572b9abd47d5a3bd65a001ea114af4bdb0e33f23586f8a9112f13a020c3119a77278a024a7741b6514 WHIRLPOOL c780ffdb8046d0730f9eae16a8349b74e0e99a7586fc37add243f7747edaebe1c2c1d45a39e9ec9b4cac6fcf291c1b5c9caeea237bc3d06edb59758739591aae
+EBUILD selinux-googletalk-2.20140311-r5.ebuild 385 SHA256 90b9d72fd17a52f107a76869cb66550d8c7dfec6579d714c43449806ef940520 SHA512 750db946b1f07408a95c438909885ee4f4316942356fb327486f20d27c2b6d43b883bc9d626e120d14b5bed681c80899610b54e90520b7a0d56af0bc72361350 WHIRLPOOL d5637c362a1b510c42e8e43cffac3c057b824513517ba40ff5d3d748014c2e2338eb32703b6ed2f0923e3d913d5b6c0105f51f281fc231632d6dc4d03d6bbf11
 EBUILD selinux-googletalk-9999.ebuild 365 SHA256 8a661a663330c8748e4a56da03a637c59f121a2db3ab8430b169f15177e5c9f5 SHA512 4a270f9f62388bc1cc5908c55e1bda36f71a448f8e0382012600cd80460de7df994b0eeed98c9a1124c16cb77ae2fc1f0a8688704a8df48aad5c4382c8df3d3e WHIRLPOOL ae7a9b0e862d75e4a8ceac92e1873e70db2479a34fe06007232018b54128fbc3aa862fa867b979e1d8d60efdfa744e8995ac3cdedbd410d9a65e46249abaf56e
-MISC ChangeLog 4017 SHA256 74c9170ecf455f80de26121336130dd26932be8a54d1b7a6da744b8cad229666 SHA512 5850da775739a372a22935acace339a5cea7818792ebc7951331fc32a073f539cc3c80b2651efd1694564cd175630b8b2e8a92d27d4a2dcffa2e5082bd3969c0 WHIRLPOOL 952c32dc0b91a8ce4c8254707ad418e3a6c0f3fbc97563b778ec798caf4d94230dd412d61909751100c9cd8efbcae8b7f1cbf50bef4a91bbf2c7610c1a6eb264
+MISC ChangeLog 4217 SHA256 3b7f5250a04b8cdeb06e56370b5f51ed09d5e4c2ac8326657ae768731054e4c7 SHA512 db3e3879ffd60f24b2d3ccf66459941cd6b21a507a6d8dd192a6ca06dfb077ce98526b54883eaadf27b1e35818bd9edd047d53c30891b8c28a600cfaffc56938 WHIRLPOOL 2b4fbe2bfb122236861b490f81bd780a8700c8af6fb311f3fdd7261b10ba3137275a0288c3ad89cc25bfc3070424f9fac5560c9155b84c7899e6941d19c2ad1e
 MISC metadata.xml 235 SHA256 5acc965d4ee2a5aaf64f853c123e33f0460f4829ecc9274b454ec80949d1f697 SHA512 617a34418219eb6d74495de039f7ce37dc9f8f04a6aabd3e17c8989c7f1d0ef8e02fc23fd3e945012c493b64e2d7048de48672135268af2fc65a6866493738e1 WHIRLPOOL 86dc2301c7adc09198e2a9ac4be2bd46b0a9887d8d29cd741509570266a262c9cb952069b56742d8a00dcecfdb7fdd36752c42f71bf5274acc3de0e44566bfd4
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0
 
-iQIcBAEBCAAGBQJT5RxyAAoJEC7dUkA7aK9HJ1sP+gKz4UfBYgws19FE3eEeapOo
-IZFMtJhEkhditCNxey1HcDTueG/Kiam8qtB/nYO9R35aQuCZfEGkogLrbIubF2mK
-CloxjONr+pKkQXAFL2c/oQiEINuhRPNQ5Qf+HBVojYjZlg0OBEfCl7314PYnNsjq
-YXlc4N5hVrL9D8c8Au4t2EmjzrMgpZMj0DXN5XAtVG2IQryxaH9M/6kcjlo4kxcN
-m5GqgNJ84gpzLvycWfuavrgcNwldFjFEir0QGV3fC2aRRDK8jgDYc9b0IyWNWXtc
-qKtasD4K50a5VxOyKoE9ufU/yx4b0HGpTOMiCk/G2Z5oOud3+TnBU456YOaMR25y
-qI4Hv3I9dsjTKfmZAzqWTMnIrfYWUz4lWlr3baQAZ33SQVrbEYyU6Oyxn2L6GYcM
-8Nz9q14pjKa0o15i81CtwCXUnIJl1z+0Qt9j9RAh8yfqEklCFy4NXPmASbojWZrV
-QWuBHBVWdZ+kwgo4ijKMWnAS0cUyDB/+a1ZeLP1JmLaYc9T4wX18HlYBpkxFQfr3
-kd/rT5rl6J53foC08HAVzao8uUUsCxwpgmE4aEv0YoKxxtkLpucDA85cRr7eKpse
-95i2X/6kTYAQ1fvoI1q+MiU1FuLk+Mv9WnhGPf2S0FV77UdHbI3uuFpt58UJldVO
-I5km3bfr3zX6jhyb7Lml
-=aZ+j
+iQIcBAEBCAAGBQJT5nhFAAoJEC7dUkA7aK9HiWUP/0zEz1HZUNfDr+wRVE4n4ft2
+zuVrYPwzoH8Gnp6b3QivMeuDX2KVL/Tlix/VzSCjjs5VK7CqAbO6H2NK+Ew9s18x
+Lnrg8+aeIBuO5hrwLpv4gCudxGEDT44Zoh7lRlKEiGLW3sRaRaXZNqosOJAhNGy3
+m5THN4zpgYjw5VFi0VE1IH2/5xLY1Wk4xSmBee3lb03Qj/7pTn4e9e8Ax7wlU8jt
+N2DmE/3DRrL4g1tCGI+XYxD+gerSH3VULZfUweeWomwcSn1r5QcxUGFTwSU7XbEj
+jjJIjrIm4rqfMlRveAg/V7zHVMxjBh6Edbfmj2KE228GsQkEaOm/MlTWo8HQL2Ty
+JSmgPxzPkomHLPIjNxwF2l5Hi1pNBbBM3Z8KDL/8/u1F2A+Coz6DaUECv/oJEwNl
+wP8PpSIIhk5F5jwlpYgV2ezV/Rj3uJgDj2rJTYMcRI8xV1hS7umjticww+yOmsk2
++7dGOr83v/zCaFhzooNRi9hcrsGiydWcDLROFDi/Uk0gJH/CiDhOVqWjE9D5Bz15
+pWXbgPwxs5g+gBW3OeYd3sHUH/92Gpbug1jfJAPcfGLEQ0rRtlEcZWYya8RonFz0
+GXma6Ylej3FBPOsn017dp6/GghdaRcza4KzLk9XE22OOFKmq+ypbRK1AAZAJ5cVd
+E7/edNzxLm/Dp0/vi2Ad
+=jIK8
 -----END PGP SIGNATURE-----
diff --git a/sec-policy/selinux-googletalk/selinux-googletalk-2.20140311-r5.ebuild b/sec-policy/selinux-googletalk/selinux-googletalk-2.20140311-r5.ebuild
new file mode 100644
index 000000000000..66b6912c62ef
--- /dev/null
+++ b/sec-policy/selinux-googletalk/selinux-googletalk-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-googletalk/selinux-googletalk-2.20140311-r5.ebuild,v 1.1 2014/08/09 19:34:04 swift Exp $
+EAPI="5"
+
+IUSE="alsa"
+MODS="googletalk"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for googletalk"
+
+KEYWORDS="~amd64 ~x86"
diff --git a/sec-policy/selinux-gorg/ChangeLog b/sec-policy/selinux-gorg/ChangeLog
index 74af377a4caa..04264426119a 100644
--- a/sec-policy/selinux-gorg/ChangeLog
+++ b/sec-policy/selinux-gorg/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sec-policy/selinux-gorg
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-gorg/ChangeLog,v 1.45 2014/08/08 18:49:38 swift Exp $
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-gorg/ChangeLog,v 1.46 2014/08/09 19:34:09 swift Exp $
+
+*selinux-gorg-2.20140311-r5 (09 Aug 2014)
+
+  09 Aug 2014; Sven Vermeulen <swift@gentoo.org>
+  +selinux-gorg-2.20140311-r5.ebuild:
+  Bump towards r5 (fixes duplicate context for hiawatha)
 
   08 Aug 2014; Sven Vermeulen <swift@gentoo.org> selinux-gorg-9999.ebuild:
   Make 9999 ebuilds EAPI=5 and transform to make master for version bumps
diff --git a/sec-policy/selinux-gorg/Manifest b/sec-policy/selinux-gorg/Manifest
index 754923b4d50c..43a6533b5eb9 100644
--- a/sec-policy/selinux-gorg/Manifest
+++ b/sec-policy/selinux-gorg/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-gorg-2.20140311-r1.ebuild 379 SHA256 8afab89a88b915b9345813c47e060534eab50d7bf9bdfb6c7da524061a6f64a5 SHA512 aa7d145a0f99051a077553d3291013ea7f950f35b206ddc094b8cc0a1818225709294d3ec068bd4f0606739d1f495589fab26ffcc7350b08b9d9af3c098d7a9b WHIRLPOOL 66d382ae2ee494d3c5cef211aa8c53b921f9c12c4c29057bcdd10ec639f47ebfcf578d50c082259459f4fb8278d0f532b75fb6ffe50837538b5b3cbc3fc6c99e
 EBUILD selinux-gorg-2.20140311-r2.ebuild 379 SHA256 8fe8f4dea99fe2175d17997ab0175247d6bab533ae0f02779641f1de223d0b8d SHA512 c0dc1da2f0f86936d6cc080ec1c4680b976e5fa087085bedd88672bc7f41e07c80ac25273ae93a55709de3d59116359914cbb857619460aae81f74c4531557d2 WHIRLPOOL 347f8c1911d5558725a42d694d8607451019cce6fbefdceaebcf59798806aa50cc295b341ab6e91f5209ea16f19c5624cac75e21b6ae2ded1a3e99f8105597e1
 EBUILD selinux-gorg-2.20140311-r3.ebuild 379 SHA256 bebc6a5bf5f24d47fbc30124f4309a5538b98261f56f96f5e528016ac3429d59 SHA512 5b33a972b7e3c42b9520f11649da30982228f140fd69eff305dcb12b986c39f4a539d226b5c856ea61083ea2aaa3f0d59a60f5c3cf1558f60e4d21a594e9060b WHIRLPOOL 58b7320dac67aafa69b8e1c3b5d1eafda0101889faaf34d9e846002d67333e69f8d0819b8ba2f146c43e15595ef970f1cf7f17c8f5e0d57181666b1dff4c40eb
 EBUILD selinux-gorg-2.20140311-r4.ebuild 381 SHA256 35ad71423c27937a8f0e8685ee398be04877ff167e6763b1caab1a9db6dffde0 SHA512 d79f86f2c130b43ddd409b3932cc59ad8a474f18cff173bdd1453f1bf555ee97baf5358df489d83e4594d0bb76001fb316c87477e964ca48d08f00f47b75eb60 WHIRLPOOL aad68ed68b053f7715c480572812acf8d0da8434b3bf2e09219ef2d7e5604e6a60cc0226aab63f691617a00cc9812f29aead80b79398df26a58134dcbd21d8b8
+EBUILD selinux-gorg-2.20140311-r5.ebuild 357 SHA256 530a774968621cbce6d43817b857d5837bd9e97ad2cde9b06aa14dedca1a1ec3 SHA512 c8a4934c24195607c0fcf26e6fc0c9fb448dfa98c02ccc17f96962e618e23c58a573f794375813083b4aacefb62826d2a4c42a2d7b2d2985a21f57a476b25c53 WHIRLPOOL 85882deeb02999b1af8d959be3051c797d4e6804ad3525a9e587fd33dfa50cfd09458e428f02225888239f2c6a3c17fb38bccd538e08059b9a3084f988ec4106
 EBUILD selinux-gorg-9999.ebuild 337 SHA256 213775daae54fd7bd68f5cd6f4751853524b3297171c24e873b2d26a00590208 SHA512 208877d89d479fa1560985a6932dafffd1c584b6cdc03f31152db9c444c48d6e1016efbade259a170df75361ced2ea31849d922a911068952937283e44c15bf9 WHIRLPOOL 37fee48efe0e4acd8423050c4e1fa57326b38178835486567fe326c23df9bbdead9db64b96abc97efa86ffd7cb8b6cd5596926048aea24364b8e04599f741b58
-MISC ChangeLog 6924 SHA256 29e4c324476a2d4eabd3e01bffac2a574f513995f0bf80f98128dc6469912afe SHA512 4aab8d541ac8c2566894930aa541647709d8fb40a871c8099f6a58e2003c5f3390d93bed077bc98d35ae39948f1d2a4b08fa67e8f88b5a286b0c62f6575fd009 WHIRLPOOL c18776cda0f7a5394a58ee891149fdff059210cc603f5a2555aa54857d4a790def831a7f732b53e5f3c730da51bf3367171a021ee5f91f27a5a2b4cbdad8ec63
+MISC ChangeLog 7112 SHA256 3e7d949ab5265245a4b90d87ce7a187d37c62c721a7cc685c244dcab7885ce5c SHA512 a9dea49956a7a10e8204e62636ac2659ae1912dd8f69cb9c1de81d0a19bf9f14ea62381cf75db4deed40af768776f34186a310d49ec0893088487a99c5a2a1ab WHIRLPOOL bb503704cbb0112e28c20cf4b545ac21e64d4875154acec99f680a64556a025ce54e5b8001882ad27e399fe5d3961560d681903491839886ea93955bc6df98d6
 MISC metadata.xml 228 SHA256 7bdfc3fdecd802799da9aea4534b8d401a3dfe9de773091d0aba2285735204b6 SHA512 c47d330317d38d1ad1c528591880c04d40f9ef27890de14fcf2b443b41e6e3b57a593450bbd3e28ef8f5ee65f8c37c9b45762ab396b104ccbf6dd957630ba3b7 WHIRLPOOL 895c890931e017023e94cc28686e1ec920e8e29749c0e4a839156612c3fd6ef8a0f6f340ec01aeed4d1b8ff43d93d81d674a71a5ff88060e3decc4182b75593e
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0
 
-iQIcBAEBCAAGBQJT5RxyAAoJEC7dUkA7aK9HbzUP/0Z4R1YjJSqmPXSq/1V2FC6D
-wddC93YSwnhpwhQhY48K/hi55CDANmicWk/00JwcDWKEhFbg7yCnlVvx6ec/SNmC
-CYJw1V7/TLfBYgPX4z7zEyA2rNwaj8QrAw7bOuvxi6mUy6gUj9j55dkyxrHfOIGS
-mfGgKKdftnzUo65NOGKHjvx7qI5SaCwoICb+DOa8rpYtTR/59aWIFedhzjJgh7SO
-FNCSMNWG85pRIHsS8toQ3QtmrEPT6kUhsxUOpA/8Ed19H5NsqODYWjxmeWBP3wtA
-hGAYOPBupw+GPIvo3QUNI/T27BYRxnjB6n5zolyZUw0w47LcyRh1B4mQ7K8WKWHm
-CCeIFz2/JK2YOgF1UXcPOeWq6nzAqVFeaDrJrJybPfS95q0x6BWCfJNU5cA8tlRA
-SgFVSTZJbE1xP2QaqkMdRi2BcfP/qM1orL52GBr2garR7+wVm0a6sOKzGU0qDaUV
-Fyu6aYniV3s66j3LaTdf5qd96E0lYcpNx4X1z105ClF/AUQCEs7H2UNHLttlLwxR
-ef20ek9IA/p3mBiItGbmlOWXXsApMOsGxzZX8dcNT9N0DEECb0j+KR8C/TEUNVrS
-SVpCsKhzkfS8lroZ3mY8+beihac+SyNCsng30ivNQUtTnAEJYpJJEl7+vN0sveg2
-db+PbQi6yUbSBdQu+vYP
-=RIDK
+iQIcBAEBCAAGBQJT5nhFAAoJEC7dUkA7aK9HtmEP/Aqi7DTAYexPoPz4sK1jVROf
+QAmeS3Svu2Eu7oJ6t9CVx1dAsNG/QgRM9Xx2jiHWdIrT9ZP5iQWnAWDG+Na/rn3g
+1t7wDcayXBVYb4XELXx5FwIsER3PQHTbXTmgpVJG/etR6bKRWs6qgqt8M1Pyj++f
+ABiDoqph7AqtabULUr7Nnagp2ZIX+Pou9PdeQZJWPprkWN7PIFTys5Tie1LYqm2W
+pWhrcWBKeP0lyXdDIhiZWdH3zlxtDDYqIkgxVkMTCa7jIamVEBXBdBr5bsDSM+aT
+Rb1bOiWBmUkDM2bhR5msftPNe5shgcw/FTsDGiUThTOQ/gD0yxBAf1L9ZBTSauTF
+DTJF6YfGT5mC6zNMNq2Qla86evvYl9HonlL/nWuagUtUd7O8UNETgoSoIjt9yrh8
+SWRxsN0zLe1B2EuS3S7ttnJuYHvwJBZZnPwovIRbTxMFl7+VJxKazfw4JRuIFuBM
+ZoSjIbqokfRGr3aAdEYmcHaYSAgEi2Ctsh+Ydm5yO7YBdsb2srZPqtJOCf8t9wa1
+XLJG7Bt/5yFpBNdkIaF7Erb7N3/g7urQZO+z3cBDM911n0ROkgujBQNjHjH9nlKY
+ZkRLKZ40eCZvZ8K0BE5pg8Z/8HvEQUvOnIcLyD4rPtBcqetZuEjfWxX7WErcRGdv
+Bptg6gptLEPNj+iBxUmB
+=Ls6O
 -----END PGP SIGNATURE-----
diff --git a/sec-policy/selinux-gorg/selinux-gorg-2.20140311-r5.ebuild b/sec-policy/selinux-gorg/selinux-gorg-2.20140311-r5.ebuild
new file mode 100644
index 000000000000..35a7800593fe
--- /dev/null
+++ b/sec-policy/selinux-gorg/selinux-gorg-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-gorg/selinux-gorg-2.20140311-r5.ebuild,v 1.1 2014/08/09 19:34:09 swift Exp $
+EAPI="5"
+
+IUSE=""
+MODS="gorg"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for gorg"
+
+KEYWORDS="~amd64 ~x86"
diff --git a/sec-policy/selinux-gpg/ChangeLog b/sec-policy/selinux-gpg/ChangeLog
index 770242aee994..bd393324f2f5 100644
--- a/sec-policy/selinux-gpg/ChangeLog
+++ b/sec-policy/selinux-gpg/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sec-policy/selinux-gpg
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-gpg/ChangeLog,v 1.47 2014/08/08 18:50:03 swift Exp $
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-gpg/ChangeLog,v 1.48 2014/08/09 19:34:47 swift Exp $
+
+*selinux-gpg-2.20140311-r5 (09 Aug 2014)
+
+  09 Aug 2014; Sven Vermeulen <swift@gentoo.org>
+  +selinux-gpg-2.20140311-r5.ebuild:
+  Bump towards r5 (fixes duplicate context for hiawatha)
 
   08 Aug 2014; Sven Vermeulen <swift@gentoo.org> selinux-gpg-9999.ebuild:
   Make 9999 ebuilds EAPI=5 and transform to make master for version bumps
diff --git a/sec-policy/selinux-gpg/Manifest b/sec-policy/selinux-gpg/Manifest
index c2ec7dc75bc7..8f25c8049426 100644
--- a/sec-policy/selinux-gpg/Manifest
+++ b/sec-policy/selinux-gpg/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-gpg-2.20140311-r1.ebuild 375 SHA256 0de9a511d25c6d34e5160752123bf89ccd027724baeff5cef23b6a2418920448 SHA512 b13d56408e6e42dd9240817aa5ca7e62c3bf37ecd00e3e293f9e63fbc53354982781835fa3e89813793792fa9b7d8738517a52fd3c6ea365a9729f80ee6a657d WHIRLPOOL 0ce7f311622110caa3735d0dd3582597f264f963951d926992ba9c6044248fc7cc606a7fce6530ede7da74120b24a421e86df5c1704c5294c32b60ceedc42a12
 EBUILD selinux-gpg-2.20140311-r2.ebuild 375 SHA256 628ac0a80d74b0dc9931e2c8ac2c9632c7d422bc207830ad7019f832dbfdac04 SHA512 d988eb9c81bd9e9bc266336ce80e4fccfe77910602fad8e77596377430dd56dc61f75992d85e9d57703cc3bf759ee7d12cf5e6dfc44638c5f3c8ef1a0cb39a0f WHIRLPOOL ff6efbd6271bebb69bf2935c7269b15a117220e66bec14317d0cfd4e65dea69136747bc6579931c39e61d90a4e24caccc575bf38e6168a84bb8150172b2ecc23
 EBUILD selinux-gpg-2.20140311-r3.ebuild 375 SHA256 8c8e58c09d5c2e2f6817385ccd0b567407ace0dab3004127e22b79a9d8812f30 SHA512 ef45eb2ad4fa41e4a09afec9ed10b4e0d38ac8bc9eb9a1b2c6eb358b3f428b4baab9157a25a3c37e224f4379ca51a88c19112b2b0e4358583e6fc4c1654b700f WHIRLPOOL 3ed605d16d1f63c9f4682442a40c19509d10e75113cf24f546278b93559a6efb1108490b07fc8bc387a107c9510db65165075de6dbcd7bd096f30b5f3beeba89
 EBUILD selinux-gpg-2.20140311-r4.ebuild 377 SHA256 39b9ff3fd1277f189b8aad7ec73c791befcec89f75b1fd4443588d335d067064 SHA512 e997523de2e9267eed6aa1530dfaa0cb9be1db796468dfe5f264feb03edbbf854dcbfd7fbf4c74ce696e446c2c549b410c7c94b1520770d9a5defd5053c9e69f WHIRLPOOL 4ac94bb4f7f13a2407ce2b30681c9b2a077f19c0994e0ef31f90e22e4aa1004bb83fbdcb54341857dc8d8679234c1e2f25bbcca044acce482d02c9bd86980dc1
+EBUILD selinux-gpg-2.20140311-r5.ebuild 353 SHA256 061f6b5626701cd72f7e80e1ae7d2aacc0df5d65636c7571f3dacdb576b0e052 SHA512 39b11294749e6a02c917500d2502d4c24a1c21e07b4d29b5ce25bf68b44c37dc9c27fc95afb3a51446b1472a41535848a3466b7d3acd5073475570af37b27f77 WHIRLPOOL a2461a7d5a8b31828d1db80f89e89fa14344c8117a605f81eba3b8f17ae0680932040dc0a86674ed3a525456aa50edb9615aff66a45151172ac6ff7bd05aaf4f
 EBUILD selinux-gpg-9999.ebuild 333 SHA256 de035f8e0f8ba542a15f471db3f6aa1851f9cba4b68f24977dd7426ebb227967 SHA512 bff71f23cd7bbfa06ea4266c643f72f968f45b92fc9c010cb3497047deaa7a41cf1eb5eaeaa9b62bebd1074d777f4f56dea0e9869dcb8855afbb5d79c983057a WHIRLPOOL daa003056ae43fadb94c162a6761152b9e016736ae1643446bddfd6558d1fab2c1f5a69a55058878aa92f3c1654ccacfa80167fc643dc2b6d49c1d3a1f61bdbd
-MISC ChangeLog 7986 SHA256 04b8ee29d1b4020c4775475ef79c85b018fbda5921c965ec9895552f0ac9102c SHA512 1169362959ffede9c25f9b6b11efe88e0e31c3b182a1d9f597a3038a26e3feebc27648880140513aafae072529157fae10ffd480caac0e0919c7360abff625dc WHIRLPOOL efe044e8e442429332fd5193027378a62100c9ef6f0ad04234c2f458763f487c2b58f8806da64c2f129c95a736095abb008e5479c9066870052d0b6b95e7d9c2
+MISC ChangeLog 8172 SHA256 45e648bd0617a9dfba806725440f4d451d3566c1c73a494ef89932d471162cfc SHA512 d6cd799de653972aef665a4e0d9494daa7a9453f496edda4058f694e817e2870cadb6010a1522a22b22d89e88b1a7e9a5c883f6302d536d8e14e27e0a0840192 WHIRLPOOL 7289279ba29e83c3e63c02099da6fc98b6be9ee2d59c012de64728b09e370f91fd2a102903c856867108df4d34faf1a2956d9d08820ddbe70a60698144a32887
 MISC metadata.xml 229 SHA256 4b1146e64598e7b4a293418cfd78654db2596a7682765cfa06dc14e9098b76cc SHA512 b18ba83a04b3abc3ca9c34154d1216a0fc85bb15cd6b8960b1efb6d5c9d3ccb868fbd58c9fbf99d68734f868cf3770c1e870bad6fd014e275ec6fe5375af5434 WHIRLPOOL 1c22e1934024467fb4029112e50fca83d07079345063886c4a3eca3e6b38bab0e4eb59da690541ba788c457f039a6c149275362173bfe052a0f319d97d145480
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0
 
-iQIcBAEBCAAGBQJT5RxzAAoJEC7dUkA7aK9HzToP/1XHIs+hhiyn1jW16bJEwrBH
-HgEOLA30qEewOMrBKDLVxxyjg5QM/p7Vyvz60dCCyWhx0OMHPQ7odbsUWac9YKBD
-a6W4bOmKhc3s7AE1a3DEBtP9haVPDhnQ+2bN9u3HX4/oEmjdD8/+bKrJe+wd4L2K
-ZRbEqEmOsIx4rAFVaBxZMN98gtz1xzglgfpHcweO/N2dpdn1b94vVs5QrrEi4dPD
-0ADVLFA+7vPorJQYd0a96W7lYV1UmPeIX3CEsGfdWrVZPJSGzdurrkLmydIs02rG
-zHGoCUnlXnsfdA+7mFFWEvrHLr7WLcd4wWuFhtFgq/f3oXDPMZlsIOTf3C9cM1rB
-xXrgUd/qDhn6jy8wOcbxwDNKqGeiN3UpQJshKvGyrcbLUOoNMSaajRSqLEm4nmua
-aIhNEHFPcIRxcBxZx8Ph6Vt3oREDUp/tFGI+FcrMqVMJilKkjHAPZbhlKdk/dvWA
-ybDoAtY1uCS7Krhjgxt6OjyND0ZrsBZ2krGXsxdQOntJb+TL/R3KTyHQG8iSzzzj
-nevZSjTUF9jXGE2huDxTQiheDSTN5RcnXzEnqlQTpTjwqlQpzSc69qJJIIMAf9Di
-RX+0LpyeJfI6YiZUoLcsPZ0gUOEAbyi6kGmlKiCWzDfI/sbnvWszLWkLO20Q3QaH
-Pm0O54HzJwmRUSrMmeZc
-=rhcK
+iQIcBAEBCAAGBQJT5nhGAAoJEC7dUkA7aK9Hgn4P/2MryWW3unnArEWtcWC+M591
+/W+SZVfcobOe98Av9IzVhXXguTKGK5B6K6xHyUHBm5xvYobrScBBAr8EUZOy31MA
+2mWzFmeDbPVMOIN57jtveAhRUFCDAgDqy8sWcP2QlDr3z3XXj4PKJ6OpuToaxmCm
+3BZVSs2D8Qw70R1C0MAD7tApJVvXasZhOeOFc8G8CQsWHMoI833JHjs8+yHrAw+P
+dUlhwdj9nKUigctnVFbKdwZHJUf/9f/A/gRF9gLVe5mRbJGcrN5jl1qnlPES7D1Z
+yAe5sXuwJ0E+QcSDEqV69M+8/ZfznaD35LVXRDTzXz+5X+lY1NrRWQKbFBW52VBQ
+b+KLw97/BuHaIVAWZQe5i89XVt948dZoWs9K1cm5zrbObVEsPiFPUcTXO9hV02aw
+Xwe0lRhoBE7YCqDnlXciVMoCW4Z91PqXLXRlMDsqHXHQdtDLnQwdzUe7+m3OAq+C
+N4cmbg7BWEF/C2C/ItpJTnfAXqkHdbU42pbgvk5YeN0b0WFYi6UG5YtS/SRTXYYX
+wFCHbb3/YzLBoW0ub9cUaCvRxx+J+NUn6qeHsed/NV3hFPZkJjNTtWqqntkgCb4N
+eutF+2m0UbAJq+brLVyjoT80g2C1K7CmbAUohVBHlAtNMbM+napSK7p7ZtSV6IUO
+nE2YfQBOo6RZY3lI6xjC
+=xyjQ
 -----END PGP SIGNATURE-----
diff --git a/sec-policy/selinux-gpg/selinux-gpg-2.20140311-r5.ebuild b/sec-policy/selinux-gpg/selinux-gpg-2.20140311-r5.ebuild
new file mode 100644
index 000000000000..302f2f1d3f3f
--- /dev/null
+++ b/sec-policy/selinux-gpg/selinux-gpg-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-gpg/selinux-gpg-2.20140311-r5.ebuild,v 1.1 2014/08/09 19:34:47 swift Exp $
+EAPI="5"
+
+IUSE=""
+MODS="gpg"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for gpg"
+
+KEYWORDS="~amd64 ~x86"
diff --git a/sec-policy/selinux-gpm/ChangeLog b/sec-policy/selinux-gpm/ChangeLog
index 3492543e7298..c13463c5c297 100644
--- a/sec-policy/selinux-gpm/ChangeLog
+++ b/sec-policy/selinux-gpm/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sec-policy/selinux-gpm
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-gpm/ChangeLog,v 1.62 2014/08/08 18:49:50 swift Exp $
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-gpm/ChangeLog,v 1.63 2014/08/09 19:34:17 swift Exp $
+
+*selinux-gpm-2.20140311-r5 (09 Aug 2014)
+
+  09 Aug 2014; Sven Vermeulen <swift@gentoo.org>
+  +selinux-gpm-2.20140311-r5.ebuild:
+  Bump towards r5 (fixes duplicate context for hiawatha)
 
   08 Aug 2014; Sven Vermeulen <swift@gentoo.org> selinux-gpm-9999.ebuild:
   Make 9999 ebuilds EAPI=5 and transform to make master for version bumps
diff --git a/sec-policy/selinux-gpm/Manifest b/sec-policy/selinux-gpm/Manifest
index 70ebfeff02c0..77bceaa58dfe 100644
--- a/sec-policy/selinux-gpm/Manifest
+++ b/sec-policy/selinux-gpm/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-gpm-2.20140311-r1.ebuild 375 SHA256 4676290e7f7ef6645217389caad9f7f8aab77ee4a112306782b2bdb7ab963f6a SHA512 71a9665bb79b83582ab482d2dde2fafca5a06ed6c434a644cc50abec979ce39163d3d2d5cd393d190d5cc0c9c29dc646dd89fc7db98ad2f785672689799019c4 WHIRLPOOL eb95555bfe205ddb2d8941fa9683ccf548a5c1c5001d3d48234bd77a46d2b40820f956c22b4c47e30b933e1cc4bfc25099d87fc38645103a6dd3edffe4b2f772
 EBUILD selinux-gpm-2.20140311-r2.ebuild 375 SHA256 106ce3a3a9a4df6347a991ac68ad707e896ae2bd0f1e4443de5ab9e8461aef61 SHA512 22257226ce6cb10eb77c5c15e39aab39c5e1a72a3447e9b25e56036fbb9157737507db63e5aebb14f5c718c2fb4446da59a5e05bf521c5cd363547563bc5c8f4 WHIRLPOOL 80ee514ad14fa177fe6806367b820d9715b621397eda358c0352856ebb686aa619e1368c87a52408f6cbc279d3ec13d9479e194d7a6d48b995d799386b8817e9
 EBUILD selinux-gpm-2.20140311-r3.ebuild 375 SHA256 10d0375a40a1b4cfead6f103c3f01c96fbfff0610cd0c46a5c145da71570db21 SHA512 7af52325a4374e6ce66e1d343d8e0f1c4a723a9802e804a1a2587616499b9827461875a6b2e3cf5dda9a9c9711821f9b5e3fa7849b01559a7ef57f29672043bc WHIRLPOOL 68fa2290bdc60ec45b877b8be60d8a7703ff1da96d16c65d0d2c2e16ce3db0c912b7e66934d33d2c660e94ab823168a472839efb1ac6fb4670c9ed248e950682
 EBUILD selinux-gpm-2.20140311-r4.ebuild 377 SHA256 2d0eb5472c8f30549a65d14ab0e2a02283afed0ab5f87a8cc83c0c5418c1b491 SHA512 e3b43713ef285b76fd0e2a0f3cc4d8378ae70876a6d7f5bc51013fd93f1b9519fa00d4695217cc3ed4285eeb7bd5fbdb2dbedf8af5917ba892885d470b1cacf0 WHIRLPOOL 860b932532f82dbe308d95625b4f1a703635400e2ae87b3d9b1105c6722865b95e22907ff2c4615a5aa1f205b750ab5a0931cfbd5365629c8c028db63f1f16a8
+EBUILD selinux-gpm-2.20140311-r5.ebuild 353 SHA256 6773e1394d88f10883576c5f70fc11c87ce9be87da18d56cd65ce0e0129ec5ad SHA512 dc749bbddbee4d3e59fca1d79882127320ebb277e0bcfc9a380f9f3d15c12b2d0baed6bce80a6455a2879f8749db193c9c94969c056cb570bbe78bd074fe442a WHIRLPOOL 18c0b7f1f7f06f81c3ad8897ba210999c5abb7deb82c1926861e0907faaf01b21b8f8fb18f6e2f3f3b39bd337fe460fe39a7a76aba7951843d9a490b548b4312
 EBUILD selinux-gpm-9999.ebuild 333 SHA256 fb2b2b827c699fd8fbf1ac9e17eba463298eee401eb4d60ff0491bae5050fea1 SHA512 a7f2c7c2a17728669ab4937abc254dae58f61e64ac578dda1fb9c683fa7bcab8ce12117edfac318af584dc9f7145cd9fd84e2804d5a79fa88578702455c0596e WHIRLPOOL c997021ac835de8b6a98eacece398c69be05d0b51465cace5bc8ec56c7cd8e7d9ceb52dc6fcabb6f8ad928b3126cb32254378880823f6dd437fac703a6bed52c
-MISC ChangeLog 9143 SHA256 275dd6a848682090c820a334c652b39d8eb027c2e99e28183b948d3c864850e6 SHA512 bfcb8d2e2683853b5ef91b03091793969a3fbcd8c875a64b9691a6875d9646d3fb301362103922420043928f8565276f3ff66415459d2e026f3ba9707aa26bda WHIRLPOOL 9009491681ec3349c63b531a284f8de7d4025caf3e6682b9697dc3c134698f87c5c3725a163496975af66027e1e7cddb9c000b38bf52d6a8b748661e23ff1b9a
+MISC ChangeLog 9329 SHA256 d4a9a93cf6e0cde39af49035e3490a4132b2530ee3847523250271c69e2eb8e5 SHA512 96899556bb3e9c8d294e23ccc275dbf84a2a0fb19a82ba5cb842c59fc4e02842858fd33c0a9a078b56e3164de2a0b771bc733172b814bb4a91605dfa298d3be9 WHIRLPOOL 04ab3b1c260db93fb423876d93c8817c26346a232ada6a6e30478e13825525e1527c5f5b8630dae4e0953f3be5b02de1a1aebba621927bdabf4cea40fe6092bd
 MISC metadata.xml 227 SHA256 60cef18837436ce98f0020f6de03003fc37eacd7de84a3f16dcccb37a60c02ef SHA512 7e6e3571122a9da51e7bb8cbf7264083833c80110c718aa49d205ff4b062746f484cd64a14570c0f74d5aaa0b7ed04b0f4d8f7367d82423b03bf12a1ac40c0a7 WHIRLPOOL 7d417726a3ec1fe9dd44677e41721b1c35e8fd30117bb0215f56ffbcc1a4979fce09ca398299b320e83e5e3a2fc88218a26a6c3cd1ca91c7791dc0c569905e1d
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0
 
-iQIcBAEBCAAGBQJT5RxzAAoJEC7dUkA7aK9HlqcP/i7m68KWhuxjtYutCQvcPDp6
-u+Z2nGJRU7j/FXeKBhHxx7dnAzXmkt2GBfxV3Brdyc18E3b0EUOedfwrfJNp6lT/
-XOpCxFu+LFNwIEFzFHjLB5vzik9T+1t8mCdGd7qFEGkhbE8YnC2wJldedtzOizst
-fZg4HnANv8mSr6XIWpBsp/Z54vQ1w8Ssa9GkPMMBHA/8Z1BQjsrCjM/1b0Lki8LC
-rN06bwzPj4G/BS8ZTTii6AzC06v3hKEkSntUwxnG1Yz/CD8WlRkvrBPeB/BDsSPU
-OISbiHp7w6KzZ9sUD+IJ/fK/v29Ds9nZM06Jdkni0iZ8GgzXyDGScjT1XqmafthI
-zomNQMwWhW7za+IXiR2/gzQJpgbctm+wRnPMXHuBnDmnUIEVFQACroaNpi+RAvwX
-oV4n1FQM65AGwX3N11f/u5P1+iMknTkc3cCGCkVATSouJ9iG8Obk0A3Zgf9yHMLR
-XBoX+LMe3HsAmth6G8aN/vHKcSKgyBPz2sBaN6WVegRi7gEnmHIBQWRufensBOml
-WmhAiuuB0Tb93ZZ3RFbQZS6jbQBLFzSU9KEtqkrnM7OKvTq/vW/jtKnQ26OBPLLn
-p2B/ZELcX0kWWaLljRPfpI4tyVRZixSaQRSDJecus2r3gmQKDRJ2L9akXbpxIh+L
-oHw20SHW8y/Hm2oT1kDC
-=Ves5
+iQIcBAEBCAAGBQJT5nhGAAoJEC7dUkA7aK9HnXYP/jNEI4e0FC4B6aJWLnHTqQeo
+b0rnv89otPnsanDINDFNxAZULXq1yxaFnhebWmXi5gVsFwYbgaJIEHO2dcLuprgz
+SI2usRvrMUjvteiCStJHbwRV2V7H35NYKKGx1Lm7IYxhUST1QDXBrcBpYvyE21k0
+875gNMVOEjNy5IDEmi0BhMdPXk7N8tjPT5KX4GlIZRHCzSfXZXa5Rf2Ubtcrm0ep
+XHdku1pwWSI6SwtFozWDmfaE2btcM1IRc4QL9/S/cCzUaJMnLLidqRx2V0gHLw+m
+j3hhsmrxpwag96NRCwkh20Fd1gp4akkx9CTPigMJccoiJQf/caiGdH+WIGT1R4Tl
+0N8lxVCp4TPMyxZSRqNu0JYvjDBsFdd2UAHKaorjPhf29di8k9JPAEN2jO7N2WeO
+jI4fXdiQcw83zSGxoU+ENhzVXlwtdBRFVr0YFhAfk2R5c9av8cOe5Ae9tgXJl+G0
+mb6ePhNe25HobfkpzdYynollvorbeGRVOwRCspuomLPH8QEvr9EJx2dAkKG8ql4Z
+owrhPVx5I6FfOoQto98GVGDOYiaPOupzR96CUURAYh3FixkRWvbQ2HesmSNrOnAK
+HrtrOaIwxgopgOxNWktgDis5XXDax0hIB17BWkZ/Rw9OUlpuxbHJWtA0jdmjg1Py
+5AoT1g2grgF4QriwDFDi
+=oQSA
 -----END PGP SIGNATURE-----
diff --git a/sec-policy/selinux-gpm/selinux-gpm-2.20140311-r5.ebuild b/sec-policy/selinux-gpm/selinux-gpm-2.20140311-r5.ebuild
new file mode 100644
index 000000000000..46d4f52d0190
--- /dev/null
+++ b/sec-policy/selinux-gpm/selinux-gpm-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-gpm/selinux-gpm-2.20140311-r5.ebuild,v 1.1 2014/08/09 19:34:17 swift Exp $
+EAPI="5"
+
+IUSE=""
+MODS="gpm"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for gpm"
+
+KEYWORDS="~amd64 ~x86"
diff --git a/sec-policy/selinux-gpsd/ChangeLog b/sec-policy/selinux-gpsd/ChangeLog
index d967cc4f4013..7bfaba5caf50 100644
--- a/sec-policy/selinux-gpsd/ChangeLog
+++ b/sec-policy/selinux-gpsd/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sec-policy/selinux-gpsd
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-gpsd/ChangeLog,v 1.42 2014/08/08 18:49:45 swift Exp $
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-gpsd/ChangeLog,v 1.43 2014/08/09 19:34:30 swift Exp $
+
+*selinux-gpsd-2.20140311-r5 (09 Aug 2014)
+
+  09 Aug 2014; Sven Vermeulen <swift@gentoo.org>
+  +selinux-gpsd-2.20140311-r5.ebuild:
+  Bump towards r5 (fixes duplicate context for hiawatha)
 
   08 Aug 2014; Sven Vermeulen <swift@gentoo.org> selinux-gpsd-9999.ebuild:
   Make 9999 ebuilds EAPI=5 and transform to make master for version bumps
diff --git a/sec-policy/selinux-gpsd/Manifest b/sec-policy/selinux-gpsd/Manifest
index 39208a60aace..3c41187e282d 100644
--- a/sec-policy/selinux-gpsd/Manifest
+++ b/sec-policy/selinux-gpsd/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-gpsd-2.20140311-r1.ebuild 379 SHA256 2169edacb6120ece4b21400b24ba7f0337064806116e85327b6606a32fb3b5fa SHA512 fd9332b9b24cd3d26185c98bd6eb069a7fff2adc1b19858d5ca657155efc4605cbf727f1a3d6fe60a608261e965c5b7869baf9f4993e8ff4c116c4a8e095f776 WHIRLPOOL 3f211c5f9256c8d3564d9a2444f2ffc6464f6e1559cf2548449080dcf0f693926cf9f42891be995e855c82560d6a8230bb1e2d7907cccc08c0aae860867511e7
 EBUILD selinux-gpsd-2.20140311-r2.ebuild 379 SHA256 997c1bce80e51f952ed7aa098bb9ec6a29c9c01cc71fb20e38adc74f07c37b5f SHA512 da71353f2846ec65ea5e335713d2f236d4a3de510fd8b536038a1313f64f9799e87903df748350f46ba209332a77d58da9cde1062d765489c694d1deda9198c0 WHIRLPOOL bee44696051d8d4577cb67cd2776b7563bd98d0dc4644d5eadb6f0a7e34863e8ff6d70193d66a75b4fad45dc024665462f5ab9b4b66ffa46b25f2c9914c88529
 EBUILD selinux-gpsd-2.20140311-r3.ebuild 379 SHA256 f7625ace5588fb01029a9d807f2d57a8286aefbdeeec5a3372c5225fc73a50ca SHA512 d5030885afc3e4b2ace0459dfa32179704f83b284a7af815351e175a9582bc2b24ca562f31dbb8441b6e35b11acd98d278c0ef5c964781ae11f4d83954a84768 WHIRLPOOL c16b6cbe34adbdc6a2e521da71567668eba21d62023a0e9f4356bb3e2e1f4e3d59991aeb80cd0cdbdec5d9ee5c7bb23fcd75b0e995a1183f49c91241d950ab11
 EBUILD selinux-gpsd-2.20140311-r4.ebuild 381 SHA256 ed788ede6222e40053bbf073a5d8c490e593efa5e423b270e8b4ecde7eba6be7 SHA512 2dffa363380364bac54827fbb4031d3f32ff688cc586c63857fba6aab4571c651e99854601d370152057b2bcc7908cd30641c646c420b3ddad77f2c394c7d97e WHIRLPOOL 31366b8a2964f6bd2c09608e362fa66519584285cfcb311e22944c33027a7819bed5901874aaf8e0c721684dbd4a2df6b814e76999b7b05a44094f13c3751b7c
+EBUILD selinux-gpsd-2.20140311-r5.ebuild 357 SHA256 42423253fa1e824284db768c2ac266f4723a6e705927202e4e46401540bca119 SHA512 d027ddaaf41c28c1cbc0937e1e843ef64def7100c908a32f391232f8cbff80a6add72bc1d695cccc32c8b0b01c6aafb8eb7da32c5387cd513f3f041a05baa78b WHIRLPOOL 2205b9c4082b1bbd9fff9a008de28804a30bc5df5779a2720fc8bfe9dcf297b848f0e7e68b2130927b33d3ab1171409ae2befec5769903e5d958e34df71de0c0
 EBUILD selinux-gpsd-9999.ebuild 337 SHA256 2142f47de12ca10214e2785519e7f497973935a068dd2bad71fc19a560052d73 SHA512 45fb34df437eb09c770063ccce92aefea195a7ded1b29664d908ce3504bbd3266f631c39c26248c99fa53c5c9caab16f4bf5a1f5e0085d7ae7cae4ec4b11843b WHIRLPOOL 8b2232d1572d0f59772d8bd6038fbaff7ff4b87bae4c949225247d10e4ce16740983e34560b99c9b02772dbdef1555bc70235d21a285578bad2e6902dd339c01
-MISC ChangeLog 6361 SHA256 dfb3f2f91bd7160ae8c7bf4cb97217a0876f1bc01097ec9b979a48f59d857096 SHA512 9dbeedffb4f45764d748c116ac06fd3d2ff5bec00c907f01c43d5a3c500f4237d94e802a6324ec60ab9e45d1c73d261ae85caae3f522ccd8688054c249817d61 WHIRLPOOL daad2bdbb68676bb5043735e1c29046f6cdd55e2d76377de41a002fe778bf1e3379e8f52f10a4c5c59d2aab1c73c5488bdebd63cbefa5dad38cb2b9e816922f9
+MISC ChangeLog 6549 SHA256 647fc817c024f7e3387687eae473aa206945e6534a1dfadda2d685e88ce387b4 SHA512 74e4b33bc8e509850e9dab1e634acacd65501cf3b59337cd3fc824082fa94ab9a80603e1919657116f53b7cd904813aae86ebd787084b65a4ac6123f59cd6310 WHIRLPOOL e727f9c1388987ea8ac7d2d9f18b2d81ac627aa06f9facbb3e73a1250dcc7834236d0614e5d8585226305fb19ff0b41418bb80e76ed38ed73513ac0c2d8bdcf3
 MISC metadata.xml 228 SHA256 4311e6ba308b0c8fa38abe2aec7241be3a77f2ecb93b030333df5d87c356da12 SHA512 e97b75f6464ec284ca2d766eacc19e602ef037bff6d82fb4acd536f460efe2c2b7204f78806e3bf9ba5a87f4357ad6fc48332c63992b340e15ec009593155386 WHIRLPOOL 7f01e822870c015d4fd9e1a2250fb89c63e2bcd69b997388ec2c981e57b481c9f85d09775811c0f42e8a250620c6b4d24af6a01a151b5b9085e942b8f6bba630
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0
 
-iQIcBAEBCAAGBQJT5RxzAAoJEC7dUkA7aK9HNBwP/AgtUVlNKw7Jvg3YxDw8W5Ay
-4cYafGnqkhWXuEmF+pwlrmRu3GoLoS8fs9G+7wnE0swFZN9+MgtMcddThz7LLDo/
-aRmZd17KaPJtXR25pMiyL4wi/ygNs/jYQaOi6N2Nv+1pdlAz/sWWDlqYZLWRg/4l
-2J3HDlIr18Zf8q5j/HufqHSYCUUT23Pm5ZfaQrCb6tPlIdtKUkqXaiY6K/i1FUew
-20r5RcfR+nV6aVI1En2BUcxkrJO6aI11KM5pU+zfjDXX3FpMAeWuC9I3cOOTs/Oh
-KHlWeV5zW4WVoc29LNKt0Snt6yJdtrQnq7QPyClKF33J2Nc5o6Fdfcm6/osbTANq
-3JQagCuLGspP2iCxoJXwmvs6/FbgzTMEfXSZyL01P3eQInIhmJHBgJweKRsDkpqV
-rIHpa/RbWvH99HKvxvBhRi+6JOAH5jzKC6jLS5ZYns7U1AzVUT2uJnYuxRnel1y9
-tY68pno/BZQIxYvvSi5MYLErWFLs5dT04bgMor5PpCkamTH6lpq/MIQiE3Ie02J0
-0c+6vMl8EStCAqvbcgJJz/OpF/Ahn3AumDa2kTTpjkAewo6ePFgjruoHgfv1nb+B
-YtEG75W2FOTCUEiKWSxG18ebnSUI2mTuSOWQEAPbMiXmiZnXD1eQtbNCO5f2iCRQ
-NmGBsFtFtDBiuQJcYP4n
-=PlTO
+iQIcBAEBCAAGBQJT5nhHAAoJEC7dUkA7aK9HmQcP/i3HlcxjWs80KLTSj5fJFdn1
+nOTT9dV6LFu5P+Pe6eGcx5SPBZNpUgNRMNmTa/rCvocEv7xVRRrz9Td02+mX7y7J
+1GH9yvsWoWHLwyA9JAsbF2jyX4RaSkEQ49Z4b3rPmQIA9iG1aMPqN9s/Eems+96g
+XxBdKUY7J8fYKFFgWas1aVo77QHXnd7ybTT1Zx6DblRv2lK/Bdm9h/8IoxBuGJ6w
+Y+nQIV7sdeobDZmOG6taDcow+QWVOPytg9HllONiLjBh4G/4qaanOqF15atP8nsP
+fKjHLSzvJ/tctVIE1KQ5UmnZwfRGIVAA8PhcePVx1QRFMlKsOb1IplqN/e6MaaS5
+DBynIt4RFagxstPei7qt8rx72eM4+lRkY6umDnr7BBfYk9JmwcYw4vV82JZMby+b
+xGkuUrx4HfiSKoSdtaKTb3GrxO95tm5bWj8IsO0zV6rbUxPeSH8OdoOmwSUB8Cjo
+5f6nVf+TPwLR6FqlWkGI4yGpLdmi7XscU0/9Kz6n10G6ys8FWHZrprjX8hAsudDf
+0jaHj5B7OdaJnLq4hIZTQ01y+8azSPRWFNK78uqBRlvaefqlPlUPPJSBsD20b7zd
+RBH0aRyrzMg9J7DgyXfzogJ/fjwkVe/8oaK46Tft7G1XCFuzWi+IU1rCATHh52Da
+KA+Ler13j3W7RVj6Of6n
+=SJAn
 -----END PGP SIGNATURE-----
diff --git a/sec-policy/selinux-gpsd/selinux-gpsd-2.20140311-r5.ebuild b/sec-policy/selinux-gpsd/selinux-gpsd-2.20140311-r5.ebuild
new file mode 100644
index 000000000000..e63cc060bd6d
--- /dev/null
+++ b/sec-policy/selinux-gpsd/selinux-gpsd-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-gpsd/selinux-gpsd-2.20140311-r5.ebuild,v 1.1 2014/08/09 19:34:30 swift Exp $
+EAPI="5"
+
+IUSE=""
+MODS="gpsd"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for gpsd"
+
+KEYWORDS="~amd64 ~x86"
diff --git a/sec-policy/selinux-hddtemp/ChangeLog b/sec-policy/selinux-hddtemp/ChangeLog
index e8a386192e70..f01de726c377 100644
--- a/sec-policy/selinux-hddtemp/ChangeLog
+++ b/sec-policy/selinux-hddtemp/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sec-policy/selinux-hddtemp
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-hddtemp/ChangeLog,v 1.42 2014/08/08 18:49:27 swift Exp $
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-hddtemp/ChangeLog,v 1.43 2014/08/09 19:34:25 swift Exp $
+
+*selinux-hddtemp-2.20140311-r5 (09 Aug 2014)
+
+  09 Aug 2014; Sven Vermeulen <swift@gentoo.org>
+  +selinux-hddtemp-2.20140311-r5.ebuild:
+  Bump towards r5 (fixes duplicate context for hiawatha)
 
   08 Aug 2014; Sven Vermeulen <swift@gentoo.org> selinux-hddtemp-9999.ebuild:
   Make 9999 ebuilds EAPI=5 and transform to make master for version bumps
diff --git a/sec-policy/selinux-hddtemp/Manifest b/sec-policy/selinux-hddtemp/Manifest
index 5dc574998c31..c9fbedd83cee 100644
--- a/sec-policy/selinux-hddtemp/Manifest
+++ b/sec-policy/selinux-hddtemp/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-hddtemp-2.20140311-r1.ebuild 391 SHA256 e7eff36929af39ee6bc5b92ec07966ee7c3657f091aa9e3faba7553a8c073edd SHA512 f67c8cb219b38dde362b0b27c00d6b1af5474385a2920bd7cc2865fd1e684f44167a9081e06de83c666c1a48b4b6b80e96b9a4726ab4f5aedf74af3431b588ac WHIRLPOOL 6fb8dab0b8b07b208825ca306550aea1397d89c45654e38c430d5e1261074e2e34eefc4d55c3b332e42a0c1f9232b1cb3049f8c91033c13a67951bd8063cb531
 EBUILD selinux-hddtemp-2.20140311-r2.ebuild 391 SHA256 928bb51bb6f2a14c041f76fb86646e2efde79c7a685f4cfc5ac027406e12a919 SHA512 1975da9327f656f17a219811b44555f06574f84862e62a48d4dbb4c38179814a1b463b51f41b570f46ac93a12da19a10033f39be025c9fdc592df8d70b81b176 WHIRLPOOL f20c667f3ae862d2d8c7858f650e69005b0e0faea4bc9b6872ab9d7d638a50f8c64e66aec33ec964311791392db73591a31423fad3cfb6ca7d37477c03503467
 EBUILD selinux-hddtemp-2.20140311-r3.ebuild 391 SHA256 6b9de52c71de1d43f86973cc011eb8d85d099fdb2c6698521a2f6964e7952f5d SHA512 55d3d4d81bc7234c9055ef7f36bfa4efa35194a9f2c485358a71b374048cfa6030ccb02c46d2ddcacba6d14dc44143f81c88682f05059aca3afb11abc4f6b0f1 WHIRLPOOL 2e1f74cf7095344519ec99f65824c05b828e3d5eaca288c7b0458030f84a95a147b166dff4aeaaf2c2dbd67e84a872ee2a47f947574877563b3bb366b785577f
 EBUILD selinux-hddtemp-2.20140311-r4.ebuild 393 SHA256 85512d3002ea3f849df5f1698a30f14c48e9b1593a2443211831f4a487c07e6a SHA512 3781075f059129055ec3c3ac48326e86cc369eb238000080ceccdc7fb9b36f1fa3bf81622dcdb290e91268387f5233dda79ec760412214acd2bc1265a63440f0 WHIRLPOOL 8b39c839100dfeff2f9acc4898fc59f0e1aacd610db0c5619e65e144f69f8c5ef3a08a34ea6dc2701a9f56af6d3c05ce7cfd784b2ba6974ff0c59acf78306847
+EBUILD selinux-hddtemp-2.20140311-r5.ebuild 369 SHA256 3491ad8a2d0fd95b7795a2ceed5646e5dbc1aa64cbdb98e46bdab01b5d0b688b SHA512 0ffc12f4d605a64166160965a1491bdaaef00b9d303696ad00f9310448126d853286fc91a73d872df0b0a7e10e2ddb2fe66dce73103f18994d7cbb80bde4f1c6 WHIRLPOOL 349c2896fa3bcc55436a8ef6bf5ade7ac5f2b244b84f5ab134596bb43429b2cdca2862196270bac4ce5a0adf363cb4c2abc782f2aac10239f9a72526767aa754
 EBUILD selinux-hddtemp-9999.ebuild 349 SHA256 5f45ff3d873a66da1ca5e53eed71fc9e45090d4c14bcc64f27164ea024a0b952 SHA512 f7003cce0dca687e24e096e87442d9280ef36f6aed0bd9da97571fc520fa9a3c2e683a16bf73fc00df4f341c84be77740311f335a0c1508378b41c56407fd44a WHIRLPOOL c3dc2cd7066c412d2b70fa275fd58840a163d5db52759f49a41f87209d80c0630484e001943f211c268bf1e4877b06b4cc3ffc7291522f5bc1410ac22b58c9dd
-MISC ChangeLog 6588 SHA256 9d144293d15e830a2cb19714db098e02f3d3e8799651657cbcff53a977c7b440 SHA512 7120306f7ce64f1d97017cd30cc96287f9e11e5e64b888bc27f618854c1535182cb3fdaa0f3cb8c1b57663c7833ff33e2352c4d6312e5820b9b0c92cddff56af WHIRLPOOL b0d9289ea07db0615b874b417f3dbf56d6276c33cb3e2624a533572f1110986209f666b46449182ebc25bb98917af01e84ee59748b8db5d8023da8d4d8567d78
+MISC ChangeLog 6782 SHA256 dc56feaf87fa73f561642745f021e42cab52b5d35294811bf356ed49d44a81be SHA512 a5c4274209fc3953b4a310df3b2d98d116e872de30b2ea90d655b09939e55c42c13a5e4835108779ee69ae428d55c5fd17e42311c312a921c426970ccd946b54 WHIRLPOOL faece6260d935431c35a399d3ffc746afd47a501e8629cc4bc622eef6305c3e5861fe6e953277da4fb2e4f222156ba82221caf4f39bd8a4fad10c0cc3e5fff4f
 MISC metadata.xml 231 SHA256 496252d5983e2ea2048bc7319e9ab232b069e601dfd45aa6e1958803c6621fc6 SHA512 26df2f1e6e3047ca31c9fa8aeca44b5f3fb4aa57d18196817e1d8de2f4da937e9c9361bb852aee6a4fb9b3f43ee516fd1b77f1274386bccbc52406ef136e0536 WHIRLPOOL 9095803a011c9813a52976a2cb0cd8188afc57cf8fe5709bfbedb5f315b3a414d621ef7423d643bd9ea7fdbf4bc1eaeca788b6d12b22b04c785da417a7f9879c
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0
 
-iQIcBAEBCAAGBQJT5Rx0AAoJEC7dUkA7aK9HZksQAI6Br9LigcpiNr4F7skKYREl
-fQJDRJIZTrIaVWoE2I/8DK8CrolIl+RZlFIw+mMA44/7MPyXz/0RfwwMn4FVGR+N
-FzZBsIwsDoCgLPCpXmGaAoHe0F+xa/c5sq4VlwdqTM88rWg2MKvkfjg2N0KKw9wO
-/bTsIUQR0mOH+fIMtxObGsu6UQv7+iQ8NOK3KN0eI93fSXfLd+iMZjoSKzvgdc/G
-zlzNYRyj7PCEyc35jIn6VxNr+4m07/bWEVclvmJvVkc5OddXJ5yqU2GwAFqjVTsv
-bHegJrGy8scY6LRte6MoQHrV5kmNFs9gPJMyFf+Rcdl80soJQR0I5iM97mkW174E
-hd4/znT35uM/AUWvexJ88waZLPgNiBnE0NkyvwDNzYX1P7/cL4QMartw6ghnjie+
-lGvFiPJdv8YtiGcEuR4knuuhCs7EI9odN9RcUrZSb6SxLWDkg2oh1emBinlSdTtQ
-sxnblvTZJ2yErJZDp5wAo3cUIU6nAMfAo+gbVwMKlK9OHhbQyDnwXxYytuNX5cBm
-M1Qc/wfyoK+yq2wnB5MnFax51u//IFb0wDRXVJeWzQsdJErGNmx+inmCCjBZNG1t
-+y1ULJGQKbQywvTx/aIBrlooaos28tPFJzKy4p6SkBA5svOEasilHRVOyYJjPYGR
-Gz/pkWgaBscYIgE1Vf9Q
-=ciDU
+iQIcBAEBCAAGBQJT5nhHAAoJEC7dUkA7aK9H+VcP/j8a2Zde9n1AiARdVq0CH+Bx
+FPxC551pJA+o45HAdVkho1YkZot6LHBOqLXgLEmernDniMxQNG5rLy/ke8dNlVpo
+41OxEpRvKjdxTPRNLrwbIlWmR9Kj8eXkdydnOLcC3ZPag7I1K7GBjNE92gwJtTCl
+b+VJ6+VH/v+jkJwmTTdwlCsTzsKPWxX49C/Ckp3rApeSwlXrQsq55b8bq1MaArlV
+9UeO2d59LtAzVKeHNX3gXFkn6n9leWhzGogNqVdhuILt/FaJ4F13EQ2nyAuBHaBw
+WdmyBlF510TGeYRyjYLXscOMbPC4CSR8Q2lgee6ouJ3b6WZ7gG11NFcPMOyDWOVA
+jnr647QGZ0ArlS5cFEJQMligvb/MBqaMtL5vo2xZpys9PF8Y2pFzOtUbSJPcOL1d
+frRPMa7fm8x/7q4VvQOo0a9zxpEiCkicV3bg+exciPJNaQYH39taAv7J318YcE4y
+hjejCS5k2qIGyr9N730QStWH4N6/oGd76qnXvRc8GzzySciUV4xObi0q4wVPJXw9
+rRKFQGn3GasKHAZoCdODw8W3VvqD+HSLXO4gw0SFKm4aCdTwCIjJqQ3RK2QgJC7V
+5x662BOo7YXoQM4LwgtfhYt3sxiThKbI0OEgwNM8faFfAeJXlsZgCypGbISL38cH
+bLBnN9wkC2lomdovYoS8
+=++sk
 -----END PGP SIGNATURE-----
diff --git a/sec-policy/selinux-hddtemp/selinux-hddtemp-2.20140311-r5.ebuild b/sec-policy/selinux-hddtemp/selinux-hddtemp-2.20140311-r5.ebuild
new file mode 100644
index 000000000000..a43aa51fd38f
--- /dev/null
+++ b/sec-policy/selinux-hddtemp/selinux-hddtemp-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-hddtemp/selinux-hddtemp-2.20140311-r5.ebuild,v 1.1 2014/08/09 19:34:25 swift Exp $
+EAPI="5"
+
+IUSE=""
+MODS="hddtemp"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for hddtemp"
+
+KEYWORDS="~amd64 ~x86"
diff --git a/sec-policy/selinux-howl/ChangeLog b/sec-policy/selinux-howl/ChangeLog
index 60a8cbece7d6..89495c9ee6c0 100644
--- a/sec-policy/selinux-howl/ChangeLog
+++ b/sec-policy/selinux-howl/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sec-policy/selinux-howl
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-howl/ChangeLog,v 1.40 2014/08/08 18:49:52 swift Exp $
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-howl/ChangeLog,v 1.41 2014/08/09 19:34:07 swift Exp $
+
+*selinux-howl-2.20140311-r5 (09 Aug 2014)
+
+  09 Aug 2014; Sven Vermeulen <swift@gentoo.org>
+  +selinux-howl-2.20140311-r5.ebuild:
+  Bump towards r5 (fixes duplicate context for hiawatha)
 
   08 Aug 2014; Sven Vermeulen <swift@gentoo.org> selinux-howl-9999.ebuild:
   Make 9999 ebuilds EAPI=5 and transform to make master for version bumps
diff --git a/sec-policy/selinux-howl/Manifest b/sec-policy/selinux-howl/Manifest
index 67b82f580c77..5ab07149178c 100644
--- a/sec-policy/selinux-howl/Manifest
+++ b/sec-policy/selinux-howl/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-howl-2.20140311-r1.ebuild 379 SHA256 0a7c0b1c8642ce171548e789b60c23e0377a526b162933d932ac45ef95801364 SHA512 f06763bee24c6739b26365035c54eecb98a0bb60f0faf360d7d39856f8c95a9bcde632742e97cf1202de058b13776ce97f7b8d598a7bd83df3997d335d7f3a4f WHIRLPOOL b709f0786fee321d664d3c0d74b80d767ad822245102ada9e5ce8e7d20bab47ca5d96c2d38195e4a99dab5194c40b70ed84afcd8da5e7edfb1c2ee564206997d
 EBUILD selinux-howl-2.20140311-r2.ebuild 379 SHA256 86e4f39c510cd7adf116b6d6b3ef0bc3aa374eaa1e1d560a555ae99156e8e457 SHA512 f49aa3a540077a7448cdc46f7c2c1e9d9203efbc9f82ba16f1fa28c9b816a97ce26943749a385805e7bf95da7c37e011e53d934a21ed623205e4a7fcb83f5030 WHIRLPOOL 27989ecc0d56a7c5ac32f2634642bf44914381a1af3173c40c8e4faeb86356e7efcf2a8a921638739c7f4b09bd5a98f3e187a015112fd37dda234ceaa4bcbe4b
 EBUILD selinux-howl-2.20140311-r3.ebuild 379 SHA256 95a197da809c5bf3a44bc57e2dcd40c177e1ca7afe26864947e098d58f2e5b01 SHA512 27d391cfa42aff2058e18977f96e5587d845ba98dfb48471adab47c0abd061f6ed81c870b09723427c309ac836d6a7a4a7d7898fb2328e939b2925dc170ca219 WHIRLPOOL 48b2b0f2cae91e820a37bcdad43cc15c41767d4ca0494b9cedbf88248f4098437cf0ae556c446221a9cab9c5490af1f94c9363209ee54fc89666910a97e0d28a
 EBUILD selinux-howl-2.20140311-r4.ebuild 381 SHA256 604b6f6c42e666352d2676f1362091d31bb9251e906b90ddbe07d9444446adcb SHA512 1438641286c4aa12e66784a3437bc98723e416af7bd823bf190f39471e3af0b0d23871cdf65d163c8fc3b0c89ea42a77d682038aeb4f02fc536b8b2141253625 WHIRLPOOL 662b9cf2440b2480690b940327587652ae28645b47fba72fdc7f1e01c0ddc1239921f552c9c9175bbeb5e82505df46a1b25d08400eaa171f3cdf271b674935bd
+EBUILD selinux-howl-2.20140311-r5.ebuild 357 SHA256 2fc13331160e9c49250ee071fa1a0cd86ab85857c9b67f1e9fcd350fbfc1c91b SHA512 b27624fc47bc1dc664e7d9d826f5bac89b5911f5566f1fa5042a87c339540ebf8837d4e889b63fc2220ed2d4c2d6ba9e8710d16212ab93ecb07dce84b01e20d2 WHIRLPOOL 91c635817c3110acdfee97e906f4ac7b2d0fb669fdfb60611b34283102e9e2d1672b989a013e3d909070ac6dcafbf6c31e24b41d50c77d6a5c59175a1953d0ef
 EBUILD selinux-howl-9999.ebuild 337 SHA256 6bad79fad8b674fa910be17331c74a418693a5e6e5a557d6f9ac050a3989282d SHA512 ff0b40410470364f7d52270dbf6aa32ce6cdab6d99ecd3a98a9d9f2512323b1ee26b93bfb2f0d91f1ccafdeb9be52b9f11f9af629b604a61495f3a00a82a3f1a WHIRLPOOL 9d9e2d25241eeba7a31d6786c8e0e99c3953d05735f75518e462e71cec16f5b23b0864bf1aad6e59028e1fb1d017eb68b61b0a2e9a97db5cde98d25a6c8c7d90
-MISC ChangeLog 6096 SHA256 c06da290eaf357144db3370f7fd0689d36f18d3f721f875c71e941f18d8c1a52 SHA512 31ce065a5bd8159db3dd1ce939f3fd72d41165c2c524c5a27be16a4d8acebe48e8d8dd02c46ddabeb698ab66f5d942c433da319dcc958f16e3ae5787f7ec1e91 WHIRLPOOL 7ebe481cf62fd7e8197fe4c191596c85b4343f6dfaa68fa0780c0fbaeec0a8f03b8bd02b2bc472bf73ba70f6c83959f18215e45662894affa513031377bb1d45
+MISC ChangeLog 6284 SHA256 27d9461a56e1f6e2fe2255ae84a2995b43a92fd7819f9eca559f709db3e6b652 SHA512 1ad0b3850e28bee1a9471645a62876d792ffe967f737bc01e74e5191fb3bc5671889a4f85d43ec2f3ffd170c360393d438c719f0ddae24ecd480e9659d705438 WHIRLPOOL a50519327d9e6c13dfa6cb7d1f335ef57046e018db1cc5383cc9dbf2a464b46eeeea7f9890b5677968a255bf3832a7ffca511faa8ab0684121ae7dd8d972feab
 MISC metadata.xml 228 SHA256 83294cc8b9b87c3875a455f1f45b3e042eda8507bc4581dee09f723f1a4e1c07 SHA512 8c6123013c582660c781280e2aea1f4ecdb46c4d13c19239de6204ce7d2323938b2e7b6078995e0f44d6750d1823d107521e2cac1f5eae840ec6a00e43cadbfd WHIRLPOOL f8d5ecebd4e43af67f861563be1a3de04e0426a7ec70f63513ca22ad8bf21f823779600584fd1eb0446155db33e6d2248f6d3746064a99c8e2644cced60503aa
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0
 
-iQIcBAEBCAAGBQJT5Rx0AAoJEC7dUkA7aK9HBfIP/judgUybjPSN1QkV2Xf7IUOn
-nYW7lM+kPuqpqIOx02Sg4TTf7dv4K7uSz5sB+oHkjG6JimCoROPL2hbSo25Rm6aL
-ffIU9712tpd1oIdnJGXmGuoRQjj0wV0e6F7tF7sXcCrf+pqlMtf1oZYpRWV1DvcO
-o63ZLnEAeGXQd1TN61+FAceqG1wO9al73O6p+Mqe7yy1Hj1OeEtKNPJsy0kOnw23
-emxcqUlJSqjnyLVY6Qw/fokPLXUAk7J2gKq4KmAhvLAoTGAuBx5sL6MQ2ntM7Xbp
-+bLEDohmfd539a1/X/Rn8opxEa+aKKBeyfiRlsBQadFuH153hlqrbIXr+rXEHXcf
-NVr3EN+a3pDYzsCFUL2qRHibDu0F4E9u20BHUNc64qjNH6oC8/Ic9YrLYeZIy67Y
-I+LSorPhiEoo82axRCXunlsm7OE0PSBYohfNcDEn5McXJzQOrJG3LTuovizWnBEE
-KBBEmZxz2W1jIey49PvTH1GjqsBO3ImCwOeOClLlQ/LO2W5fv/fWN4uxQtD5NLrf
-ZLmLzxbXSuNW3NB77Wm0ELsIu0PPIKfH2mTW2AxbnN4VMRbk9blm4vnRlYz+Fhoy
-CHcqTvR525odAUa7d6tE5LV7Zug9gAuW5bEGI44cLQtexDtQmR70Fxn318oHP3tK
-2vnhXMsKQHpL/YX7d0WG
-=0tGj
+iQIcBAEBCAAGBQJT5nhIAAoJEC7dUkA7aK9HwP0P/RsWaB/0AAQ9hG4czXOS2rSt
+ziDnX8EHlpQszARXGw1279a9OVGbLTn4CWMAMjuMNFKRAeHzDN7MbqC52b57MLGf
+lOwOlAxbm2+4jOZLLH6kRMdLwIp+nPo2+7TgqX/fxOrWGxZcSGQJAR4fWfcyc7OU
+T234vjkynoHdo54nRjQpGnasg6P2zMUWKHqSNYpNXuCwDW3fH8eUFp8U8iRLLfmH
+jLZUgoS/EQQC+nH17yXUaEYBCsde1LMs5yTm3O8Jy4QjVaURpLIveEJ9U6QEPl7I
+LCo+qS6iCsTxOgJkP49ikJAZdMvbihkG35poYkGrdgnPoLijQAenMk/3+1zN6xlZ
+aCM2ewRBJkn1ORBsbiR/5j0OO0W/ywiqFIgxeMcAUY2m3EeqbRcgnUFx2q3Tf9Ll
+0RVGkZHNwja2RUwf2xdervbWAGdpBSBcpCDJ9XQ4REJ7tIYK/ADP82I2661CIdf9
+mgX7E4VW4mfG3e1eVGufvhQlGEfTSDuk9wl+g5vxe/3Xuv9cWkRMr8rWWdF8lV/L
+24XcCZ7qutcICntH9/ijU7tPw7SgmO564RULaVp9j8DNGpjr5eVa9U/KwbnrCc8d
+/uGzTV9tcbj5Ml6jFN9HvKTjaUwT+bg2wHEP55rfizyuLDVJAqBNm6rFatWCkntt
+KzzXCWMiRxU30R+ItRpT
+=SlJQ
 -----END PGP SIGNATURE-----
diff --git a/sec-policy/selinux-howl/selinux-howl-2.20140311-r5.ebuild b/sec-policy/selinux-howl/selinux-howl-2.20140311-r5.ebuild
new file mode 100644
index 000000000000..77b5e19c1dd8
--- /dev/null
+++ b/sec-policy/selinux-howl/selinux-howl-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-howl/selinux-howl-2.20140311-r5.ebuild,v 1.1 2014/08/09 19:34:07 swift Exp $
+EAPI="5"
+
+IUSE=""
+MODS="howl"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for howl"
+
+KEYWORDS="~amd64 ~x86"
diff --git a/sec-policy/selinux-icecast/ChangeLog b/sec-policy/selinux-icecast/ChangeLog
index 61af01ac8be7..f0824d0ec8e5 100644
--- a/sec-policy/selinux-icecast/ChangeLog
+++ b/sec-policy/selinux-icecast/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sec-policy/selinux-icecast
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-icecast/ChangeLog,v 1.42 2014/08/08 18:50:04 swift Exp $
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-icecast/ChangeLog,v 1.43 2014/08/09 19:34:32 swift Exp $
+
+*selinux-icecast-2.20140311-r5 (09 Aug 2014)
+
+  09 Aug 2014; Sven Vermeulen <swift@gentoo.org>
+  +selinux-icecast-2.20140311-r5.ebuild:
+  Bump towards r5 (fixes duplicate context for hiawatha)
 
   08 Aug 2014; Sven Vermeulen <swift@gentoo.org> selinux-icecast-9999.ebuild:
   Make 9999 ebuilds EAPI=5 and transform to make master for version bumps
diff --git a/sec-policy/selinux-icecast/Manifest b/sec-policy/selinux-icecast/Manifest
index 691a8715d294..eccfbf4e56f3 100644
--- a/sec-policy/selinux-icecast/Manifest
+++ b/sec-policy/selinux-icecast/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-icecast-2.20140311-r1.ebuild 391 SHA256 dfb296028d52146648e7d8c297c2c45824ecc62e4ddbf634039d0a7d2380e276 SHA512 96da92424b17ca512e3595222d257526c942630cb0bdefe5c4455436c0bcd61bbdc314f1bd88c9339384ab4ca123f8b6865180f2db240458e9ecb299ec4e6f13 WHIRLPOOL 1229a1102e4fa1a6c9d81cead8d2709d418021204c6d17e28fe52dc1b03aa7aafa95728644521228899f96b59c1ad050338eb12043be3dd04daa8afd3db941fd
 EBUILD selinux-icecast-2.20140311-r2.ebuild 391 SHA256 b69bfdd5360f9ce4150a7c334658c1e9dc360314725ff18c10e4560a67699384 SHA512 2c481f56f7e035fbc16dfbd32072cbd1c2bd0a6d3445fa990f8dcb0be8c07441067b90d368e8a15babef1b93ed9e263296413822d0ae1136e261a5e166e1e58b WHIRLPOOL dd13502071a4857ab9793b3c037fd3508d7370c9beab3a5cea08966bc0c71b1b52033394564bcb01ff3dff0f1d069e884bd193f3578a8b9fea018bbf03d845dc
 EBUILD selinux-icecast-2.20140311-r3.ebuild 391 SHA256 7bf14f92210e698d2b9b486b4896e7a9cfe5089a5eaf525e980343bc5a2011fd SHA512 06f258cdeb784b444d39638775ecf274c976fc1ab32233e6390017c13103957291691f2cb864bb19c0a2435d51e9d94399a9bc05c57796d6ba05134a8dff21da WHIRLPOOL 629a43db5a2cccb6d05a8f840210049161c979188e28bf2c35b641d8b6920af1b7af7f9f0aca5bd7bba53ce95e5f5bfeab199697051808ebfcff30ca999490f5
 EBUILD selinux-icecast-2.20140311-r4.ebuild 393 SHA256 74facf815f07908063c7078395bd282c8441e8be9fde288fcef18965bedb97c5 SHA512 17e7deb79c47cb8b0096405a820c53bc16c516ee20f8aae3ea60fcf9a8741c79166e888436a5f48860ed885bef0c9a1044d3a08318497c11385a2022edda4c1d WHIRLPOOL 00c75141702a846256fbb3dd30057f62b898771d9f81610c1b979b4900c1ee2b0f90a716e8d1ee47640df4b063a56fc2a8d93ce600f6a94728ee598aa5072cb1
+EBUILD selinux-icecast-2.20140311-r5.ebuild 369 SHA256 5223d8aea09eb8d0f0dab619069a008d6e8e4b8e83cfa8f052873e8559e6427e SHA512 58c60289b30c8332d4195b628826f1365c6cd70a2d9101706fa7506eab66969369c81a4b312094d2143b757e74d67c496934ec3274b48aee7ba4168eeb755302 WHIRLPOOL c096892c04ca2f6af688129beffb66da239c7264bff36cba456da2884167d0fc82248ea75cfa945af29014aecde1130f4bd0886f428a758fe910b98d22986d29
 EBUILD selinux-icecast-9999.ebuild 349 SHA256 db19fac697d22c15ba34e7a251ba8532d9cfb31ea72fd48924f45c4d33649083 SHA512 1d426fde280d4b303ef0107e73a2a40ef5789a608456c71f1124632a4582d46e5d4ba7d8e045386f60451cfc0bf06d7b4cdcfe1f706c2a5818a31cd8eb6fdfb3 WHIRLPOOL 5e3931d16c43cd51cb214fef3e2684fc18d60e77859808917ac5c53a27810cda62c650455e15fcac91b872f2ed96fe346c3cbdb318da1c29cc69731289c70d44
-MISC ChangeLog 6588 SHA256 69006435bb756e4e92487fc4e22f568749badfbd9c2961298f62a9ebb3203c91 SHA512 2dd5044a9c9f1d0eb5dbdd33a23a5490dd9e12bf9d57caff8243c0c89f07afddd08ae8d2d8e5f04d6dcb0d7bfe0479420450adf9d17127c53383193d7191dcdb WHIRLPOOL 2423930e29186d7abea9a62fdfd023a7fb5fe364a2046a72ccf980b1b8606990745953bbccc605855b9ab1d42313fd8a201fcc8acfc6c608fdf18046e9a2be7d
+MISC ChangeLog 6782 SHA256 7eaa5671fb8a0a24a3bd06455cc4cf00f0b46bec2de8660a85c9e26360f6b72a SHA512 abe1383bee9132f507ccc538f6eb3faced59c2aed9f3f86564d1cfa31890b1fe2b148e58aec5f7fa357f26f15e74c05b3af82878214e4f5ab705819021cc5601 WHIRLPOOL 7f52b7c4bc041646a2bc64d85fb8cf96128e0a04cb5801968b293d648a7b9d6e967392443e4e871900379097fe7169c72112c12740e4ff01443f82d39615cd9c
 MISC metadata.xml 231 SHA256 3868611968edab62e2ced9fa71f224450428dcdbb0afeefd4c51dfcd15bd64d5 SHA512 5c3af95584ad28b9a59fde7397f86324cd7ef3c995f1c10e794cfbe90839e83393795d0a20846fc080157f9132b3cb1bf3fd862d3b668e20d0d8acdca3cbf308 WHIRLPOOL 74dcb76f47f624bca73e635f9babd9c44823c234bdedf985e73bdd1c1fd956939fe4b8dbf368ab581935d2f9196caf474888835f8e8afae134f3a57f04b36cf0
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0
 
-iQIcBAEBCAAGBQJT5Rx0AAoJEC7dUkA7aK9H0ckP/3hbw0EY9fzKBkApuzB30q4F
-4hX2pObVWUV8aRPPdeqeC3OqWmmyPlgmt7E07JAW0B793OyLpUgJ7ZmEEVqaedjG
-a9eY2tJxUrr420tedk42Pjsze9mLCx7d6IRLdOjkIh032G3GtBeRKgptRoeZJ1Wx
-fjnUgT1o+44WStJj7NHJACRQhKY5m3YuJ/DPSmvrH3jRdqmSbI5ACKlELy9UvZYN
-YcdPO2GlO5jnOgduZjgZVOtFv4GFIy5bEMHfNCGYobFVWRY6tNeFLlLXWy19oED2
-gWrjqvpBfsfiCYstw0qRaxeWcrPMf4M+VDujKyZkEg6sQMF1dIZqw5lKN9OB34an
-QfpTmnuVOiInps3RXqD+M9xJbktBxvfN3jZa26TUhabCid2/qzG+MuUxD1JX6z7G
-143HCu7xa6xnHz1ByYrCN85yq4jul/VGbbbHO+t/JAvWeHh7G9QzC/nmFclAMIP0
-s4Z1B0eNwr7kBvtM/oV+5Sh2Qn0pyBO2tB9vhutgxXI5NT1niHuBjEvFZLAMYhKc
-HzgWKe9VtlEcr6RUE8BxWFLkr7P+QeDY8P79yMfzcjia+gjwuIBR7eLarrZzZzMa
-zCsu34bTzQ089QI3RHnwXkJShDtw+cF9gW3VgkhqBHMLW1q81fxC+DYyf7oagN0p
-q6s5NNmR6qD7rbzKCxub
-=201a
+iQIcBAEBCAAGBQJT5nhIAAoJEC7dUkA7aK9H0QAP/2ewLWLEpvuSgnNkYqAqffHW
+bAz0kIFVbCkhxi+4jXP/yF1NEPrn6CYhqEDryd9qWouVRgTM4OR6UghvbHXghTXL
+lKemfqOMlHDGgYwssIuXFo0upKpsNL0O4XQFrwgm0qtMHDoLU1vzz4E/7neYeXrK
+sjjzmTCTBkF/adSMivmyQhwXsMggqgLNsXnzDdrFmFa8vykPeBvP9lVWOXhzqZRg
+hQe4AH2HXnm4gRBbANTg97NHUyLKd59QsxcokJa0xYQAmeunU5YBipbElLk65wkI
+x1C5NASi2OlyHGic5Y7I9mNyPRRgK7Ws/CNOIh/3flyB9MGKIuyezmK1JvzQqyT2
+xLl+PzBHPVWILMMTk5XURTJDQsBfUeQk0Aw95+oQ+dAwcN3GntO2Wb+sbZ9V0ox1
+mBm0MCOMYlXoPiBCFbH7tmSUuQcXrYlIvPDe+9reW+uc79hI6XWqiDT6BKBeCOVy
+vzDBbMJd5Lm7V3rpohEcbwrXtN/lo16qVDB2DhcogRLCoAPCnaJRv9DWyjHE/q6W
+jceQ+CTRIGC9bSuSo4rifujf5FnLrJjHyHW1JIPc+7zrzQXSYRHd3s/fmnOisn1R
+pXyKi5qeEhKmhLhy0zKtw8tiQc2vCHKfPGH1h0iHLyWt6PyB/YFpn/Q35zogk5ib
+EyVF8WkkghcjvPQ1d/4u
+=coY1
 -----END PGP SIGNATURE-----
diff --git a/sec-policy/selinux-icecast/selinux-icecast-2.20140311-r5.ebuild b/sec-policy/selinux-icecast/selinux-icecast-2.20140311-r5.ebuild
new file mode 100644
index 000000000000..a6516e6a434a
--- /dev/null
+++ b/sec-policy/selinux-icecast/selinux-icecast-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-icecast/selinux-icecast-2.20140311-r5.ebuild,v 1.1 2014/08/09 19:34:32 swift Exp $
+EAPI="5"
+
+IUSE=""
+MODS="icecast"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for icecast"
+
+KEYWORDS="~amd64 ~x86"
diff --git a/sec-policy/selinux-ifplugd/ChangeLog b/sec-policy/selinux-ifplugd/ChangeLog
index e146c9fcae52..23b3ab5b56fe 100644
--- a/sec-policy/selinux-ifplugd/ChangeLog
+++ b/sec-policy/selinux-ifplugd/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sec-policy/selinux-ifplugd
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-ifplugd/ChangeLog,v 1.42 2014/08/08 18:49:33 swift Exp $
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-ifplugd/ChangeLog,v 1.43 2014/08/09 19:34:31 swift Exp $
+
+*selinux-ifplugd-2.20140311-r5 (09 Aug 2014)
+
+  09 Aug 2014; Sven Vermeulen <swift@gentoo.org>
+  +selinux-ifplugd-2.20140311-r5.ebuild:
+  Bump towards r5 (fixes duplicate context for hiawatha)
 
   08 Aug 2014; Sven Vermeulen <swift@gentoo.org> selinux-ifplugd-9999.ebuild:
   Make 9999 ebuilds EAPI=5 and transform to make master for version bumps
diff --git a/sec-policy/selinux-ifplugd/Manifest b/sec-policy/selinux-ifplugd/Manifest
index ea755662c21c..62b1b2f18b31 100644
--- a/sec-policy/selinux-ifplugd/Manifest
+++ b/sec-policy/selinux-ifplugd/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-ifplugd-2.20140311-r1.ebuild 391 SHA256 bfacd8d31411d8ee2c68ac0f98edd752afb40c54051141f51451dfcf6f636278 SHA512 4fcab1d8d67c0ebd0e65cb2383bff0a1ea58cc44c5e9527e5e05416f0a004e8ad5c69ba011348310ece2c28c58faeed9c3ee562c0fa9c56fea34e38111d9cd76 WHIRLPOOL ac1f144f71a37023290626a5cc1ba4631ba03c8bddab0b18938fdfff521f8562a7512252e7f261948a926cab3dc2d770bf39c7699d5d9650363bc26441db3733
 EBUILD selinux-ifplugd-2.20140311-r2.ebuild 391 SHA256 1f84940e0d8cd6b2a901d6cb134676cbe29f2acd9f897c2ccfdee0490f9dfd8a SHA512 729fc0747b30bd9b644475327f0537d93c68cf9ef2dab20e464dd4146d395236387218a16aed1e7e06eb9fff45f76888c3234947bf93c3a90f899021471466e4 WHIRLPOOL 33e8cca168ba3945a303a06fb21a595d3a19513408920dbaf4eaa240977d22da9854a3ce2398e28b0798007ec07406f09c8d1e2b24eabcb10ad077d4dbb4051d
 EBUILD selinux-ifplugd-2.20140311-r3.ebuild 391 SHA256 bd60a50a8e9dc311b8797a2bcebd5aa05b52ac133038fe90b4a2decb6dd788eb SHA512 2b48d86be0557076a96afa48414c184ae27b5ba269ff5655bc0be04708a395afa94ec91b379655f8c42ad0c59849493aa1109dba252c0dadc4ccf61f11719320 WHIRLPOOL 8364e0c2ea96aa7aa0d37794ef92d21de46f82bb16e26642445e2038188cf0974b9fb9133389fe7c11ffbb7a15ffb1a9ed49ed3e51c3508db4c10dcf12bfa68b
 EBUILD selinux-ifplugd-2.20140311-r4.ebuild 393 SHA256 7c66f7ff3d9f23060f19a430519ca562a11700af1d127caceefd7328466f5222 SHA512 28956ce0cc39969858311a315daeac144bc7d0871f04c8ea87aba45f6b0929e25a4cec353887517f06ec976282cc331dc3d593eb0715d05614630e0e546b5b7b WHIRLPOOL 0b9d8b42a81ef130728000d74aa3cf04bfcd1767f8eee34cfbfea664b5f96b98f827a9fe7cccdc96a244cd6fc9ce403da2a8af14aa49c06f746069e0f722cfbc
+EBUILD selinux-ifplugd-2.20140311-r5.ebuild 369 SHA256 30a3ce7411877f5f062768c8603b2cb700de0fa04d3bdf96841468208e59d86f SHA512 37ee3f68435e4603292d7212e2862736e3099b37282562962d9ceef92865bfb977f42db9c1814c13322c395f230bc50de98bce2da1274b3a4ab5c45afe67af06 WHIRLPOOL a7d7370939df0403d51273404b7ba890031cacf9ad2ea5c43118cfa5522b195d7fc9afdb6ff692d72b11c892661c538fd047c46dcda3dca49b19bdef54933511
 EBUILD selinux-ifplugd-9999.ebuild 349 SHA256 8f4b75ab33eb449f4514ec20f4d6a12828e5e2f286bf1cb78a3e1451aff6a116 SHA512 ffc2b622bf1d6af24d45cbd69425f5df60303bf89b663374ef55938e7f50b393ba6940c3c6913a6bcfd94a27cea78c4eff8063bc2a68839d9526d1d20c670d67 WHIRLPOOL a0b52d7f51d887d09d75c0f270b4f94aaad475f356c795a4de1fb7a09827e4f7382cfb45a51ba8fd5081bedf2d42102b8a91446958314cf8add978426f9c356d
-MISC ChangeLog 6588 SHA256 314a6b6b63c9c12bf2c45e6128d1b6710ff1bbf3c97c245a0a0ca38b069d7990 SHA512 37446e4edc3484cb82cf84f0c44efa8b37bcaaf8aed36b99d6e5a13a9a1b50c200e4684f6f6104b8928e81f9e8e3c6ff93db8bcaa39eabeed52f54593050072d WHIRLPOOL 279ce1530b62a09a32c6407f058b82d8703b546dff3de8859e4c197317a132ac87448c42c34b87db9f55415e200b309dba0c690fda93066cef8a4d5a86792e74
+MISC ChangeLog 6782 SHA256 edc60f22703ab6058059e7d86663be1078837c12fbce747f84a0359613b64fcf SHA512 d919136a6836157aeb7e325e7f7471d9cd92f5f117b08ae85b5dd9502ed936a5fc81c3efce632d50a908da7d7764dc578a67fb814c3932b9a61a4fe1cc404da4 WHIRLPOOL 517fd98eddf946d5008e82e675704b0c34e22bb3551e999ad60eb94495ab8e6fee4b6a078d964146fadba6493852597989ff5bafee22c3c277caeed11724d8e0
 MISC metadata.xml 231 SHA256 603a61142e95bc65b73748221e1d880bad47c8d7c59a0a2ac0b9d4b6ffb64ab2 SHA512 3ed889535a0dfb190d109a54cc26e844555e6b8ee8ff7693accb27293bde6dbc7c32eac8d928d5e68d12a1e9aea73342052318435bf239c02334c9c7c8462360 WHIRLPOOL aa33282ae65ead79fca5a664f50d876ff2d0f4672107128c46bbd8bf3fdbabfe55cec17b2c801d6fa14cca696b148dcca6b2be249873b0024be6c0ec590ada88
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0
 
-iQIcBAEBCAAGBQJT5Rx1AAoJEC7dUkA7aK9Ho5EQAJ6ayld/h+Esev7GXFt4QvKW
-CNZhcCkT2tdwiaSlWi2j8l5JsgGz3hvUvLWkGkvDK+fNTMqbQix2bePvjTQMQ1CO
-BksSjlQVc81VoaRZ5CG+WIdkUQYK9/hwY71kZwgqQIcjOPQA0kMi2nSwH8UEWFQe
-un+cI8W4LZgTF2+gXB1HLwrEh8XLTMMk7KZM/I7ToDkOY+N2S6JO2pIpi4mPySUw
-f98dB2OexfGuVrFjrLbPSzELSvM//oDAF4XrPofJsJZJXGzQkqfIjBGmizJ/j+9k
-4lQdMEu2cDajfF3LUARC+soaRi4irSVBinuAuWxMfYZmG+fwYHNGYj8rMP8QL99G
-JB6iQRM2Zi9Z17E6H24rQRUUwH9IcknxNxmRTzgyqjWmThTAdh0bwtIAHBTt4cii
-nsFJtmqSPLM0NyoKyS3MTFBxruZPKBG8CbsUoSWSFOYgmT6kX/LtKoeot9k1v3eW
-X8pU0PMEbtnbTnXXCKj7yOYi772xMXQ/Q9B4aDgsCbY8tAF04FR8x2ZztwYl7pmt
-qavBpiOWtVIGDlwiBnaFbIlG2uerojrJwQ9e/15VQYTXTlBwpQw1gURTEfib6GB9
-KH/gn6KN7kRCgH379/0TLme+BtxJRJdOpyFmWbTMEDWjTOeE77YbYw3X7mZ4VVSl
-jVIKykOJ8+SnGfUSI5a5
-=8+6U
+iQIcBAEBCAAGBQJT5nhIAAoJEC7dUkA7aK9HoNYQAJiA/oO201FhoXR6U2BBCYKv
+0IpdfdxCsSgglXYBOrCM+fXyHRnm/CLI0ZYsMqqO9vHGjLTpSiqZWmPbZJEOcdmY
+ehi4+PKj+tOHx71FoHbZ2pMz25G/PfHM/S6UwLgvQck6R8HMU2fE/xswb1W9HLLT
+E7F1gnNKnszJ4HJYGk1Qcdrr4vmQiCNvHRbKX9i2BtvPRNYrl57d0yaK32WYVB4H
+UPKqKC8TMWZXeAjqvfOxjjorUQASdLPume9jLV+Mlw7rZKs8M3AlUfzl5OVR9DJd
+P71HNVJvU+8cA5hki1wrrGxTDSBBVIbNQ9VXMg9wnB++NDaRjkh7wka0A5MLy7y2
+VQjBaQZbAY9swqoZamMwaPqQZZvEeT9Yhp+CKRMVNHy5M7yyxVIXWToCXj3FkufY
+wyKe5ND3Dki4MSwAvOK7RtCTbK4SdXOp4K7YgxkvkdSqJloi1Fg3sJjGMOw/EYZT
+c+3ldbngHVuVKrm1HlA/ZqZlAyk/vxEoW+6zm4zr3pAsNqUK9RFPVxcWOluuVQzh
+JfhOzZXKDUZWSSRwvK1XuC6sDt3EPEED7q6cHNUHV8oyDrK+4woBdUTxhJrreQCp
+5kcIxtNvRfTiPx+S+koCVJzTHCNuJrLCtaEjfA9vH8UlkDg15TflqKlflKyJnTbz
+mdcg7TRdJjizAKPvYj9q
+=1zfr
 -----END PGP SIGNATURE-----
diff --git a/sec-policy/selinux-ifplugd/selinux-ifplugd-2.20140311-r5.ebuild b/sec-policy/selinux-ifplugd/selinux-ifplugd-2.20140311-r5.ebuild
new file mode 100644
index 000000000000..b3c0b5ad08fd
--- /dev/null
+++ b/sec-policy/selinux-ifplugd/selinux-ifplugd-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-ifplugd/selinux-ifplugd-2.20140311-r5.ebuild,v 1.1 2014/08/09 19:34:31 swift Exp $
+EAPI="5"
+
+IUSE=""
+MODS="ifplugd"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for ifplugd"
+
+KEYWORDS="~amd64 ~x86"
diff --git a/sec-policy/selinux-imaze/ChangeLog b/sec-policy/selinux-imaze/ChangeLog
index bd771585e824..a5c0fd8b8314 100644
--- a/sec-policy/selinux-imaze/ChangeLog
+++ b/sec-policy/selinux-imaze/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sec-policy/selinux-imaze
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-imaze/ChangeLog,v 1.42 2014/08/08 18:49:57 swift Exp $
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-imaze/ChangeLog,v 1.43 2014/08/09 19:34:12 swift Exp $
+
+*selinux-imaze-2.20140311-r5 (09 Aug 2014)
+
+  09 Aug 2014; Sven Vermeulen <swift@gentoo.org>
+  +selinux-imaze-2.20140311-r5.ebuild:
+  Bump towards r5 (fixes duplicate context for hiawatha)
 
   08 Aug 2014; Sven Vermeulen <swift@gentoo.org> selinux-imaze-9999.ebuild:
   Make 9999 ebuilds EAPI=5 and transform to make master for version bumps
diff --git a/sec-policy/selinux-imaze/Manifest b/sec-policy/selinux-imaze/Manifest
index 70ab615657d5..16dc12772222 100644
--- a/sec-policy/selinux-imaze/Manifest
+++ b/sec-policy/selinux-imaze/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-imaze-2.20140311-r1.ebuild 383 SHA256 a352aa4e7fa43666fbdefc57b7976b8afbb0e7dcaa4c91fa4999cbffe6713940 SHA512 3fb3a0e6045ca4e9ab99f9207d40776e749888ddc58d63e20cc5e82c84e8405975a6cdcde88801da8a288710ce680ed8b5adf068cd1a490befea7d63e51b206a WHIRLPOOL 7147578ce9987e86e7810535835acd70e23df7c0389f52f48e6ad2324d86aa3428b9c0f3e77d6cccdd506129e05047e3031ba3c43c8323ced66f289e1d98fe95
 EBUILD selinux-imaze-2.20140311-r2.ebuild 383 SHA256 9e6078c3dd9e94797c6a0af5bddd7f3f85a20fc0bb6db1b6a36df5829cb51361 SHA512 874fa320919c1071d2081bbe70932c102b9598ad1e725e3dee30a2fb9b0016029d50aa880e0a9949e3f2e07f2ea843f91ba7f4e9561632bf7c4c36e70628bc1d WHIRLPOOL ef9dbc9448fb32282a7a8d41846978d338d024e887bf2e7f46ca17d504068585196191ce43314a0b245ec3a3185255e0a56ae843b35f578eaee9a46f623f26a7
 EBUILD selinux-imaze-2.20140311-r3.ebuild 383 SHA256 ae98dbc055407d56eb70ac1fec394851c7f0ef2409a9d584ca50ccc0c6b6044c SHA512 ced2400cfb9565518773d8282bd7f919f8beb610fd53c5f843519b3ae67ffb63a812419e40496edb642df24f1e286e1468c5d9f8213ff13bca49f9aa1ddba6ae WHIRLPOOL 2463bdaa041064617858cbe40b0173b3073bf8d435fd714dbf3cfe33e89c3f59ae33716c74c253e334789c02f590fe7082fe80b8c5605185a5d31843c286d73d
 EBUILD selinux-imaze-2.20140311-r4.ebuild 385 SHA256 b49c24f38ba5cde54f87188c608cbdd7a666fcfb95ecafae35ee34d63c005919 SHA512 e6a410fbc292a4ac1f7792268e2a81af68cc202401f084fbe1cfd1daaf21fd7d27e83feaeda936de4d637a240ac9cb3bbe61b6f2d5ed5d1f04303cd1a6f8ba64 WHIRLPOOL c30d96a38dd5d1b9b4b5d7f4adc1a62e72322226b42eb34a3eb4967864f2c1fd6fbc406593e0f2f9a0cd99d9b5f8a0bc7f7c51b5e2d6a67d5627bbdf8b661592
+EBUILD selinux-imaze-2.20140311-r5.ebuild 361 SHA256 bbf9b665daa8e57e1f7d85e19fe10be5e9faf328f50d8abf2f61786111568f45 SHA512 f4414f276d729ef1937544713deffd29d23a212ccffa3fcb42339aa58d3157771921a53f857229ccc7a2d4cf11ff6450b3a3ffd75ac209b112a2af727156100f WHIRLPOOL 044b10528fac6c4b334ac7631ecc517d3bfb7ab69c52707fcd3e1b898a8871ab1cefbfafdc9d549cc9b74e39b541e548b38db583149498b0ab487d7f71e2fe49
 EBUILD selinux-imaze-9999.ebuild 341 SHA256 51e51a9e89d85a51295cad8339600dfc67bac173c3640b46ff5844663be8dfde SHA512 3d7f7c8cfa4fd573a0f9971c203000f159d31c03a4edc46fd70a37c86677b8b15b389b063b489df6dc6ef13d7df8f1a47c2cca68d7fb86ae3378b6f4446a4089 WHIRLPOOL 5eceb640365f980f6b2e1cf34c9b8a4cce3ad1808e5bf896937f6d391ebf84e358fb71820cfecf822cf5eda9ea161e44069bd9580cc963bee30c23190da8f4cf
-MISC ChangeLog 6436 SHA256 647f455737313fb7ce08df4ad80196d2a7e6527588bd9c46347cd46be12ace20 SHA512 79beb8f3725107afb0f48ee17c0345668f9c32beeb6cd33a36ef95a67331fc00307c0e5eb6e2a7e330d9e5af792f0ed3f3af7388a2d0bcc77f78b25233bcb49d WHIRLPOOL 951263e4175122ecfcd9fe0239be2ca3bce96a0b0d46bc2d5e9d05124665ec73c20b33383d80e4656b73f7c39001e0506aef547c1c9831f2fc781ff5835074b9
+MISC ChangeLog 6626 SHA256 3f9d92f691ade1a9008894a88dd8aa5adf107fb92ca170a5c9b8de436f17e324 SHA512 08a14ba2936677fefeda153f3bb1f73d09ce10a79a2fb6048bc2bd1c12102225141dec2c13a9d28355ba4c3ca9cec8fc98ccae05dcb0c3ebe4d8a67091b794cc WHIRLPOOL 58b08afba3f379374a189a73e7df2ed4a496f53c6e8944d33062ca6e335e9be5c1c2212321bf32e2b6c49f4ef8a12f042adb283810651134151ac4d4cdb1bd20
 MISC metadata.xml 229 SHA256 3847eca790888f025144e317354c22105310265656e24f3b2c9fdecce031fee4 SHA512 ff06fdbc9ba403678fabdb62f42dfa3896c1a80cb106a4540593b65f57b712b098d1414fb3b57058d8221675a195dbbbe92da6c05f41ef3322813963d2329a43 WHIRLPOOL 8c0728977d45c0c7b0d429522aa5063a53b7202d2faa9d58c5fbc49c6b12767d255b4bcbc8b8292dc57e0523af972c109bf81accb991c74b81ba5ef2282b9193
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0
 
-iQIcBAEBCAAGBQJT5Rx1AAoJEC7dUkA7aK9H+ugP/i+wT8/Z9ZEmYKu7IIxXQ1EW
-N5MwpHS9wC+afBHn7u19ZiCa/xd1Z4kewbqEsHL9igsOgqbhniYnxZtxotDggl13
-IyLdQKRUF8QwKgQQkTYGhcnVAuWn6CjKyRrDnnk4s+RcfuUs1dk9rBy3aHzVU2Vr
-sTzKBHsQEXnAtvaKvUO1F5wdiD6amibSOrnMNGnc/iWIFUd3INGL1YB+toEAYV98
-P1rBCzkvOdQcNjoRm3IxxJKt17zrRF1llwdDj1316ev6nF9w0I9RSseUvfjuaTDo
-gql+1ky6Gy2i8C5Fo8NDJ3Mzwv08KMgxoY2zZC6fXKyMl8k+OKjNXBTVXmQWCted
-I7pD8fStAS7OFhj6hsldo3ycsr1WbsqZB+HVCWYREJq0LBgcnJQoHgNOaMJrvOJw
-yAPudMyto9pzEb1wpIbMZaftANrRXIiH6oYU7dXZPOTPiUnCLBgJMzSxUJF7An27
-2yldP4ZVJY1Uwdj60RM07qOMPFUXc8PuQOp+HiA4mM28xAop4SIvgR27iLUxjxBe
-FghYLAHz2WWBfz/CSJp9ulxzIn7FZyp49CorkSrSgQINyfCLZE2Tn6Y1pBf8Icmx
-IPUivwOtj3Ty+HgzraMN/gREwA1ffdiH83evVTpYD7zuSkO1DC6HVSIo4Qdl9hUd
-PI7hfTNjwCRoYPPdicCZ
-=/bh+
+iQIcBAEBCAAGBQJT5nhJAAoJEC7dUkA7aK9HI2IQAIzS7h9ritdZ6zdLSTPMD/OU
+72dTnoMYA1BN2J/v+DHLib1G8ZgKa2TiQdfyuzMRv0Ao4927PxWIPvpa6yZ/Pqyp
+h2dg3Pm8LGJVi+rZsvmugCSkOfz2z2xgLBr1q+63zSic9Ne1h3azFVwm4+jmRpIT
+y2mWTPG52qG0JN76j2upOmUda3l7vHAinqy9BX6RUZu+uQdYjV5r/tO1YfzH9/wc
+pala/xpLt1jlbJ0o7+hythEXvgkvFvs/SUqh8s3fwx+JCveJtWvjTq9qOqpMdluL
+zF6uINZ0pXbEVUDYe1ofVSizxbEzLWDt4XJdKb75e1n6hqnYNVZvN5zhLIRpBW5T
+oO6X/FvqI39+U4VACllrf+EcjOKipBlrjxLMAaPqAqUotoC25/EydJLucKaARcut
+pOjD2nBPSSwAWWtE3ie1wRcbxfgcx8QnHfDzNOgqNYjILpKjUC6vCYg/1M8T0qiW
+Bp1q3mlAGdv8XA9h0H70y+D8RzIu9wRcynWQyCb1NV3qwYblRW74pAnaUPqlr8Ot
+6urzGed+BewNV523L5yEuArk6z+rWMnTkUHjAAFwWORH/perBk7BTBwtsxFAVmkH
+EGmAzJOqcQIWcL6SB53bhSFM1J4nCwi/h/R0Dz+Tt9SVKRB1jtazVXsndt5+ocwY
+r6smhQhOSuR3R0Yndcqa
+=UAGq
 -----END PGP SIGNATURE-----
diff --git a/sec-policy/selinux-imaze/selinux-imaze-2.20140311-r5.ebuild b/sec-policy/selinux-imaze/selinux-imaze-2.20140311-r5.ebuild
new file mode 100644
index 000000000000..abea9b947dab
--- /dev/null
+++ b/sec-policy/selinux-imaze/selinux-imaze-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-imaze/selinux-imaze-2.20140311-r5.ebuild,v 1.1 2014/08/09 19:34:12 swift Exp $
+EAPI="5"
+
+IUSE=""
+MODS="imaze"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for imaze"
+
+KEYWORDS="~amd64 ~x86"
diff --git a/sec-policy/selinux-inetd/ChangeLog b/sec-policy/selinux-inetd/ChangeLog
index 829fad1c3638..a93efa5de041 100644
--- a/sec-policy/selinux-inetd/ChangeLog
+++ b/sec-policy/selinux-inetd/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sec-policy/selinux-inetd
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-inetd/ChangeLog,v 1.56 2014/08/08 18:49:19 swift Exp $
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-inetd/ChangeLog,v 1.57 2014/08/09 19:34:37 swift Exp $
+
+*selinux-inetd-2.20140311-r5 (09 Aug 2014)
+
+  09 Aug 2014; Sven Vermeulen <swift@gentoo.org>
+  +selinux-inetd-2.20140311-r5.ebuild:
+  Bump towards r5 (fixes duplicate context for hiawatha)
 
   08 Aug 2014; Sven Vermeulen <swift@gentoo.org> selinux-inetd-9999.ebuild:
   Make 9999 ebuilds EAPI=5 and transform to make master for version bumps
diff --git a/sec-policy/selinux-inetd/Manifest b/sec-policy/selinux-inetd/Manifest
index 76259199d48a..cf3adcb43216 100644
--- a/sec-policy/selinux-inetd/Manifest
+++ b/sec-policy/selinux-inetd/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-inetd-2.20140311-r1.ebuild 383 SHA256 a8e3959931517d86e9804aba7fda94ebca4648dc0b2207d3905739b9e39bd455 SHA512 46e01f04475794e1af359a6a83808993e0b39d1137c0b5f2d46a95a6f2f0ff9b32bfb314b3f73f9e94aa7c4fb44e25ed4cb60dc72398d552415e414dd0e1e4eb WHIRLPOOL 8ad12ed0d5f3c9beb5cb3aed0853db0639e77f4fe35d2c538e8d650a635ea24a8506aff98fab9c273410f5d239b9cc9198ecbd009cb42db16bb77a55575c901a
 EBUILD selinux-inetd-2.20140311-r2.ebuild 383 SHA256 d0015eed3540706571dfac89353b76e5a2a4c3fec0e338d5907ec8157e683b1a SHA512 ccd02a3c50a9f0b1bdb8c4d9054532b2a18be9794da85f790ee6b343e5d2ecacb4e5085365c8846a7f7b1e11448ec44cecf728e7b51591684c94294e26eda59b WHIRLPOOL a1e458cf0fa66d73733bac3c469502067b1c658b971f696583c18591598902bbddd4f72833f9c295b02300aa638ba91b9ed4e27447f3ddc75678f554e0deaa87
 EBUILD selinux-inetd-2.20140311-r3.ebuild 383 SHA256 b27ef42f4d7d678f4afe0cb009341308dec4a474a36c225b44efbb44dc214b3c SHA512 00acc1c70bf1867b5015706b66fcb2ceaa867486558eb60360db0d63006aa0124db10e382e853a557f487f38bd42b6a2a6855b62633e0d0e9d796605940c9032 WHIRLPOOL 90dc341286a5d6b20d2bd4eaa7a28e1a1e090a8507de9a25bbc73e38ee18e5489a7ea914f5ac97983623fb65ec06a3b2504b2ab63a77f50d6b0ff90db33f85e8
 EBUILD selinux-inetd-2.20140311-r4.ebuild 385 SHA256 9ecf6f7e5b9850329df3e714d8cbcfe997e9f7d0a630f0f449ffe1c76e67dc93 SHA512 b631fb3db8d10260a254eb469b0378f29d073a5516a33d4b7df8cbb4dec925cc9c595df0217920c035bf6f49e617dbafce433e8b297892849c9d3149ea080eab WHIRLPOOL 30e6584b420e1ad4b5d988a16d315b786a990ed978204354fb8d5e18148c4dd27c4568a35a1a260194b7df82783ab7a82975818b86526f845178e158f661c91b
+EBUILD selinux-inetd-2.20140311-r5.ebuild 361 SHA256 796f93bc1598fb8c8b3d5b0837ab35e0aa26a10e98ee73c2b5c6942f117074c0 SHA512 012cef765b1045057727ee68fb3cf46fe3d4dd868cec4706ed5a7c0db540f7fe1899a21a4c9a3c163f5039319d6cd48e4b4f030bab36e945275fd8d655a7522f WHIRLPOOL efdbe86765643e07400797811342e88910ed8a4367ce387f60e51f59dfb1f5b4005210d06e5507fa292fc86b620ed2f5e2037995ade90a287fbecae1dcaff1e7
 EBUILD selinux-inetd-9999.ebuild 341 SHA256 b81276d250f166a5624033d97de43d41ba247a51afeff8bf5f3423481b30155a SHA512 744871ff265cea27e89aec9a415b305b5665c01647466c488610ba3aa338b00e8f366ed5dd36434c9804c36cd8dc7b0be4358528cc86aeca9dbc0b994626890f WHIRLPOOL 10c65ea8215a49ab0e97e959ab837919f244a7ef7b5eac0a74d21d002ed595360d2df3e10ea41c24a2a303495e45f46de24e6cdda540ebbfec85285a517dbee6
-MISC ChangeLog 8631 SHA256 c189f730dc69bfc77d4dc05f956774f0e3ce65167d118f1b5837f432c3908772 SHA512 15873e30c2567a5c8b28352775d23f9ccada625c242c53abcf0b72b99c584a4f0ae7710d39b0cc863f95fc12e593a2e3be8afb1fad014e6ccec385581746536b WHIRLPOOL 7a7897ee62ae7138646fb30fcb8b4ae4eba9e912a794cfb50723dbd19cc674459dc74c2e7a11bb4de2ba68729a101e811c48d3d4ce2b8fbd20e544842d69c151
+MISC ChangeLog 8821 SHA256 64ff46aa4d0e29765ea635a0a228eea3557921e3afba9f005cf004575ba302ea SHA512 50b479ecd58d9546835b5947e4044d8f732147b8787358c3f554710f6d2dfd1724167528ec35400958dd8d902d660e8e99fe29e26646a43d4859cf7984efd622 WHIRLPOOL 0a13d45355484648ad5fd7ac77eac1787942adc2e7b6e6af2a19dd6cb15e32a9e7d1365190427928a4c45b0cde843830db1b903d289777ce4730b318192692df
 MISC metadata.xml 229 SHA256 a09cd06fd0bd9a5c2c4b8e907cd55838dadae7d7a12c41731a4e362eeb83d33d SHA512 f9b0cdb2ae86e320c462aeafa77ddc733b3e97d3293dcb70b7ad74fa326a5c09fef8f6cd0f9d9c559b337dcaa1c7bf41a493933f0d5c81de04305ac21d9b8a12 WHIRLPOOL fb5c59ecc40a032e4d979f076fd0ef3d188489c2d4fc42680132c559c56594fc79378d10120879c845fcd2af5dc83da5147c5720cab78a8713d912c03a9660be
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0
 
-iQIcBAEBCAAGBQJT5Rx2AAoJEC7dUkA7aK9Hoy8P/3PtU+mGTAqDtr/gBm86ObJ0
-wo3IF41rtcNUhQM2V5jm0M09VZJubR1hJH5e0eJxrXDbDFyH/TN5xnQB3hIJp3kG
-q+dPnEcwUB+XB3NVnDHT+vKtxp1PD3fHP+ev3cYFiPVAW4U0fVbzq6PM17JhS9PV
-fdJHmwe3v7UAwM9lkyBn3lIUpht2Y3bgw9Zzzf0E98VPC+o0WFvYdeNfIG34zbYW
-EiXGGfIYCfYTos90or/DrR/K/5fPkTBsu3yT/BdjEuuh5yM9R+FXTiVTcvrY61Vb
-Ts4MGlcAWRf0aLPG3/21lPzniuV6FVfxrjFy7ux/0ahBkT07WauQ9i8Uz6fZERvJ
-d8y0BJ9SpZZZ6lO35JzwXs72XVS6yngUC8k9rzED8rdwKq1CLmIIpsv9Y6MZBlsE
-+9qRQUv7OfFFRnu6TZdQO7lJ/NthDlCErPiWEVIW/fqo+C5F431lD+aB59EeZs5Q
-ARN9FG9phgbJxk7/dC/YegU0orDC2zVXpbwcmgWA3DlQC8eFgof3NIkIPv3hsDgL
-lMMMed4h2gejnwLb6GQUrEXrBDesw4Tr4djExESVSDnPHNgdF+fUFvQaOQVMIXdg
-vLcAinwdtisi3/jiBtOhnDIyWxOpwNSBdFcJFMHLzbmykcInLV0an0Wf5spLGZgX
-zFbNoGnPEMU9AKaTq6W2
-=wTkQ
+iQIcBAEBCAAGBQJT5nhJAAoJEC7dUkA7aK9HtM0P/RoCxP+wjgMKoSnRZ3jEudnW
+SUW0wOSJd5UxJYAL799M5UOva1RYTCGSMsmZxtZt2KCNEwjuNeQs40sHFLp3N5aJ
+kBcg93qkn8fTgh9Z2cMTWzp+0EKjiA1VuexBQU953/zIsKnkbOWyHdMlQ9bZkN66
+OWkAjgQSEY1b7sSI1uUaRQpiA7tUK66UnEXIcEMZATKaaKliVPaBcyHaMKTGBklO
+ic0lbmdE5VG5V84DYzQVtqZP24b/n1VQvo2M2Y24V61WqG2MBeyPiFuNe8aLa8cw
+68G+g5q6Y/Ebrjt81bkoHvPWpcPkPQRkdXZyks8pImI6tiphfHMDqRfSGM+eW1eK
+CNrX2GbQQ/wcJHixQBCpG+LfBqZur9Tv9dYcpXNNStOFxk3ETJTumpaPWroQvKjc
+2n7+b30c/1/IromdzoMI2HYwamGsxiA82caZwataLw1/WGCZam0IM8VWaJQBMxct
+zLpYaUBQciA7bnvpGF1+/X1AUnD3KMiUC8O4KPiQOTV2sNEFpGtouLQM1NE6g6QL
+Dz16VjshsEFsnvDmsfVz2EGUJBj9NfEnTTE74lDz4AOEpWXU5Q0QuTnawIgV4aN4
+KdcrTLtO7sKENzrbRT2PiZ15NxWwZSaChqznCI/cEhbUziqJl/xYE9D+vWOEAmr8
+VPoHGr1TC7aFDpmrHgJy
+=DsCi
 -----END PGP SIGNATURE-----
diff --git a/sec-policy/selinux-inetd/selinux-inetd-2.20140311-r5.ebuild b/sec-policy/selinux-inetd/selinux-inetd-2.20140311-r5.ebuild
new file mode 100644
index 000000000000..e3c6242af844
--- /dev/null
+++ b/sec-policy/selinux-inetd/selinux-inetd-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-inetd/selinux-inetd-2.20140311-r5.ebuild,v 1.1 2014/08/09 19:34:37 swift Exp $
+EAPI="5"
+
+IUSE=""
+MODS="inetd"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for inetd"
+
+KEYWORDS="~amd64 ~x86"
diff --git a/sec-policy/selinux-inn/ChangeLog b/sec-policy/selinux-inn/ChangeLog
index 5e33721a6788..aeffeb72fe8c 100644
--- a/sec-policy/selinux-inn/ChangeLog
+++ b/sec-policy/selinux-inn/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sec-policy/selinux-inn
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-inn/ChangeLog,v 1.43 2014/08/08 18:49:21 swift Exp $
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-inn/ChangeLog,v 1.44 2014/08/09 19:34:28 swift Exp $
+
+*selinux-inn-2.20140311-r5 (09 Aug 2014)
+
+  09 Aug 2014; Sven Vermeulen <swift@gentoo.org>
+  +selinux-inn-2.20140311-r5.ebuild:
+  Bump towards r5 (fixes duplicate context for hiawatha)
 
   08 Aug 2014; Sven Vermeulen <swift@gentoo.org> selinux-inn-9999.ebuild:
   Make 9999 ebuilds EAPI=5 and transform to make master for version bumps
diff --git a/sec-policy/selinux-inn/Manifest b/sec-policy/selinux-inn/Manifest
index fb344e468515..8c0bea105fb5 100644
--- a/sec-policy/selinux-inn/Manifest
+++ b/sec-policy/selinux-inn/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-inn-2.20140311-r1.ebuild 375 SHA256 8aee874501c047eb9fb12fcc7e288a78c879b03184e0b64617c5d6819f52a700 SHA512 f072424819863a19a381823e725e9e61106218721d853d02f73fc615f471ab40e137eca56660ca38d472db4906c56ed9892bdae9f08274772b8bc1a076510a73 WHIRLPOOL 9d139b7d1309577057e8e5b85b504915e03e0557299622daf2cf8cb5ca0a656495075f0859e6ee6a1074095fd0c62ed95e726b5d708ba7945aaba0d138155177
 EBUILD selinux-inn-2.20140311-r2.ebuild 375 SHA256 683ad60c2e14b7a00e05dd468232f56a400a1de67b253e2b4769a3b584901a01 SHA512 c527bf1b6498225c0d7038bc944cad3fd3f86bb813738eea83aee4dd9fa334f50ecaeac705d68fc8ad54d881f69df3d501f434e2f03f13a895f578a0fa11143b WHIRLPOOL 3853dfcf6adede6a788ceaa8e9655728310a0755b6e24da0358d3dc4e4a6c7f32eaf9fc6dc880f679372fb83d9589392d4a4a6eff668504ae9185a3c7accd3e7
 EBUILD selinux-inn-2.20140311-r3.ebuild 375 SHA256 7d2f56211636a036c56af56fe114345af7d3be3ab10bc07a3d1da564508bac34 SHA512 4ad7238b755b5cefa6ae3ff5bd89074cfd3efa10fdb3940ad9a38f76380d039b418292a77feca4462bf660260d5f615c660a3a06bc3820d0c51047d0bd8542c1 WHIRLPOOL 9dc0c3d01406be196da34b99528d7d8993974ebc24c3a1f0fad6fc9f4aeadc3392c6a011f43e374840771cf7b61931db61c8a09bd47165ee362c04f4801d3689
 EBUILD selinux-inn-2.20140311-r4.ebuild 377 SHA256 0a68f3d4d41d4706f3c5c0fc9dc59d8803fa3c57bd6a815a07f3c4e8882164db SHA512 bab95a4190c25ae7b9ba8b8ddc929955ba0940dce5d54f74163dcc259d5e8fe18efbe03311f5350ab1ab70840b4a1d6cc858ddffaa0d2f9488180e0d3c83a4ad WHIRLPOOL 422a65863ad94e644ad40850686d7e1d666a3ba7f4d4e277186f5d0582967e29028d66f0e8bb3e44eec06c5098f23cbc6dcadec1809009000af0cec2d3977c93
+EBUILD selinux-inn-2.20140311-r5.ebuild 353 SHA256 b5d02da672c19fd766a747a6ce51d84a3d7c77717fa8a3fd1f2e53fc549d758e SHA512 72d4a0725ef524a1ce4070850714d8a6ce1cf764a6d9e263d124066738cfd6ae665d4398d8ec897b1cff65e1d7bcbcf6af594b89ce7116f03f423d34f09309eb WHIRLPOOL 00a8082ff3062a833d0455fb0cb6321b79f4a798ba6616d2ad656b263dc7ada7c39f23acddfcffdf8f32131f1edacefb83ba93ce2e1136755eeb8b05f04421f4
 EBUILD selinux-inn-9999.ebuild 333 SHA256 65eede2b99b2182814f638a063ed636cc7e105166712f4b9c7916bdb1d06914c SHA512 10a0340c172091004d8df16e96fa7f5dc4921a351ff25203f79eb2aafca394650199a819677393e86560db40e42ec5c00ca1e7a13e255b747d1b67a4a67ff5ee WHIRLPOOL 742fa1a73c07f958d995b72cc4807864fe3e9e18848122e6674c4a1c7e9fa7cd8c548df2aa8065ba9ebbeff4ee47dc8501a7a4d06304c9b43b66e89a99235f22
-MISC ChangeLog 6467 SHA256 72217f2a8d7eb29a6b23f721bc25a1361b55c5f7c06d38f6cda37bc76b5156ae SHA512 adbe2613626b1b5b3ea37bab922b7011828814836577eafc1d99f2ec86f2e6bbebf267bfaa1e8f75f8a0a0e88a27b3374309962cb1eacb3b35ce608e1eb09472 WHIRLPOOL 6717c09d0bd266ff534db2c0e1782a3048727b53f9144354eedc355d5995045347a07a0d2fff96efb33370e85856eb71800e03117cda2149a189412d7c78083b
+MISC ChangeLog 6653 SHA256 2281da52d1f253455fd1cecc9b3088ad0e3cff7f85ac3e2254d05f28068783cc SHA512 40d19c2dd3decb8e882304f45569c9ab06cea38da7807bd679dc0ded0bc53ffa0bf016eadb4c378295a2684ebb8d650f866b6231911e51a6e90e82358077ed3d WHIRLPOOL 0cd1fbd5eb13393d27ae772d51b4e46615e6bd979af4eb227c3775d98a89df4ef2f23f95cbbb78f2fa73be9a41ee8665919a9536086423f0bf3f34dd15091e3d
 MISC metadata.xml 227 SHA256 bcbfeaf159687b8f73f86a3ec30ab5acebae4ac90b6f985c0bb119239519f19d SHA512 d17c7b214a156b75aeb74edeecb3766d30ad5054980d3209fd482bac905d2031135e909c36fbe44a0f9fd2b369a94da70589397365e3d716aacba0a849302999 WHIRLPOOL b03deae9a0682219b704f7c2be9d3c54d8f8406f5cdd52bf4f1e19a2e059165819bf385ebac412be13e8ff3bb872578a9b692d2efeef2f76236e625ec93fb171
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0
 
-iQIcBAEBCAAGBQJT5Rx2AAoJEC7dUkA7aK9HAMQP/00CzDC5kREotDYfaPQKwsj4
-EZg0u1X2swkHVNla+TH0LAC5S9VdSvmnKazNb79PBghbDVP1RHM18s3P1m+uQBl4
-wfWjL+/FUWu8fkXvf8WcteIJXOaycIazlphkQsglvFcgJjsEVlnYyO3B1RWGH0a6
-qCUy+Mq/0hHtWcx3nUrafq94kggxiTCiTMCUwGPAk0lpXKQTUvB75ihNS0gts/sb
-/yJH2Ajj7375OuLdwvBbMzYv5E7Pdjih3cKfttJ47kLLT6pkCDicc/+LXxKkt4e5
-m7fsb5HVy4fJePWYFKQPAY97PeHhxaQUReyaPojn5zBLk4VO4wjmc0u5DZcFntME
-WtTPFxr8PNgntJ7KHQf2CKbPeK6nUjnwzqFa2ZTn98cCp/IzONglaZTNHQxnSHKj
-PzZMQNwsIYZh6JGe8EtdD0JID0NSE6KscmiTflMxv0TzlbCviblQH/Kajdx7FOO9
-GaYgBvR3hxgtH4V1RV3upNE6fzoVfhRMgiu3AIEdPYLPxN1JvuG6/XwReTyy+EYD
-Cj1evTGUfANavsPvuyHHDl/epdjxBqs8WQFF/m98311YH3UD9u0iEtu3XuZhiDdG
-7GlcjZmk4JEknwYJ8nO407Z1Xohb6tNKHJ81tVfvpjpGFT0+T51AJTaiAuW1kuA3
-USYVzjdvPisAMIuWJV2L
-=viLM
+iQIcBAEBCAAGBQJT5nhKAAoJEC7dUkA7aK9HM4IP/iA9Ze8KnVTLv1P4iriLeK/8
+EC4ngXO80Hdo/UBcB8jWL8WiLRq1HzKtBJj189qZMj8seLAQRSNsD/JYCg8gMG+a
+fTtmHsdgDVZ/mzDgrRQKREOdECXOEJ+fj8LQbu2xoNgxKeH4KbxXDzELIXp7wwct
+WxS5GW/K9C36klM+r8Ke1bJ7BQckj5fuGjKs0H3RSCZsWC5aO3DY5R8Llpebf1Cv
+nD8Jg18vUFkA9DSYj1+Bs1ht8WXmkz8vOXFTOXBVZtQqZf4pgyrOGsiNY/CJO++U
+2u5aX7PnEyxbrp3nOuP2PQDkWmKTehOuyB/q1lKC4I/JIELYkdvApannPODvImWR
+aZnqX9rEY7XFIUhDeA85OTMo0GJcMsB0fsvj5cJUDPkGZN0j9on6u6sbHz/o5ikT
+1zK4g0kyGXO0uOUi7uH5jhD/A0Fh1AlDKnc1D114cceV+MLfiay71lgmj7g7QCdR
+z+OrHCyiw1goDSIpbZH5AfxtS62Vbo2SlVp6ndaiGtxs/F1SN1xTTBh2FqAL3T62
+V3xM7Y7e213KJIUDf726QwljSI9Me3BsYpIrAAOFeTvRKPTvGwpCRa0HrKvFj4HB
+NbDl9nuwe0YY1yjf2Cmrb0S/rqliCgNsqoqjBPZLbPG6xyIOGGuU1ud5v/BEIJxN
+AU4g3Kcgj1BJ9qg3+SpG
+=4eug
 -----END PGP SIGNATURE-----
diff --git a/sec-policy/selinux-inn/selinux-inn-2.20140311-r5.ebuild b/sec-policy/selinux-inn/selinux-inn-2.20140311-r5.ebuild
new file mode 100644
index 000000000000..a4c639654b84
--- /dev/null
+++ b/sec-policy/selinux-inn/selinux-inn-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-inn/selinux-inn-2.20140311-r5.ebuild,v 1.1 2014/08/09 19:34:28 swift Exp $
+EAPI="5"
+
+IUSE=""
+MODS="inn"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for inn"
+
+KEYWORDS="~amd64 ~x86"
diff --git a/sec-policy/selinux-ipsec/ChangeLog b/sec-policy/selinux-ipsec/ChangeLog
index 55b209e6760d..12528ff53759 100644
--- a/sec-policy/selinux-ipsec/ChangeLog
+++ b/sec-policy/selinux-ipsec/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sec-policy/selinux-ipsec
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-ipsec/ChangeLog,v 1.40 2014/08/08 18:49:51 swift Exp $
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-ipsec/ChangeLog,v 1.41 2014/08/09 19:34:38 swift Exp $
+
+*selinux-ipsec-2.20140311-r5 (09 Aug 2014)
+
+  09 Aug 2014; Sven Vermeulen <swift@gentoo.org>
+  +selinux-ipsec-2.20140311-r5.ebuild:
+  Bump towards r5 (fixes duplicate context for hiawatha)
 
   08 Aug 2014; Sven Vermeulen <swift@gentoo.org> selinux-ipsec-9999.ebuild:
   Make 9999 ebuilds EAPI=5 and transform to make master for version bumps
diff --git a/sec-policy/selinux-ipsec/Manifest b/sec-policy/selinux-ipsec/Manifest
index 7b836347e7f9..b0960a87f56f 100644
--- a/sec-policy/selinux-ipsec/Manifest
+++ b/sec-policy/selinux-ipsec/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-ipsec-2.20140311-r1.ebuild 383 SHA256 041e21d38482fbed4d3bec24128bf8315c0e7b3f1b7ba0fa9767e18c8430000c SHA512 3bbacfbe3a84e57af109579d3a3fbc964f2bad77a414c86b35e2a73c3af4c1b068a606668c57de4fb2d4c5813029aee95d56688e683716ddf059f8c4c758c930 WHIRLPOOL 6d615c1972286a40e74e723635243508e3c5761b4a7dcfe7e225ec13eb2ffc8ded4fbb03b91c4f92439630b652a2273df55d2ddf5575ca98bbde12ca64a260f4
 EBUILD selinux-ipsec-2.20140311-r2.ebuild 383 SHA256 7989e6f7b9211ba31712f3760007d38421450f121911e64cda3be15b13b0b404 SHA512 f04fcfd40fa63a6777b3df8bf20480f666944847da2d16e37d64fed831a87bf32daf83b88f9a47e4a7d77607ae966fae0c2cf780c4dffa4864a925581e62924a WHIRLPOOL 88f76a18a888820cc9bbea5aefff7f33e18369e96a4cbeabb0dfb6278c6e7c03ca0af946a3e26993ee93a7c5e629091cc085c34e6bbed9d2f2bf64f92de09b6e
 EBUILD selinux-ipsec-2.20140311-r3.ebuild 383 SHA256 0dc8c7ba543ac858f97b81bd6bc64d0b458a4a364421c0005b1a89ae66dc1215 SHA512 15e64000ef3d657f333a9ade86b0fa29cc7cb0db02b9cb9f2914212f6d6097f4a1e07de67ac3a6fbfb9373175b860a5a67ab5e049a583025b51ec7219463ee57 WHIRLPOOL 27b6ac686a7a7263684d5adfc1d78b8e2ab955abfc24a627cef6eee730d1ea4a57becb40aeb3992cb2cb98c219e16a3d518433f2cf44aeabb98d21a3d7cf92a2
 EBUILD selinux-ipsec-2.20140311-r4.ebuild 385 SHA256 abf04c87ccb6611b8bfea499314c0cdd47612e615ab1d16ceff2250e34b0a1ef SHA512 323dbd681794f609dfcf4fbaa4395134c67788850befe49ba856a39aefb811245537d88304b65c1efdd5b741fe2a35293a11c6b0d9ff7b55615b615566ca98e4 WHIRLPOOL 130fa635784a7234cfc593f2cb519f5c69716027007973bdd72617060d9058a60574a425e4623f20c17450dfd5ba7eedeb47ac6fb1c958a1dff254092c63d530
+EBUILD selinux-ipsec-2.20140311-r5.ebuild 361 SHA256 65b7378971c0dcb9c7156e1edf90578146c758fdd31ab8b960d38c0622fd1940 SHA512 2efa4454c1f50da2a637aaf8df32c5cf76fa97118c0b1cba76a1a540582cf14ebb7b3ca4167c15dc1e034d02eb6bb72e48698252615b7f884b86955b4a96c7d2 WHIRLPOOL 6c20990c19470682d05caa3ca3f41d4493135490c5abdef4134c5028d1b27ed785db4baf40e0bcdc3cd4a7e22e1e6f7fd9a7dc8414dcdca781b1ceace6d18058
 EBUILD selinux-ipsec-9999.ebuild 341 SHA256 be59ef0d9313e0e9bb4e6fa040e6f5847320d1f0b70e5d6f5381c3602d4fba00 SHA512 7e5a7999d4198afed6893d609c830cf30d7e6b735427545925318453548e3b376639cba8e107546567ab020a743337f06c9bcabbc84f7ffd9ee959366af03158 WHIRLPOOL 45e9366f3d58525708a018aeb123654b8abbe35e11ba187f7907c974c0e26e789f548fdb7d1d1def7bb5949ad676c4f6f65f7b8a866f0c6f54c591c2c17a8967
-MISC ChangeLog 6478 SHA256 0d6fae3c8b834d826bfcd42bb304bacce06101cd148a971eb9d7e87b083acf4a SHA512 3c4b75433acefd3c062a69a0d4802ad165093c52e95b14dff43e8a0a3ee6c0958702eee2db550048de2fc09c075330d8d29d8881a665011b73fb1cc45f6a7b6d WHIRLPOOL 8f18e4ada7cacec6dbf90ce0169995e57360708bf613a0218bda67d1ebcbe82685d4d6b6529541e41247f90b0a0f95545429cd79886bcb2667e0681020632bd2
+MISC ChangeLog 6668 SHA256 e3dbe482399b84c76be1be8518857dffdd14e92f17536f574c20f3354537e11e SHA512 383b8882ad0be7d66a96d2195158fe15e26c47c959632db9d91e393aa5a2cdd19de5ca5aedbfd83abee24c7da1f66e197af33089f730295a32fc7dd4d4be9e31 WHIRLPOOL c5c19b573be33349f8a5e93faf4b182879ec428524eb5fe8e237537eb21a2fa3e841a5bca64ec854ba2143bf1908f2a534ea9a7e2b32953c1a6c3927e2ae43ce
 MISC metadata.xml 229 SHA256 8b3a0bf3f7fa4b0d9155230221e33ec2638b9041a3264abb6efe8726c6b7502f SHA512 6d48c60a0b15d98fad32e5325d85425d4d60102b87debc391c934447eb50e0ab729c6407c94db7fa733ec2052504c232b0a14fda2984c4ac1eb71da632f12bb1 WHIRLPOOL 73ed9d1d58148097021b92939043d5ae808250e784aaf48558569d860790171b425c78c1a771747845b1b1ede43083ed200661ffd9734f584f66c27ba5835e46
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0
 
-iQIcBAEBCAAGBQJT5Rx2AAoJEC7dUkA7aK9HfAMP/inOq/ofLx5jylj5rVGHGOz5
-FsLn8yW4g3HMQlOI2436UB5U4m50tmGgXgtEwdKkbRYgXOQNfWOf4pjKoVr0h/tU
-ENh5568AJP3NiehH5PY1NlB41XhFYpSYytP8feEaged++VF2v5SdmxilDpRKQMnU
-FucxB4bSahWyXG+2VsYzIpiSYEPcxLKVKpXvaTS2XuMPrERlKwjLceMTYIawj3GP
-IItPjjZzLX8T/tGMRPwMzRlIIBA5SpES69zvcfjipoVRQK2FHZhHOScfRjeMkNTu
-Jx3O5FpswbZLm3zbv+pD1wDeLKHJloU6YdSywFwBEeS3Rm78/+8pq9DFPfpOli2g
-wxL/NJH09VtEKCCJUqScklSd3kWauYuIGqEglrXnx33zeEm47/pqUJLtfuMhHMVS
-KVhDw0eCGwcvgED5wOQlRzCxmJsSfgeAY46K44Yz7UVIxdrky7iB3MMr1bVTD2Sd
-O9pAL2rD9pR/MpZG9Evflyn39GrJUsBMbAawCqdzXJI9qKsM6bnkhf/NuIxB3qH/
-H7XOV8wuZyuaisZA49ngz/F30Q9pLDv/1XcycRhrPT09HbXXyN4MtQILHDEGowpT
-LEY/v/TrwA+k8gg+2ADix7//elOm3hx7CZ7SwOLJAsanSdc2qZnEwSSsjZfecruk
-t+JV3HgMsdVrDUJDQJPG
-=l2X8
+iQIcBAEBCAAGBQJT5nhKAAoJEC7dUkA7aK9HAzAP/12wSsnj/dgv8cNK28MPBBm2
+0ZtgGMFE+vwd3qUljh7fj+W9b0pAynCJ9J9zncS1p3YKXDYhup3DmTwIFWDNpsOv
+rwsq9Hpj4XSWBRYsHsZnt+sXbmZ6vncbHYtqjC2xgFsG/YOa1ZHl75EFYhhYqx8/
+QAFlXwV33yMiGztBqSpTQDg7RyTRt5tCk/xfeuNQH8uPfDrhX5TsT8g+bd/t+woD
+Kx1pwzcRHeQweVmVR8IFn1wVmsi0lsgJQu+2jkDFio7qt3GHtkzucGjARnO5PErB
+RrQ0IdOGIoYwtIn5CMdaNMpLCB528Uv+bUxX1t7YtsQaQ4fmuP7jRtjcDwTyzaD0
+d/fl/GEaq6mQVvyVmLuL5wlFnuIF1vyK4fd1uDV6NZhaCQy1jOtJy0WvZMl1Kt+T
+9dSuerZQUENiDRn9P8Ff6VGZus8+wVdgGB+1wIrwwae5hyUr21nPO3WBGn68ebYD
+VsPEuC2v5gK4OGKcTX+vz/POZEdY+sCG//+6xcoMxRzhyDhQ3P09Xp4BzFVQEl2b
+KOqkrFBizxvt2iwMyUQfD4iMMv2kUTA2WWmuxGjAlKeyA4oFbA0aHmowylz/xlMc
+Np6qIoWOn2M87oROhOFzVsdSi4TyyLAfeQmzqERDyRifqZO8FSeMscPszjOMqMXA
+o6JU/pl/Fknz8a/Ypxt/
+=tQIH
 -----END PGP SIGNATURE-----
diff --git a/sec-policy/selinux-ipsec/selinux-ipsec-2.20140311-r5.ebuild b/sec-policy/selinux-ipsec/selinux-ipsec-2.20140311-r5.ebuild
new file mode 100644
index 000000000000..557cd8c7696a
--- /dev/null
+++ b/sec-policy/selinux-ipsec/selinux-ipsec-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-ipsec/selinux-ipsec-2.20140311-r5.ebuild,v 1.1 2014/08/09 19:34:38 swift Exp $
+EAPI="5"
+
+IUSE=""
+MODS="ipsec"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for ipsec"
+
+KEYWORDS="~amd64 ~x86"
diff --git a/sec-policy/selinux-irc/ChangeLog b/sec-policy/selinux-irc/ChangeLog
index 2afa9470c3d5..5a30f9fbbcea 100644
--- a/sec-policy/selinux-irc/ChangeLog
+++ b/sec-policy/selinux-irc/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sec-policy/selinux-irc
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-irc/ChangeLog,v 1.38 2014/08/08 18:49:48 swift Exp $
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-irc/ChangeLog,v 1.39 2014/08/09 19:34:29 swift Exp $
+
+*selinux-irc-2.20140311-r5 (09 Aug 2014)
+
+  09 Aug 2014; Sven Vermeulen <swift@gentoo.org>
+  +selinux-irc-2.20140311-r5.ebuild:
+  Bump towards r5 (fixes duplicate context for hiawatha)
 
   08 Aug 2014; Sven Vermeulen <swift@gentoo.org> selinux-irc-9999.ebuild:
   Make 9999 ebuilds EAPI=5 and transform to make master for version bumps
diff --git a/sec-policy/selinux-irc/Manifest b/sec-policy/selinux-irc/Manifest
index c72353aae707..72ace5403b52 100644
--- a/sec-policy/selinux-irc/Manifest
+++ b/sec-policy/selinux-irc/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-irc-2.20140311-r1.ebuild 375 SHA256 6adf1f2e0b8ead636922abfa28d63a5cc594f14e544bdd2627f6083e3d8dde2b SHA512 287a73176be3126a4026a4925f5ebe73e27b5ede2c81b025a10606f552651b9c106a86858d823c29796229320ad51e0a279eefe80e755f833d51f942395e9a49 WHIRLPOOL 43c12ecc08100460e29903998b3446f5b550918cdc139f76fb9886838c93e54b2518cbf8fae88995b5c15c82131fa37033f1b580e2838eee005025252bdcaf8e
 EBUILD selinux-irc-2.20140311-r2.ebuild 375 SHA256 8fdf5753412c4aacc608870385c39477ea5ca94ff817247c7f348664c441a178 SHA512 dd7e2bd015a32f1e9957495735571991474c5061ec757f83b3fdb177c34ea71904ef293c9928e687df664136739eb93edf3837dd7904be1ba508faebf38b1e7b WHIRLPOOL dc213d1df2807a570b5fe3d87bdafea1b4ec5dd64331c1e78b66eed60afa4bebdf673097e278518dc777954c811573db2cc61ed78aa86489b6e90f17cbd12bbf
 EBUILD selinux-irc-2.20140311-r3.ebuild 375 SHA256 b1a8f095db7e66fdbca297492b25846bc0e99b58501385ce651ba4b82fad6679 SHA512 81b6b5b7e10a6e9fc7b15e60510446b3e325b119bb0525e89314e206053a879c05844cbaaed244a6966e9481f3004d2a1a17fc8ef864e4b79665fd6fd9e08dcc WHIRLPOOL febdcff38294664fdfcc8e976305d8fdcefae2701ca00b25182ae41176beeea5dd9ec58dad7c7e7e2a0a961c641fb84cad5c3fc822964ae3c6c6d50098568d2e
 EBUILD selinux-irc-2.20140311-r4.ebuild 377 SHA256 01f7aed018ce6e6bf4f3d0d7825064908f687efeee0944926f21474f8caf8044 SHA512 56becbb6976bf8cfcb00b734333f21b42721b7169dc0ad078eb0e0f34b97b4c4f9dc27a24e64de44f3e4cdf853d288bd7613a4aebbea1a94709903d2a37291ff WHIRLPOOL 5ae242c8b0c6b0cdc40ed6d9eb406d1ee392663dafb6e829815fbc986d42e085931f3a12a2416cc982d1a8a0b3ae92461bfe73dcee50a49384edb96efd5d75a9
+EBUILD selinux-irc-2.20140311-r5.ebuild 353 SHA256 a7606953a9e70402f41e28522abba764ed9bdd0d715c6e396f51fb2663612164 SHA512 02ecae6c7a334441df56565276fc038b27fab9f98ff7901210e32842b251e96938ccad9e76112245f19d565fd17c3786c8ff8805c090847f3ab87391f43c641f WHIRLPOOL be806e1494697f25a00e3fa5c61b82be21697ea5209e1a3f8c436bcc1eeaf0e36795cf6778ba0d539e69c44aefb13a1176d0a04bfff02eb0f92316f9320a5360
 EBUILD selinux-irc-9999.ebuild 333 SHA256 abdf79ed72f980c5cd68ff53f978aa95da6cd755a4107fea19167ec0aa2c0257 SHA512 ab043dd7222a8d454bb86550043a3b803a0d32c8d5b877535cc8daba3774147fe2ad693b20208cf9d2ae98524c410b7f482123c8d7b2bf7792a70c57751dde00 WHIRLPOOL 173693a5cfccbe67fda085000692163d97e7822e34c78aec659f68b74acfe6218bea426fec6645afcf7f641e894f01bd835fe7ce1fccbdbabcd5b54ad8fa94d2
-MISC ChangeLog 5870 SHA256 c01b7447d851c64f75f93669418a0a5e7ac84199200c99898d551f9a90efb78f SHA512 7d715595650107aed95ecb224b5b6d8c8f4ef046f2c75f42a5fa2607b4a43b1ab663420adae90b2540055a3a87d125932aed882c0edadbde2f491def92477d95 WHIRLPOOL 6749849fed55fbcf4f18b53300c09413ab0f877f3e44e610fe5eaeef7e639e3045944bf801a7408b5001fcb8a907c3399227b64b8cf354c58cfc2f1c25d47f73
+MISC ChangeLog 6056 SHA256 4b68b4f6d139b13f64f6de5ab27998b977ed24112e441928aa79f29d64e04724 SHA512 66f609bd31485acc5b68f55e74f4c17af4fb84c865e9b321356f29c86bc85b70b3dea15485c754627590a3659470cc31360e7c468a9a7d77e74b10ae709f63c8 WHIRLPOOL 65334e68ccf8a631fd94b7855ee04d92eafdd7b7f87521e48aa44d548538b37dc780562059b9b6d0d1dbb54f0f9e72d1dbef6e2033bcbf6fda7a74b2abd2eb5a
 MISC metadata.xml 227 SHA256 0977a90dd650f7d6154c19a2af5824c975f33b30f648b239ccd113af22cfeb52 SHA512 b1cae37860bff327a09c0db27234c5595e80e2cdc35ba4b1495a75dd3b449ec3e55fa1a009b4f55306a1c37ebd1e851960a86da53338ffb45f6202a85a9abacc WHIRLPOOL 88faf782ed4012f13277ffbe88249439cfe36f104e212305fbc578b6f65fe290991a2d391a3484310b208677dd8a61550559ddb6bd812c264914fcf926a47fc0
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0
 
-iQIcBAEBCAAGBQJT5Rx3AAoJEC7dUkA7aK9H5vgP/1aKUv+XEQzB54kVUvEXWVTd
-5xECayBJl0tmNx0kJBn5bJR2KmAZphJSSdCFjVnxspan4dpLXLc0QoxtrOvz6jjq
-ia1ktLNUC2fRy4xBnWuczu7/x+4pMgW5HGZY0AUlCh9AyKT65JdQmnVJ7DCo5xmx
-BK/XM/52Id8qizP+PKsNIgg7MhYy1NLvqo8UT9XmADdNYDXphQ0wS+JvGs9LaJ9/
-lvdsGyNg+9O0Trk0tip/FYSbVpdYfE3CNN9b7M86NWwM4uclDV8yBr6+0H9AkP2r
-6srbn1CPdwxHIz40t+0Lw3PmLeqofgrknj7J2Pli7r0W/EiqMquVAgmAZeIuHtOe
-Do11WqBnxwogYM3ME5h6UmJly/vzvUKDB4KecCcpYLE7EKZBd68KxOWnmdtOt3NM
-eGMfecSXgdbz71noVt6tbq6mKB0Jyzkiy02k2JH1CnnkyBxvuN2wHbPPEAswmLwp
-I7Z0UXHnyLyPFBPSv7SmkDDNFMSVDDIuspzf7palpUFD5kbu7xToapiRIMcybTja
-STRWyFrQHIMXmYKdWDFwFSd7DL4o2I6j5eOa5ASVgKf7y3b6PI8nbiKASYHd2xdy
-vNIIahm8/HJNni2S+goETgWVsqDrIjKcrOkq0veQ1q49FLyaxmKRIxVj+bDcohr6
-/wBgq1jVUp1QyN+A3939
-=pnm/
+iQIcBAEBCAAGBQJT5nhKAAoJEC7dUkA7aK9H4HYP/3ux6ydmizBkws0k6bA9F0bU
+KH0n6Z2c0gJ9A/Rr3VTp0UvkKVs3MncBRzZNdhqXwDDr5nckhGraJyVkF/6JGVXN
+TmnMgoIfFmCAvfIii8NGwBlLsJc0Mv8LYSI6RhItNGYW9ej4QYavE2eSR03E4U5G
+pFKf7JyJLrEyQs4UOd5CS0Floitt4ib+XC7eNlBCcd31sPdqKeTpDqI90QwcEdMs
+qyI5WUkm+PQgT9h7JY88LxNvCJR6sEwVDu/v+OAWjmynPAaUKQBUzi64N/kPKOs6
+wNfGBTTWMuM1Oub9vjA7N7nQ70SWSe6FJTq2W5gM4EFb059EWafTze1/5x66tu5Q
+cdZ9wlU5ZslEB3JVCfMY1ywSfLffrly/fZ+3ojcsUO4MTZIcDm+ILJKFBoBB2pBK
+S90IJVHNN1rdpGPPwfuFKnodR7uwvYFyTDTfBWKqmbZbvZjfzPG4Jw/9hnNl/ZPC
+lwfvtpItqOUtZVe54/xZudzZIhEQBHt57fbxbzi41sJYk9SiM8HGKu31SwNeB+cr
+pFVIakiX8ANOKcw38fyH5mTQbqN2YR0mTQkT1BrKQQCqNsPzPrVn9oIYa8Hnma1x
+0RbE1R658VqdguklK2NLejxA8flkL2Q1N6F9zPL7XDmXMCnCpfNHLBnVWZNIdnNQ
+rNRIQcjBDhjTcU+4IpWV
+=cPpC
 -----END PGP SIGNATURE-----
diff --git a/sec-policy/selinux-irc/selinux-irc-2.20140311-r5.ebuild b/sec-policy/selinux-irc/selinux-irc-2.20140311-r5.ebuild
new file mode 100644
index 000000000000..f5fab3ee60b2
--- /dev/null
+++ b/sec-policy/selinux-irc/selinux-irc-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-irc/selinux-irc-2.20140311-r5.ebuild,v 1.1 2014/08/09 19:34:29 swift Exp $
+EAPI="5"
+
+IUSE=""
+MODS="irc"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for irc"
+
+KEYWORDS="~amd64 ~x86"
diff --git a/sec-policy/selinux-ircd/ChangeLog b/sec-policy/selinux-ircd/ChangeLog
index 119d3e160943..1652ea0b2f1c 100644
--- a/sec-policy/selinux-ircd/ChangeLog
+++ b/sec-policy/selinux-ircd/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sec-policy/selinux-ircd
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-ircd/ChangeLog,v 1.42 2014/08/08 18:49:40 swift Exp $
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-ircd/ChangeLog,v 1.43 2014/08/09 19:34:19 swift Exp $
+
+*selinux-ircd-2.20140311-r5 (09 Aug 2014)
+
+  09 Aug 2014; Sven Vermeulen <swift@gentoo.org>
+  +selinux-ircd-2.20140311-r5.ebuild:
+  Bump towards r5 (fixes duplicate context for hiawatha)
 
   08 Aug 2014; Sven Vermeulen <swift@gentoo.org> selinux-ircd-9999.ebuild:
   Make 9999 ebuilds EAPI=5 and transform to make master for version bumps
diff --git a/sec-policy/selinux-ircd/Manifest b/sec-policy/selinux-ircd/Manifest
index e7bc316e040f..ec68eef91fd1 100644
--- a/sec-policy/selinux-ircd/Manifest
+++ b/sec-policy/selinux-ircd/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-ircd-2.20140311-r1.ebuild 379 SHA256 1f763a9e1933632a0c7ff24c5860609f1d47490612bc4fb1a0b4516e696c2a58 SHA512 63f77eae4f1108d700ee327ae6515877a184d2ae93a89446211f8c4892f8183394070693d7234a281cbad16b292ed7bc65c6594b62308075401acb8df4f596f4 WHIRLPOOL abe52814a0a4174846d908f089bec520ec7556d0f995af85ee8da61fbe581914eec5d3a16274779e8de40572969de269dbf8a9afd9dfc9f687ce979ce39054be
 EBUILD selinux-ircd-2.20140311-r2.ebuild 379 SHA256 2b6fb221a28533450d8a765c11c8891b71b581ff3758cec0a2432decd2f83045 SHA512 ee64677b0c25c650aa503bbdaacd1f08fdaf788b8386403edce606a8ff483ecb84d3aecfa516a6754ef5f63fcff3ba4bb9bd02fac7dfc016695154010b850323 WHIRLPOOL 6a073b32fc34e0c6b2b00c8acaa3d313da0be6eea91d84ba4dca3c113b476a143f7629f3e35d499c9ab87e78b8e52b9d05222765b175b348000b36bbbc1022f8
 EBUILD selinux-ircd-2.20140311-r3.ebuild 379 SHA256 3c25bb20ed6b56a8dd9027c0fa8ad5c652d3624ac048b55769030abb0e9f1413 SHA512 24afd4093e2ec4b11f80c73c4b8cd1657e35c7ef61e554df2aec1773b23e3c7f16a33b6579e6e7c2ee4b7f0dd749a86487e55db1c2f9e1ee14cf3c7e1b1f50eb WHIRLPOOL d88c4cc0bc31e8ec83741378dee6d52cbd9f8de89f3b4b903bfccd8649bdd8b0397b48ea7c9ec62d65a78b3af9bec9188ebf6d963f0a8d22596fbb6294be7be3
 EBUILD selinux-ircd-2.20140311-r4.ebuild 381 SHA256 736aeb3b8d28e5f4fd630a21e0dafce09c38b7b2fd3bb46ec5427024c64d0279 SHA512 5bc31ed5ea84248ca8671809c3a38163b3aef15ecf88b7feba6df0bb584e8a618c793b64089771e2a3615aab3c37687122b7c86c07b3aa4863b06f473326eebd WHIRLPOOL 04cb39789e6a0c74923425fdc2068c3382c66bb03b797445bc439dd089d75a93ca50ddf13e849482eade3c0d8db1e154a41e9a8b08e39ccf43dfad850fd542aa
+EBUILD selinux-ircd-2.20140311-r5.ebuild 357 SHA256 3ba7df0bdeaad6018e6f4218b19a28736b8d0dbaa414b5e85eee3ff34322e82e SHA512 fc3a86e68cf907eef8805367731c19d95ac95837021c282a6dc827e45424d87b3c12fc2ec1d09059c15c517227d2b4a323ed78ee8e6a1f977cc4155f4cecb5d0 WHIRLPOOL efd83217e60893108f9a5076a37d4a9f7a1c08c9fcd1000fc06264844b1e738cdcd9a46024c815b48e6f70c59e8a1ff9132f83d858b2f4dfbafd3aba57083d10
 EBUILD selinux-ircd-9999.ebuild 337 SHA256 15add32afd37e2b07ff4c62ea60a5a7e4e6ed56b6fe6b404218787f303f6fd48 SHA512 6648ac13fa403b66099d845384f70d62c80e59ddcba8db2ef1259d57d532f6a30610a191a4ab8ae919dff57926f8f619a1a8cf75f32dd68720b899e76874a125 WHIRLPOOL 0981b752d22efd8d399f35f31676fb315af77c213e9aaeb92ef3590c8ef2fa60559a593fdf7d48b322c84e34ea0801a2f3e93853bf7dee8b913c3931cc1607cc
-MISC ChangeLog 6361 SHA256 b2de3a1fcb68b39a2130148715314ce2f36d0252d7b3c7f1694a865f4f52259a SHA512 300f9d8164e297a132f1038e8fa72dccdfaa749f5a4a38a25c406f5b2eda015cb1691c2ef4f10ade73ee1ff4b8956bb317c0d691aaec0a9ac06ad1b512cf3dfc WHIRLPOOL f6a071b0a4df5d8143dcc6b6609f5393d66b07121ffa8e6c74801af6789281070409809ec90e42ec5f8bbb0ca78f98fd2391f5442c9d02c5234dc39f094c7681
+MISC ChangeLog 6549 SHA256 6ac274403d31de8cff87195a521c2217c125254e297e2818fa74c3aba02ce741 SHA512 d73c0ba18c0000f3714fc3d7e62181fd74bdffa2f04e0eacf5a68b582f2488307de7c692cf18f83beca3fcddc36a94b6b8a7f3c402fee97439ca21f47a7e27fd WHIRLPOOL 6ec798456f48b1163b7ed52e2fb263f3423af65979a2a10d7e4c75a639dca9223106138fb4ea5911cb2c45fd677aef8a16f32e094484af81b6d9c442545d78f5
 MISC metadata.xml 228 SHA256 38ec7057e1113741cb8799191b2627711554ef8105fd2fcd2b7ed8ad5174ce85 SHA512 4b76e573af594dbdce7b0b44b6ec09aae66b5b8d93ef60a2dd71464f677d52ab7f5a77895b3db01cc595794912bf12b1a773f825541ca507f5ad79d9c814e825 WHIRLPOOL ae319e2288532fbb6bf8f25637f262fcda6b34f1633a0dd550b53518d19d8bcf3b081c0a275e72768ca71c554a4050651343c19d30716f0b132fcdc24bd2c2a8
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0
 
-iQIcBAEBCAAGBQJT5Rx3AAoJEC7dUkA7aK9HA6MQAIIlmW1HGZICsCtseZioT/AW
-Xq2HN00XW0lLieJOnW92HOl0GaFyYdif5dwtASzczqH6eSDi0OnH2NZuBGI0tObC
-LmhcTCwYpuHevzXiU67y2NdqK58qmB3VNpk9pBVe1hx6/iBJT8VGHJnsQN4/QciZ
-agzbTMkNizHKF0GARD7jnL/WRs2+LvCG+vnMu5LsUncyWbpuS9NikFgo3pvZXOCJ
-eE3imnjuYMzXaLDDawDJjo5huVEpSJmodfqhnCeYBwK0WBWmMLSRR3Zt6KjfIjfi
-O6jtsKT4Q93SNAeAxuEKA/YJ7BZiuJk7q1ufghRPlKmX1s7d3IYyy3IhY876ydHj
-Q7xYQcmqcEhLhsuBLRAN/aJw3/9C9oUxT8GvmG9aPPACrV7N9+hoohfaZmWKIT7c
-RSK9QKoPduwlCKZZKHSwOAP2lAfGWlMMwKDpbLjQR2d7LQQ/FiJuCRkfX8wtih29
-cVWhkibTm5dsrJbtbNS866KxZG/lpaW+/K3eHiSxZNk/1gsvyyW8e59ojFDtquPV
-jTv2AhUTQjVwXp04jTzvLvfcM5gTiM3u1dnla2hcNV/eTJ4pL2iHQf49qquDIjFI
-WCXzohLE2mh4PAeaByHyqoCbJM0nIR3aXdbWDD7e2ugkjluNjWrkstwR2LXawW6A
-Zi4hXHGZkp058mCPPbv1
-=sriq
+iQIcBAEBCAAGBQJT5nhLAAoJEC7dUkA7aK9HIqEP/088jmUl1V8gOqBJBub7aFpB
+FeJIarwoEf+28imFPAu5SQUqEfeyRStNJR8ZgWEpmo2bsq/Km2hPG4gJjxmC5s9k
+PVuWDlaoDBqUCrNJKawLDfxCZtgEvYw+JZkqUFz8O/uQ5LSbzmK7Qz/HhvlCvZ0y
+QlKbleWkvDOTYh8PGQB3MpjJmFYsnKfKTErqJSYy2s/lOMGFlCLl/CPcgxrPZKhi
+9DFwuoHMWRjRdq/UzqqniOPvSGzDMAMmFk7cNcmXU0BhDnzcXUtpqajO12cKOT+y
+Y+WpQrrhdX0HWQlSaeZOGOfiTlwkQxyary2O/oomAk3B0HAZ663rT8AZR/Mqf6PX
+9ZyeEZ3hzEI1EluSu7sfiJS/1swnWImBQnBzwuDyFLraS04gn94EzKUB4ECZsjQM
+fPOKhJsi74WsuoLMPPXmIef2+HqrXhrBPHE4A1oEUqeoIwlmmaQvX1yP+vh095hj
+YQ4+VXW+F7xTZRKpuu75S1ENuBAXBEhwqxef4CLfFXbWxBF1/LUIDFDH4LgU83vX
+AcRI8wwuke7f2LQRz35Mh++5PRf8yGo/Czq6XT4oAOCeW0QnbT/GMzs5pgGHipM3
+7X8xY5RzHhWD68GyQ5kuTxGCpMGHMQjTzDUFKbaRqhHRHZYs8vsW+kHAMtFOCAn0
+hI+AaS/7E+5cr5QCGpO0
+=HL+s
 -----END PGP SIGNATURE-----
diff --git a/sec-policy/selinux-ircd/selinux-ircd-2.20140311-r5.ebuild b/sec-policy/selinux-ircd/selinux-ircd-2.20140311-r5.ebuild
new file mode 100644
index 000000000000..322e4cdc9c74
--- /dev/null
+++ b/sec-policy/selinux-ircd/selinux-ircd-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-ircd/selinux-ircd-2.20140311-r5.ebuild,v 1.1 2014/08/09 19:34:19 swift Exp $
+EAPI="5"
+
+IUSE=""
+MODS="ircd"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for ircd"
+
+KEYWORDS="~amd64 ~x86"
diff --git a/sec-policy/selinux-irqbalance/ChangeLog b/sec-policy/selinux-irqbalance/ChangeLog
index d66c00db4f66..71a49a240998 100644
--- a/sec-policy/selinux-irqbalance/ChangeLog
+++ b/sec-policy/selinux-irqbalance/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sec-policy/selinux-irqbalance
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-irqbalance/ChangeLog,v 1.42 2014/08/08 18:49:31 swift Exp $
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-irqbalance/ChangeLog,v 1.43 2014/08/09 19:34:45 swift Exp $
+
+*selinux-irqbalance-2.20140311-r5 (09 Aug 2014)
+
+  09 Aug 2014; Sven Vermeulen <swift@gentoo.org>
+  +selinux-irqbalance-2.20140311-r5.ebuild:
+  Bump towards r5 (fixes duplicate context for hiawatha)
 
   08 Aug 2014; Sven Vermeulen <swift@gentoo.org> selinux-irqbalance-9999.ebuild:
   Make 9999 ebuilds EAPI=5 and transform to make master for version bumps
diff --git a/sec-policy/selinux-irqbalance/Manifest b/sec-policy/selinux-irqbalance/Manifest
index 5b1e574c1085..d31ec56be65d 100644
--- a/sec-policy/selinux-irqbalance/Manifest
+++ b/sec-policy/selinux-irqbalance/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-irqbalance-2.20140311-r1.ebuild 403 SHA256 8ebba631ad06e6e05f6f72b00691af2c42186bf4a17c2b723543a19298ed24f2 SHA512 43a53411ad1e76a05f02ade94a41de50831974c24a5df5f91abcd5b59cc775ccaae6ca3dce578d4ae9b0db8461ee56b817759039aa07d4b6741c8c4b768c4101 WHIRLPOOL 27e96333294b111679f38ff019ed77fcb1fc527250002a725768f7f7582cc65910b704183c7598c7c67169c4217eadbfd38f924ee85b3f5c94d8bdc28d83f548
 EBUILD selinux-irqbalance-2.20140311-r2.ebuild 403 SHA256 d241b8b7efde7f5ee7a5f3328ca68622f24bbd548df6f2a739269e1319326a6e SHA512 10980e14861a216a3800133c735f3966861420dd317b5f793d5257b6703bfac4957ede42d670884cb2bc21e46eba86d81255a47306c461b9f3bdb5c10a97890e WHIRLPOOL c446e5a7e9d0d38608c4e84b0f22a51624d2ae90e3e22e79eea46fcc633914a954ad58ca42283b51157d5e15eb59853cf2a899b4f937702172b82eb01e34efbe
 EBUILD selinux-irqbalance-2.20140311-r3.ebuild 403 SHA256 145c101fe18ad1006a7ac93211ebd3ef3451b2dc532c612d566165f544de4fbe SHA512 e489f7af4283e5d6d2bfb1c5d6f15513d7580e940eb0409a2d5d8a34222d13ba748a894c399b9e749a58ae7fab322c5c5caeb7b673475020cda842b7d302536f WHIRLPOOL 036daeef75816965f30fd47c0bb29988ae9890a46b4c64ce3c2731ba5730794aa8707eb20fe614d390767934ae7a07f5a49933a1f907fd664f680529a0279280
 EBUILD selinux-irqbalance-2.20140311-r4.ebuild 405 SHA256 b1973cee4e3632dcfc43c08860d3a784af158b6caa4685851da19b8706fc7162 SHA512 b6712d15857ce0a65410db4df67976495738658458a2a6a6cfd36f00be13bc914413473755d05af3075e448af256784f763e38939f0eefaaf7b91c28d30743bc WHIRLPOOL 8bf4ea2bebc887ce7c49efa7fc116e6c1c5f43036906336f2652e2460cb0a95912f85437b0b16bd632ee5feea94d2c9f7ae1fbf1c97c2dad610e4acfed5ff2d0
+EBUILD selinux-irqbalance-2.20140311-r5.ebuild 381 SHA256 498ac5708b49934821b82c981d5a76f443eb68abc419f115d4f69e697e0d42d0 SHA512 324a0e99d4af1ece20bc2cfb9f289400b233a1085e796b3db9f89780a8805d5073608336e62d51575c27e06159364bf69f899acfa2e4845ba9b670455087f71c WHIRLPOOL fd3d799bd5da7b98af26f69fd7805435b66099911d3b9c587828a3e3dc583d7af84112a7f954e548230ebde4fc2b23369deeaf7325c6a649ac0bd9a9d679ef42
 EBUILD selinux-irqbalance-9999.ebuild 361 SHA256 ccca7ba12780846b5779246e212cbde4191ef7b42e1ac1447c27fe606f87d6f7 SHA512 c310e028bba6bbe8e9b24ec44d62377f1aeb8564d4d9e7beabb42559efe004aba6de2fdc7800d0b0064f5f2b79b2dca38d3a6ed58cf7ccff287999b56ffda4fa WHIRLPOOL ac2691911c0fa5fd45bf7a4bcd103cdd9e222fe7aa39a4a4bd1c1e142e27e5d67ce063cb9a11703b79ac8b53ae5261aa0ab996a66bf3df9cc0817435bdfb7d0a
-MISC ChangeLog 6826 SHA256 6419af1e955e77951deb0ba64982d9ebfba177ff689daec95aa2db622f127b60 SHA512 f3545b5681fae63b7bb832c8fcede8e04dbe34188443ea96f886ad86dcfea0ae4d7204fb5515cedd6b867be6ec09e59331605fb300e9824ebdc75e907d2c3c0d WHIRLPOOL ae966ea2cd32bd3a3e558d63490671170b802562db683b402d9a42dde25a98481c8635388a44da2e3a569f1b1fcfd1eec8c102e47b189a958c97f448f2f28772
+MISC ChangeLog 7026 SHA256 241f61a6c49ad31e509944758ef6ea675fd8014128050854bfd9781f6817b1aa SHA512 2b39631db0db9ee5b24edd7ecc09a800d958e2b06fc6333caf8632f6046c92d8a718e609d914b266cb9dfd3372fad488b15b5b2645ff32ea3dda7ecd70e13fed WHIRLPOOL 709943fe6fed9cc1213fbee6634b87e58dd587c6f902b850bde3e1de3b64c9f2d2b683d970b4f6da3e9d482a7ad9d2f1e1ff43e7a80ccdc75701d6fbb697316e
 MISC metadata.xml 234 SHA256 7c7b72bfc4157d00d4d787dfc9371f2f497e1c805f5cd3fe2299dba0aa9d95e4 SHA512 74d97017e03adf932b2a318500466c40519e842032daf8bac6adebcecdb038d3799f77f42bdd6cc8b394497df52e5a9bbac9bcbd242774a86edb7bf825e7139a WHIRLPOOL 15f3fba49a14e025f45855c7cd1b756b82bc11387a227e65e9b875b6695c4256a6b9f55901d9f4153f62c471a4902b8137d7f04f328729c682d89532980b6e1d
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0
 
-iQIcBAEBCAAGBQJT5Rx3AAoJEC7dUkA7aK9Hs08P+gN9Jxxy5Piks5eHE5eVpqtQ
-gr6Ajt3FIbcV94N7S+KU8aFYwPR8Pl+Bhh9uRlGP60AKrm7BoEaq1nZtkbZghHLw
-iIO9vtKIAsh5XOlHMSzQ8+uoO4do4c4yQKV/HM/gdlcWCpqxQ0vmIOe29wXcHr5i
-5+uhbB9ckHqz/PJY4xMK5ZPZKb/P6qK72dtwo0PhbDe1M3zwqNMGfW5uW9tn1LyR
-nRC659n2Lxazv6CDW53JTdqJFh7GmtpSGHs/4tgGZDQQCQRYFnQdGGU7jaS5/Ea2
-y43q+6955eqdBnMLHBZg88bDT/1jGJngKw4FE3OFEDdemP39yFXhO2rKm7cdloYL
-89AxAVlp9wWzNK/Jpmazx2zjpa0M45cPYPIssKJjh2PSgtSfZGPYxwYsYtblVaCf
-Tb4WVutbn+uqjrfQDf1Wtb0do7REae3Vp2PBp41dKooX2KkeMe+LJN7d2p5GHuNB
-DZ1O0wBg96gFDJh2eOqbXC0TVCJhlTPxoBuGz4uWQGNguG2YkUmhm4CEWVa7IQtF
-clbLTbj/gaGncO8FGpk60WDx9HDPjSWx/t/1rcqk1Vg+o6Rvj9tvTRugu4vSIOGZ
-0K4EtUJbjG7PzZIDDXlwHLjoGFNeG7GO8VJ8pZb0YbiViw31iNOPZEVwv5eza4KF
-qEuPDBAwER9CtwaUK59K
-=LQ4H
+iQIcBAEBCAAGBQJT5nhLAAoJEC7dUkA7aK9HNr8P/AlP9zlcef7/avfk1H20MJkW
+jdsIe+NP5sl5EZHj8zTGFk/PbrmQydky0/4w12VDm9Fj0RD7Rdf/lOs0wjzAVU5L
+A9LToC1xVpoPKt92xnlwMhEmiL36NA93SffHQe4mx1NJ7bvA4baJl839n9/AUk2j
+1TfKX20I9nZV1agoGpvfz2vN0JcowufgEi8r3y3pptuC+YiZYnCR/r9tK0EZKC90
+7Zodjd46W/EXZFzx0ZE1scQB/T8L4Pt4rI6QXd02vrKRzzFRHwLzwTvXFCvbhOOI
+GXPyMPm9ewsWSiSRhJg3JuXZPxVCg7V7hqzqSH2ILa7DnWOQ+gozp3ynxGK79Tgh
+NG5V3h/9zgBHLZZf8PWJwNkhI40lKfBkfx4GCqdD1EyrlXZN7bc4+xJMjgVQwKpL
+p9v4ZcdBMNlmQ3IfGj7DlbDNoz87gCoLzm2XxoUdWSXgJJCkFsW1bSvd7RxOeUKA
+u4eWwdHK3nF0tzTCbC9H25kf81wBCpy5m9oj+++fu7EbSVPimeZMdjMFgqQqQ7qj
+RQmk9V8jylvhKPKSDWIF8EGSIklUYjazzsZFIokGY4cPUC1CuerGoTEIWHgc7r7C
+aYeYhTRxXXz/bu4l0DUfDXZ3fm/7EgBPRLDzz2FHo4qG7a4OkI6tC9SSbDryqHPJ
+0eT+8rRDCbslpGr55Ofp
+=UEud
 -----END PGP SIGNATURE-----
diff --git a/sec-policy/selinux-irqbalance/selinux-irqbalance-2.20140311-r5.ebuild b/sec-policy/selinux-irqbalance/selinux-irqbalance-2.20140311-r5.ebuild
new file mode 100644
index 000000000000..9ff649de76ff
--- /dev/null
+++ b/sec-policy/selinux-irqbalance/selinux-irqbalance-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-irqbalance/selinux-irqbalance-2.20140311-r5.ebuild,v 1.1 2014/08/09 19:34:45 swift Exp $
+EAPI="5"
+
+IUSE=""
+MODS="irqbalance"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for irqbalance"
+
+KEYWORDS="~amd64 ~x86"
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"
diff --git a/sec-policy/selinux-java/ChangeLog b/sec-policy/selinux-java/ChangeLog
index 352fc7b50654..a1d9cc185954 100644
--- a/sec-policy/selinux-java/ChangeLog
+++ b/sec-policy/selinux-java/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sec-policy/selinux-java
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-java/ChangeLog,v 1.45 2014/08/08 18:49:19 swift Exp $
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-java/ChangeLog,v 1.46 2014/08/09 19:34:20 swift Exp $
+
+*selinux-java-2.20140311-r5 (09 Aug 2014)
+
+  09 Aug 2014; Sven Vermeulen <swift@gentoo.org>
+  +selinux-java-2.20140311-r5.ebuild:
+  Bump towards r5 (fixes duplicate context for hiawatha)
 
   08 Aug 2014; Sven Vermeulen <swift@gentoo.org> selinux-java-9999.ebuild:
   Make 9999 ebuilds EAPI=5 and transform to make master for version bumps
diff --git a/sec-policy/selinux-java/Manifest b/sec-policy/selinux-java/Manifest
index ebdc38e5f5dd..d07ffdbe7ab9 100644
--- a/sec-policy/selinux-java/Manifest
+++ b/sec-policy/selinux-java/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-java-2.20140311-r1.ebuild 379 SHA256 ba73e44b50ff24b66057a1af97c1eb9e82827930a5ec1756babe1c09cc5bdd95 SHA512 20a406d4a0042eded4d015178b6adb430870ced1c335c233aef3f060ff8577c15247acf0313bbfd456b3841f4567b7bcd9c760c5fd115e27b3ae465c42c786e8 WHIRLPOOL c027700021a8c49092fb883fdc57ecbb1f47238df9fdc86b24a420d62cb89a0dc3e50d23579f8910763a98a8df22098a3b1f6550181bd419ded3e4d5ceed6732
 EBUILD selinux-java-2.20140311-r2.ebuild 383 SHA256 df8a5c85bd061f47c41cbe5aaaaef2c77b97d84f8ced1d2fc19e625ace7692cb SHA512 2c22e6b03a77cc97ce8c0baee0e9f1d2b4d0c0c20dc755f590dfe000e3f850425eceb98a5298707755a953bea182e8b191e135a7cc7ccc23738c17fb61f6226b WHIRLPOOL af3f66abba96c1a4095d797b1ec9f5a8d486fea66ff2b17c02f99d85e9521a7b6fa7a1170953ab1f41c315def1346890fd0fafc4009d1b6fca448e91f478cd9a
 EBUILD selinux-java-2.20140311-r3.ebuild 383 SHA256 16620c1d21868d43d1f9f5002a03310397329d4b0a0aa5d64011a9971faa4338 SHA512 9829a761857d904e7a60921220255dd91b3dcd52d13644ed0ef1491844939d1e5f930b9f70d82160ab2c6ea7533532a5be87ca6c3028371d4296d01307eccaab WHIRLPOOL 7f2ac0ca780cde4adbd93890f44516daae2469fb01f12d4e3350361bb68871ac0ae0c946bc8e6bb6d930f1a53798986dcffb2a920889035d37bc77526ff02fa5
 EBUILD selinux-java-2.20140311-r4.ebuild 385 SHA256 cdf6765fbbf67f3901230b06f184cecbfb53d99174f82f7d87ce26c0cc78cab5 SHA512 75c7637784e3ffa18e35475e659b94dc46060619f8d933e711b84b87b9bca52567233cab37bb4296efb425fef8071d500162752ac1fadfbd3dc1cb92e903bd28 WHIRLPOOL 7e9e5d176aa2679594d1155649462017737f7bdaa2a9e15671bb38181cc6e70bca51b607329300cf2579aabdcf554d461d514ca959dbd3539b9bdca2ee0515f2
+EBUILD selinux-java-2.20140311-r5.ebuild 361 SHA256 1a1aa43ad75159c2de4b4f1cdc9e78dae50e688d2d1d8b92d346cb5c25d55226 SHA512 b21064b0cdac1f654ad2094fa5103cac33fcfd844d11e4ee8fb8e9545e626bebf2880e3651c799770c6a38452c00bf3ba2b0efb3d2de044b83f6ba3f00f4cc32 WHIRLPOOL 5b98b29fad846aade8e3cb54fc4c701e7cc1febb64350024d49927f8dd4acd14cb9490fc0a5b943687d8a3448e3c477d9dfb6c6856a39298a7cd0731226d4716
 EBUILD selinux-java-9999.ebuild 341 SHA256 780adcbf961063886b7add8be50a7d763c0401f280d5fe3e5f09d0c3a2a245c4 SHA512 154067729b67439a8714e75108da1dbff427fd7e3b7753746bde163039c70a7bdb4b9bb0afa9e10fc6e7585390199ebb2c39077666474b5234456cf5590eaa20 WHIRLPOOL ac35ea45026eb3c882016fda7c7c7f31f41aff54c7bd20059ae72dd65a124d1971e5b48e7c13b4d1d3f542b22bc5362086b8941b8aafa72318d87fd6a873c2f7
-MISC ChangeLog 6767 SHA256 4c3075b3abce504431a2e923740489c74e02e913c4e7c0c015df16e4d95dd839 SHA512 eb4d84ef1e14cfc40a8e563726821ead0c0fbcbcf0ac40ee9934de851b8c4454057052ae981e34f4e229cb89eac93fdff1af06622a16cf5268c23b7a404d4dc8 WHIRLPOOL c4f78407d60c9b6cc0a148c81e33b396f0e2d3a69bd10cf7313a37797eb60d21c0de8c94ecec7b25caa1f6da89077074df8c8b8437d341012fad50bf09cb46cd
+MISC ChangeLog 6955 SHA256 4beb1425fe8bb87e86f6e2c0e50c3bdd1023e60649b35e17f4db44941dd74577 SHA512 c0246e00bf197992e4ab3122081b8afcbd370420af41ba887e990d481aa09530aaf0b78427ff3591096b99b7b8c27d52206ad1c085bd39a3c2f88238e144cb0e WHIRLPOOL 5dbe7e135edf0ee5a0dc94b7cf20445681fab4876e53d68d14433012c3b36d68280a6b35449e8c8ee6816e16377ddea1409ccdb80c7d3184e954fde4d0a37bca
 MISC metadata.xml 228 SHA256 50d60990cb8525bbf540ebec899b373bc512456fa52491a1731de8f95b833ccf SHA512 92cb0dcb13c64ad3774a5490d7e7fc1edca4311ba220b40c8f5a837e48558bc5a866136bcc49c2342e153bc5cf0cf92b849727844ddc7179f405618824aa7853 WHIRLPOOL 4c824517f76dd41d9e86999474cad8ca03490b9113b0080eb74ebfe1a3cbc40f7407253cd030da7834101fb81019eca21b10c835e45863cd1f5f1602a3b7ea0c
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0
 
-iQIcBAEBCAAGBQJT5Rx4AAoJEC7dUkA7aK9Ho7sP/1uhyECqEdYK26ekCxSCUWM9
-n2F23ZFiY2pTv188SQ1XJBUye34WZ1xocx5UyTyV54Ax02S/RXy5czTziuEqOn4H
-ih+X5ItcWsvFv7JHlJnbEhr9NH/5SX/fqe/quzQEKSas51mGUi5NP8WhscpjJ+5g
-PL1OTcIlXNrAH+R2jxxQEocPdwbqQMLX3OqU3dxaGge51Qa89D1ESaOHGKDc2BVL
-WrPBbXldwr2cksuLbW2eKcXvghtNAtEIdV35Uk+irqjfoCC0vUIea5Bx10y1Qj+x
-gui/BMWge4VahlHcIjYun406TJGCZsOkcUSc1KrF2nyXH1uV8D0+kjr0/E5zOwfN
-FeLxtnTfnKUnuI2I4imXYU2uW9t2WzUCgE9+7mNEAMNbFOz4yy/USNn6r2BOll5Q
-FBvOWX/nZTa0HZ18Cu0zlNpdkC0w5d5gAQJox0TIxanYe1DazMvA96X+mGJvielV
-dyVHqNzHEJUJVc8I5D5jeAeeTtO3zK4xM9XjaNziqt6uJwsryxKmAo056fCuXiTR
-JOficjf947ATMaKrDXZl+J3+MQwJVrmAIRZzxIC9BD6+p0CgabLd1df1UWjHQlza
-JBKySUsCnJQ7xN1N2/MLiuAqmTunvUXvDbr6HCH9v5FU8zpOtfzJ0/y1P0r7hTo3
-bPfSMKL8vAHBd/G+aqQv
-=ZCld
+iQIcBAEBCAAGBQJT5nhMAAoJEC7dUkA7aK9H1nYQAIGu0dbRjWUixAdZgBfAqfBQ
+U9nfqtlnN+zo8JeXD1xhmaHCQqSNy/Q82Sw40VxHCqcuW853MIUn9EtP1jnoHj90
+GHn+adbuE9pD/eXGQeU72ZZQVimTymeeSnZ8N9spHy0TM8Kw1YdIsUCh0b9Rq/ub
+52jshyfHCWnBJDgTgS7O96ctSqjgOI1WhhR30vgF7T10sqXdWyLVeKoRNs1wqfhn
+dyjV4cY1y/Se4A9gHdaSf14z5iw9FqONTt3L3QWDUjqp3+xiSVq+TAN9w1e6StPT
+Cq3a/Ym1Xx9fB4V9cldooaLfqzPNXSndyLjA5Enk9zkDipFsV/xwbbxJvsQAOXv9
+WJHtS/4/zjeNg2D5cuR/xFoL9ZxX1NgGF46+bFJOzw8Gn5eg4q/zN0l9PAbwra77
+BBkoqk4toNC9+YWq+oSBa+mp7UEaLVWt09ps/Ew+C3aIlLjINoD1rEbS8sZuDK09
+AnQJ3yFul3Y58FKHVpsF6JTVFbpp4RRz1WG2aX6zKuRJZ3Mogphl26wUd5m+yoF8
+E/Fb/QM57LRtdt5YKi9DJ05ANHBTM+Y+pDQLtWTaPBW8bJkTI68PMAHq3YxuGeJV
+vcgcWCk1GZ1bfoTuQiHyXvJb4Da+4MuAXSMI9lyttM4LRuln7vW4rULPHVINOdbs
+IzEaicktxgBJMn8rB0TM
+=vptu
 -----END PGP SIGNATURE-----
diff --git a/sec-policy/selinux-java/selinux-java-2.20140311-r5.ebuild b/sec-policy/selinux-java/selinux-java-2.20140311-r5.ebuild
new file mode 100644
index 000000000000..f274dc3a5ce1
--- /dev/null
+++ b/sec-policy/selinux-java/selinux-java-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-java/selinux-java-2.20140311-r5.ebuild,v 1.1 2014/08/09 19:34:20 swift Exp $
+EAPI="5"
+
+IUSE="alsa"
+MODS="java"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for java"
+
+KEYWORDS="~amd64 ~x86"
diff --git a/sec-policy/selinux-kdump/ChangeLog b/sec-policy/selinux-kdump/ChangeLog
index ff30db792fcd..9ff23f08ca2a 100644
--- a/sec-policy/selinux-kdump/ChangeLog
+++ b/sec-policy/selinux-kdump/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sec-policy/selinux-kdump
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-kdump/ChangeLog,v 1.42 2014/08/08 18:49:31 swift Exp $
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-kdump/ChangeLog,v 1.43 2014/08/09 19:34:32 swift Exp $
+
+*selinux-kdump-2.20140311-r5 (09 Aug 2014)
+
+  09 Aug 2014; Sven Vermeulen <swift@gentoo.org>
+  +selinux-kdump-2.20140311-r5.ebuild:
+  Bump towards r5 (fixes duplicate context for hiawatha)
 
   08 Aug 2014; Sven Vermeulen <swift@gentoo.org> selinux-kdump-9999.ebuild:
   Make 9999 ebuilds EAPI=5 and transform to make master for version bumps
diff --git a/sec-policy/selinux-kdump/Manifest b/sec-policy/selinux-kdump/Manifest
index 8c6e0a03e2e3..f27592e4e709 100644
--- a/sec-policy/selinux-kdump/Manifest
+++ b/sec-policy/selinux-kdump/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-kdump-2.20140311-r1.ebuild 383 SHA256 d6e6d10a143101513be97c9dcf52ba401389c5fb5b657b48c65c8763a3714f29 SHA512 df482dad2c513c1c92e23f65e2ac8f3227675964c02c93e6a0d2cb9021c2670ff1018f1c3361580fdf0bc2f0b4b00ae94ab4b6bcaa9749ac607a3146a267bc89 WHIRLPOOL c2eb588ccc4f3b56e95677693da6430b30c3c12e6dbf132d61211da51dabaa25f25478425b1cdfe7b8f7d5f2241a56f05db7964ef513da92b4f3309c56eff5f9
 EBUILD selinux-kdump-2.20140311-r2.ebuild 383 SHA256 9b46fee2d7c98fdd2f9a217c5a4b07dd1f49f533043ec5486b341facd821dee0 SHA512 704e2f2cd6e810edcbbe127e55b06d0c2496c17d23284a389e948a2599632a713ff9a2bd752c72d722619ecf4f6ba13d19bc4b4714df8e17467e503bb9a1580e WHIRLPOOL 68d8342962c07b4def4905a3be8b468b3c2f9af0356e73eba499c3224dd753ea94b3b471be6d5b3d92d38b4772afde23dfe1ddf2b1450e06892a8440489c3684
 EBUILD selinux-kdump-2.20140311-r3.ebuild 383 SHA256 1921bb5b62de1c443cd96044e5a16db512a5f6e895bf0e5b91462660a03cb146 SHA512 7e3b675eac49f3fac282729cfc8b5f7e98908bbe683f1d14aece32baf0de2e422eed6dca472a95097fe4f54a09c6bd119fd599e6a1a25d6f6aa67f46bda1f21a WHIRLPOOL 2fe209aa02f88f03a72e886a2dd038f69dee146f41d90083ad70ed51e4fc4e01b075bce428f0db1a2e92815148563c3647429db6fa87a21263312214c7f577d5
 EBUILD selinux-kdump-2.20140311-r4.ebuild 385 SHA256 5ed7ef5c62701099b23a4d0dd45e66411b280e632ea330e261c20b0c690dd8d0 SHA512 9b98cc3582b604fb7b7bee5c4c353843b92f94449a0d2c7611a22413d70730c1807eb536583abbb55216cd087ecf5d630dc53a3d61b10ea4663914f09ed25f7a WHIRLPOOL d23301fe85c69ecc69d13b08ed8119ed60a928059924964d511f2301f588e0363a675b972c6a8682ea97c8afbe0bf5d3bd5918d49299264becd3b6362331c397
+EBUILD selinux-kdump-2.20140311-r5.ebuild 361 SHA256 10ce2bcf6e7c64540cd5f901a1f40714548aabb8b499313aa4a8dc4b603c7869 SHA512 3be2a1a960a86332aede7468b1bfa2c2e1675c87632b23e51781e43df5a9b06b8417bfd93b89d984294cf8f6ca9cf2c56568a88ad4c00bf0c3ec8a9a7e598c81 WHIRLPOOL 7d90c6f7a28ff303859c124abb6cd3bdf877adafea4ab49836da2c1bdf45de59da06c00fe14f4978786a39f0415052ffffda992d7efee2cb2c5f2cf533db5d62
 EBUILD selinux-kdump-9999.ebuild 341 SHA256 312e10ccb2a9db44e7587ed5400bdc3af5b39ddcb2ebe04497171291e217fbbe SHA512 cfb8367137661cd7b50d2e9395f0668010f9e7e153f953be882f34a9908f972652c6221d91010aeb836ef9622d3084e4c60f4d061e67d1263c5444f49015bbe3 WHIRLPOOL 18511e60587d9095a55acc329ebc29a034157334ebaeb59819dc724927905651178bdfad280b2915fcc4322cacf025a335517de882ae192513e859e65b023040
-MISC ChangeLog 6437 SHA256 e0b6ecfafa97765ee195875df4fa060c5fcab175d3b859a48e2528ddfac21860 SHA512 bc416ec7d1b65c71f211879ef679bca4769c0340d9b0ce8f145660348742dae4a663152936c867c3fdde116f58f9bdd6b60ce28e0071844836c34881716f6505 WHIRLPOOL d7175c7a5da193f55d6469060d8a960cf0c7d36efbce94593fae5b67f91338b6d9957e690e4aa5d29a912aeb79d301334194e08edfb19dd7e9b1bde25f06a9ed
+MISC ChangeLog 6627 SHA256 5c09ca10f19a2f4e1ff632341b6637b15cc69469a5f0cb9ab61db2ae9da0b393 SHA512 7fdba1caa014374b87f37bc9c78174fde178d2d993e7549219fadb205a1228c7e1706a378e501cfcb55f858aec3bed639d87e43c72667b8d6e13838927fff7ad WHIRLPOOL 009d39cbb2fc2b4dc1402ee2c7e07fd465700cc152cef38717eb1d472849a3e0a17252c22fecfcf020c78ac228be512ae0746777814f573d546daf35e51a25c6
 MISC metadata.xml 229 SHA256 31ed5b6c46b0da92ed3f542a2119ddefc881f6eaa2e9b7a4d3e43a4ee40aa3a3 SHA512 fa749b155e1bb21d70d10d5e6415cd0a59e4da84844442716e8c878202941916d2890d7b7c4e2364e950bf50872658d2bb4fcd1daf1b38c8a5e25d2ab7cefcd4 WHIRLPOOL ead249ccc276196848c8293edcbbb307a9a23e3cc34c5dae650e89a854dd9b90b2a1f5de76d05122ada4f36b34cafdc37f16165c48859a6e221e85ebed35ee78
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0
 
-iQIcBAEBCAAGBQJT5Rx4AAoJEC7dUkA7aK9HqhEP/jNlfLyzS/0iiN3jHAwXd4+0
-mDxk2kzsVOaKVePmdtf4XeCNcJC8v3uFi1g1WVzJWg1z6r6ZQggw4fs7vwAQDxVD
-UTydHTnj28m1L+iFtFSfA/u3OaqvVuLqunDgbQ55Gd237esR7Pbnm/za7UfJd3Ph
-HHFKFZ34EZ1Uc5Ubtx3am00YD/Tdt7zRXNZ2GYaiYdwHkgSJLw2CrBEzsrfigLsc
-AkD5x+fmNntiOHAaXnIfei5wLdB2Rt8e2tYTyGCY0fxGHcVmAkEybE3dBjxhVyqs
-zbwXX8A6g6scL9RpjuNMNXUigBAMC9WlgUzVO4e60drsoQiSPzTw2cN1TQUa1kE1
-W/BGxJajMmUQAXEg8WLv0EMbG8JNqh8GQgtUKIt74O7KMImpf2ON22Y43pE61LLs
-b4ICzZEIWQGjP4bYRiy9yP+81i8Rzr7hyw1c/PeVhDfS36E3g8SQjrLJBmP+sLzG
-MNwy8O7uH3WKfyQ5YLPcO9L4aWizfZ7YN8ZblGt/QEMlZbOCDXRDq4dIfQkVbYhx
-fCcm7HzMod8O/q97FcfgqQfyJgCpH1ck3odeJ0OJFcnVfq1pCIa8+tOe0nNQPL/1
-4FGRXXOME+6L0Ld0/I/1C868nMCmOKL7jnmHweu+ge2GP/f82haSDYPKhv1Ob8G9
-cerOlIPmLdxrxNR8HTcR
-=4Cjr
+iQIcBAEBCAAGBQJT5nhMAAoJEC7dUkA7aK9HUnEQAINuzCXHFiZhAKWVx0emfET9
+u0szpHoXnvbaz4n1qnV/b2ncuIFzOlIy1hTI2rnv7S2Y0RTi/pKNawVdu4DmjyFg
+OwfR8zM/w3col5a4DV4sunPHcA6a5YLt/nvl+HAGSRs94h6oNgkZ5/+lTaWKtPuB
+Svnl1R3RT12pzASvSw4dvTW+Dqd05VgovcAeQZOU8KxNKwEnSAwM25b9lNP3fYqr
+rd1zqEKglV8wy+EgGvCdYfh4FXEZXmYsbTs38SBLxIA8lmKZwWaoI8nyv6APeeev
+W7Y9/3GFRmxAn9Q8MOtVseGeNpYch4b/WHs+0md05+v9Sf4Ay7QiGJZ/RLpzeVp+
+Uhd9oKekTjiOpf2aEslCLnGRmWAimJf9/mwu2S/fDQXVHiW8s00t/k7YsGe9a7KQ
+3qAI9C3p9g4TG3UrD8cMXEBIMtmPKs1UNRR85Jgju+YO2HRcItjikSsNfpV++0sS
+bQKL0wg6CKbIqFfTM1FQbL/pkpqXgPDkZVg5VEeYtJtJLRZCze3tkB7WLp7uHxDP
+yO+/ciNCGpJqTSu91XCon77oslcZpJLwj2LdujoYuZRyeBWvZ+2um+fdMnbQby0J
+HQjJkKd8vUCtr3sWc6h09UtW+V9z8Yf3M55yryo0QGt9wdhKlxv9FKF7DNkLMwDb
+kK7xWaOIaJ/KV/+w/nmH
+=chK0
 -----END PGP SIGNATURE-----
diff --git a/sec-policy/selinux-kdump/selinux-kdump-2.20140311-r5.ebuild b/sec-policy/selinux-kdump/selinux-kdump-2.20140311-r5.ebuild
new file mode 100644
index 000000000000..0f3c9006615b
--- /dev/null
+++ b/sec-policy/selinux-kdump/selinux-kdump-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-kdump/selinux-kdump-2.20140311-r5.ebuild,v 1.1 2014/08/09 19:34:32 swift Exp $
+EAPI="5"
+
+IUSE=""
+MODS="kdump"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for kdump"
+
+KEYWORDS="~amd64 ~x86"
diff --git a/sec-policy/selinux-kerberos/ChangeLog b/sec-policy/selinux-kerberos/ChangeLog
index ab36f7fa3b6b..ef7c2ae0cf64 100644
--- a/sec-policy/selinux-kerberos/ChangeLog
+++ b/sec-policy/selinux-kerberos/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sec-policy/selinux-kerberos
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-kerberos/ChangeLog,v 1.58 2014/08/08 18:49:30 swift Exp $
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-kerberos/ChangeLog,v 1.59 2014/08/09 19:34:37 swift Exp $
+
+*selinux-kerberos-2.20140311-r5 (09 Aug 2014)
+
+  09 Aug 2014; Sven Vermeulen <swift@gentoo.org>
+  +selinux-kerberos-2.20140311-r5.ebuild:
+  Bump towards r5 (fixes duplicate context for hiawatha)
 
   08 Aug 2014; Sven Vermeulen <swift@gentoo.org> selinux-kerberos-9999.ebuild:
   Make 9999 ebuilds EAPI=5 and transform to make master for version bumps
diff --git a/sec-policy/selinux-kerberos/Manifest b/sec-policy/selinux-kerberos/Manifest
index 653343e478a9..b2e3e8513f1f 100644
--- a/sec-policy/selinux-kerberos/Manifest
+++ b/sec-policy/selinux-kerberos/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-kerberos-2.20140311-r1.ebuild 395 SHA256 ec1beee9fbf1f99ff4ed6c2d2a9dc1b280207223f73f63c86ca8066a665c8ef4 SHA512 3497f6a84d1eb5ea2eb359c1089cc44331115b3fc17fe6c28fded1439beb251c38639d2207fc55532ecd30f6dc785fe1bfa56329ca0fba5f3f479e0014fc938d WHIRLPOOL e174d1ae34bc09892122a2f937b4afdd878f89bc2766d820e6c9a27392bb91e954ed8cc20f3d3c8019c8970943e16c410ad7131c44aa35c69ab94b63b5aef06c
 EBUILD selinux-kerberos-2.20140311-r2.ebuild 395 SHA256 725e8bd7ceac2add991ae87cf1e7acffba8ebc2af01a825b3f48043b8a1373f8 SHA512 db393b3255d73a09694e83bc97ee8af051b3ada8a18fd0378e637ccff3d9fd68edeaba2c604193e791bdc984a3956ba531b0467355f340b9e937c7f0aeaccab3 WHIRLPOOL b2a7481aabec91385d0a6756709c41815040ae8c70bdf733b34b2bc600ff33b157ff0e8a00d685430cce19db9ee9c11bcb5910bff505ed7432fcb69165724d19
 EBUILD selinux-kerberos-2.20140311-r3.ebuild 395 SHA256 cbe15bc3e204a3e4309b65060fe2d2ec7d8080fe5e5d33d0ece151765aafb222 SHA512 28623c3508c08d85d51b7906ac2a3285b092789022e490b7b635c1bf53ebf4d2c255e030d241e98a8919c0be280b7b2d9c5c42011dfb19c2d122592dba0211a6 WHIRLPOOL 2cdf601ff5d609a51f843854b7c4882948c36138783fee287e064c0d4a7152b267021dc900ea2769974ed70549c9affd3c703665bf02f98ecc6efa4ae9dd7575
 EBUILD selinux-kerberos-2.20140311-r4.ebuild 397 SHA256 f33e52de83536ef83b8577a6f4a5d2b0f1f5398010d2ae026884264ed5565812 SHA512 987b2178f18f0195c4debcfdd687c2a8c8499cbbc2da90c5cb395221d68c226b1292f9deeea1ea3df453de599c1813e40fabb00e650a1e93230f3029ae8c7e83 WHIRLPOOL 17d77fe9ffa9d21733ff74aaf7990991a1d6e33f5848367f58333f556a3c59633c55aca261ddb9ab7220d7db61de7aeefea27357d3c32fca17eb20f07251cf7b
+EBUILD selinux-kerberos-2.20140311-r5.ebuild 373 SHA256 82076240f572de29ec6d0f5b3bdc8ef8175b0c8dd742f88a3fc030b89f1055c4 SHA512 1dcd9ac01a33cfcabd1145800c5f01ab434410f0893ef052fdae8442425e5d5ee7c186fd7759b80039bf224633cda800c551d3701b38da62a0405b84d6562fed WHIRLPOOL 6854a7d69b506618ca4f908d6f36a1dc1701290fc400be683b8ca5eb7e88194f9840b0db1bf8f085a5c24a0055a66df229776ab543636e94812002686c7f69ac
 EBUILD selinux-kerberos-9999.ebuild 353 SHA256 b0f54ae811b1bb1a2673ad1a6498746ebabaec5a7602500d1520638aba3ec4db SHA512 69e26944ceba9fb7625aecb2f922ce6ec0015daa4d6f669830f2f521bd60564e3620436d6131feefe7ad70564f51e0af9f815899d36a01423081f0a0c5467850 WHIRLPOOL 6023ae3acf0ce36e8b2ebd2a84a5453ac11746c865707f29a45848498f6cc09aa7bda87935fb8542f4368d0a381f3f2172155729f0ad7c22f54edb828e772ac7
-MISC ChangeLog 9212 SHA256 10ea41b3a170f4981e18536fd17371fffdb02f05e12bfddcc2dcffba2f4eb0f7 SHA512 193952a32151605cb852111f6a393b3de26903cc195f3269f86a8a9cb3ae2d1d622c6822e9b51d283cc3e53cdaaca397dc5a3039a732b7a5562f27beec980577 WHIRLPOOL 43758966d2406b3843b602447011369ecbd22ee17261fc1828e5db18eff72f54062c99adf1da2ba256d11421a9e86e275a26fc3311f886cce8e7a902f0d0210a
+MISC ChangeLog 9408 SHA256 500eb214fdf8d4ffbf4a43e5efbc1555eb73c1e30deddf5a12beae46985f89ee SHA512 352efd99f6af1176ef04e41339c8f0face81044a7da73a862180085e5bc9ebb92c2168ef33ee42eb16c87460dd2ec4e8ab4c9ff99591df9139cca41463cbfe52 WHIRLPOOL 95bc3be24a3923fe79c3177e51a08b5d556917727856918f9ce2f93b1d4d569e999327ff5c573b0c07eb47887d4d51feab6e05eb14b158162b628b4afd4cfb03
 MISC metadata.xml 232 SHA256 3afce650895f80eae3dddf3dce5a84f1249bace33674714992b9de8682ea6a50 SHA512 5e99f223dad88b3754c5be82e758087b41255b7d04c7619d42108ed3df552e29cc4773659930a82496f2ec812e4c35076834455f0d66ba3ea52ef46e1e3c7564 WHIRLPOOL 622ed4619c8c766163f6eef06e4457e752ed7d58b4bc9f9f6ccd1b5e3a42b72120f577a4575c420996c7f0b3e5b7998f361a258cc5646d68ee9a592332d887c0
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0
 
-iQIcBAEBCAAGBQJT5Rx5AAoJEC7dUkA7aK9HfwUP/jKPSk67MsjFLYGg3KjGTbnD
-8aRgKRdTbCI8Imf5z2Kz81LIVXv4x0/n4fd4whKKx78Y1+v5+aqYNezz5dqrUZ32
-nPNHaLsza1WL3pZfyXlfR+irUBwZ1W7iwcgH3Ts9YHuh7lR4eIgHHrwNO/7KUWAG
-srf6j16fluCsSctn30nInHPbghApSt3mxLVBz2JYL7PP5gGE+/Fj+tn57y291Hd5
-WSE+2PWtKnzyUlvrhdWB24mhPksresBFJkUznhkmngqzRh0+McOiFo9aFEjuhnGC
-cQR9i1VbUbE6g4Q7P/gK4t44Ee4FvCS3/TjdpjHtzl4JvY8Wd9nNVCDbvm7y+RIC
-6sCIuJUvc1iLyuCSYJtknSkx7BuSfE4YZmuMXCXBOpS62I73feqghnent9ArySLr
-9dxtM+fDeZ0jKodjQS/inEYmSKE6mCCLcyFA1fT0j8tqx8AQTrl/qJRUeeSidz/s
-fhLWWvbhJ5Y63Uecj4IO75wybRVRCLHVeAPwRw4T6VMb89aLvQtN9U1thKEjpxBT
-WVo2yO63qd+M6oajuQ7s3R+3AHt4k6Le6tAl3ifQsecLqtnOJGG1BI6ueBE4jRFB
-ueh2TN2c9Rb+IMO37sbTBqBQfGHf2kHCQxjAV3xK8xU1wuLYB6jtxvq4wX3muePS
-pdypAxUkspvld0NX4I7l
-=IvC/
+iQIcBAEBCAAGBQJT5nhNAAoJEC7dUkA7aK9HVToQAJIreImzkHhb0RHfKm4SN66x
+DpPeDRmoCfvrrinaJh8s6rW6aDoEbHrHAuSKUAdwf3NXDxk9omS2XQCdNkWlvzaF
+Og1SPhB2PD/bKiNdJtT1uhTH+klieN27sLro+h069GKJwt9ejW2QkiDA0EeQ7i8Y
+MCVe/VXK4vgvR9qrhAadS1SuUIpXNETSkW9V8bSMYT+0HwFh0ztjTpwNSH+ELNos
+FwGMDhcD5m1REWwCNpmQUO+5+R8i7YaDKyhphTLM6KMyFWwpDVuTpBhiLEHaopOr
+787Z2ju1CjdxYOZghlH8OSVenYjSe2m+fZDWoBLjdG0bFocujVTUcXH17U/nyVqC
+ByGo8jvSjji4v4vUhgyOYYv3zrH5WEvqmoSaAH69j39NxK022fJlk/nXP9OySZfo
+IUOCxgho80d+waETY8nXImncsBvQI38Wg7GNO4kiTwlDQGkXuKe/JCyji8yKa7/+
+teFGmwFC1HBjSxBAFvesgd/Pqv3ndd/RgUxxr57MkKU1KSrpMFP08DcPg06+fTCY
+JV4jIrS0qrihW5zGIBpFVGpaSDvqsJQfXZWOjpGhlHh7sP0AttxprVTK/K/LnHER
+ABJSjzT39+L4KUn0258Ci5pragTrVaOnfSZLBI2yopQQ/5Gf8HQhyyElH8OJ2bHQ
+GBxPC5dqtcUcPU5Du+Pz
+=wYRq
 -----END PGP SIGNATURE-----
diff --git a/sec-policy/selinux-kerberos/selinux-kerberos-2.20140311-r5.ebuild b/sec-policy/selinux-kerberos/selinux-kerberos-2.20140311-r5.ebuild
new file mode 100644
index 000000000000..7280e667cad0
--- /dev/null
+++ b/sec-policy/selinux-kerberos/selinux-kerberos-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-kerberos/selinux-kerberos-2.20140311-r5.ebuild,v 1.1 2014/08/09 19:34:37 swift Exp $
+EAPI="5"
+
+IUSE=""
+MODS="kerberos"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for kerberos"
+
+KEYWORDS="~amd64 ~x86"
diff --git a/sec-policy/selinux-kerneloops/ChangeLog b/sec-policy/selinux-kerneloops/ChangeLog
index ecd78f6636e5..dfc0540737e9 100644
--- a/sec-policy/selinux-kerneloops/ChangeLog
+++ b/sec-policy/selinux-kerneloops/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sec-policy/selinux-kerneloops
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-kerneloops/ChangeLog,v 1.42 2014/08/08 18:49:30 swift Exp $
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-kerneloops/ChangeLog,v 1.43 2014/08/09 19:34:42 swift Exp $
+
+*selinux-kerneloops-2.20140311-r5 (09 Aug 2014)
+
+  09 Aug 2014; Sven Vermeulen <swift@gentoo.org>
+  +selinux-kerneloops-2.20140311-r5.ebuild:
+  Bump towards r5 (fixes duplicate context for hiawatha)
 
   08 Aug 2014; Sven Vermeulen <swift@gentoo.org> selinux-kerneloops-9999.ebuild:
   Make 9999 ebuilds EAPI=5 and transform to make master for version bumps
diff --git a/sec-policy/selinux-kerneloops/Manifest b/sec-policy/selinux-kerneloops/Manifest
index 646e7dc3113d..809b1b3c13c5 100644
--- a/sec-policy/selinux-kerneloops/Manifest
+++ b/sec-policy/selinux-kerneloops/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-kerneloops-2.20140311-r1.ebuild 403 SHA256 4aff3404ade9074edce3c091afadef9e04832c7de08be24096e97e31fed55db1 SHA512 c0d8ef7bb21e747c5a12731e83df6e95368889a46528b9da5b7c19572800ba8a870950b0bd2eed202ce20112c1927c194a08b6ffff06adb1eec96f4d2c61eb88 WHIRLPOOL 872e84d875724ba8a2bf12ee24fc829524477df6cb0ed05e12879312fa615251d04369c53ca0cc2db63aac1a8e4ec9dce36abd44cbcefa472ceb010db517eb70
 EBUILD selinux-kerneloops-2.20140311-r2.ebuild 403 SHA256 cda3f1ee30ee2fae1fa297a979ac4d73e77c9568b7dbfa57802142cab1f849c3 SHA512 c40ff321205ed419e0b7280789d1e8c5a860a2fb94c0172f2507762cb0c57d1d29c6eccf2152dc45ad960a4d9ca162e41e414ed2eb5b10175e7971a7a83159ec WHIRLPOOL 1c3d70242239a196cc7c32074cced411b5930f962d4ec1fbaee9c35e61bfb8560d61fdd9b9204a4606cb18f1b45c6458655e8fd50248f9ff94a8aa403f0de472
 EBUILD selinux-kerneloops-2.20140311-r3.ebuild 403 SHA256 31c70fd84493d5d23c3ec545dafbc04a8db02dad8e0b1ffb631dc52755f61a51 SHA512 4fee1cd478a39566ca527c908542f86b3c8865a3d3274e509d09d4822ae1880a8db5b872634795c7558a84d6e65fd2f46fe1e5c6a65fa9ddbc404d13be5f321d WHIRLPOOL a77cb42d4ba1656f6ab1882c6a2627b2ab6b287b068d497e4517c133dc96a6003535427c0bfe2283267ef1ca57c2335990186ae7ba5bcc0afd518ad42bbdc18a
 EBUILD selinux-kerneloops-2.20140311-r4.ebuild 405 SHA256 f365db32d0e162d5af2e0571fbf15c36b688bcb83fe529e3a72ac1561522f700 SHA512 119f2a973ba940388f7af92a2fdc926f9f755cb47f0be6e6a5cd195f02a4f4e58de2a3a28619cd1705b0d59cd3668cdd5dad60843e716f12b7e232d6d7051ff5 WHIRLPOOL 4e55d74cd5356be3080cd34bf8ce6627a935ce358f21f14fbfaf4df6a42295f64be4fa0811bec3cd7ad184d4b49176ce35a6bb65929985885425cdb136fbecd9
+EBUILD selinux-kerneloops-2.20140311-r5.ebuild 381 SHA256 eba643ddeec96645dfb7e052b2a1279540f95575a6bdd376a9fbcfb6f3ac4aa7 SHA512 766b35cdcc3cce6272c5c94c9076cddcc971094c7b784e872633578536e885ba9a075031ef7aef1d1e0b9f53431cfe64eabdccb12ee8ab7fd3fd9c1decdfbeb9 WHIRLPOOL 0359e5a62e02df76308959cd23e034f48acbcd81256cd6c9ec3ee47121d6ba4c16df323d0e66f4f957ac39b5442d2e7b8a3ee0cdfce73af618cea529f4999954
 EBUILD selinux-kerneloops-9999.ebuild 361 SHA256 d555857ee0284479810f8d0161a6789159ff018e9e8dafbc8ec16c2f11ea3b1a SHA512 e591ec9dd24ed9f2f41956e9a9554e9f9967f5bf02f5a89df8e5380707daa9fdcd8e41a34aa31134e374d1e81d4a67eb051f49d52d8b537638268f2a15eccdcc WHIRLPOOL 8e0accc8e9d14222e060cb14bdf9e6345a35980fbcdf6469c506cf76645916ea1c2c9f9cae89a8878b72b999b8acc75aa981ad893be0ba99c2e64d0d03f461df
-MISC ChangeLog 6826 SHA256 968da6005f959ffa2dfa1d238ebb057ff818f5e69b1ca0fd6da4aaabc67d7b29 SHA512 4d081ee2f682092c9705946f7b18f22666906b068501e199b0cf15e342c9dcbedb6503e417eb9d907514d5cae7aaaaac1a9ab839c817dcf94aa572dd4e5dd92c WHIRLPOOL dfb3bace27741b45811a36fbe144e435baddf4fb33f640386b1aadc1ad7b190c462178a72a56dfcbae5a298ae7779bc47d0301cf29eca36c6f2575e7f1bb7e66
+MISC ChangeLog 7026 SHA256 95b7154fb2e9cb14c07f1bbfdcaffda537589ba9feddaf6d7d072c2076db7bdc SHA512 ad71bd138fba2a53d5353309aab97887419c1a87df5777230eb83ad322a45e4708e8e296d0df0c4c1d55c6fabafba95765703ec88d8514f86c2ba1cc39cb92d9 WHIRLPOOL c633b0f61bb673932e2a8ab3dc940e4894cc4b956b0636725e9047fde29a38753f46048883c8b19c353626a0623e3b1dbc127897daf44475469462a36e482d12
 MISC metadata.xml 234 SHA256 a723114d3f175ac4e1ad7e23beb37455fc6f014bcf087bac22db2c1ebf1efb05 SHA512 bc5703b8789e6837e1675a1189c9041636c2d25ccd1bbb4563e3ba971e7d3b8c67ab622920872f7e328d3c22c3df3a87d261b5b33d6710daad3d44fb5909a9a7 WHIRLPOOL 094bd362fbc84500fb8c1cff528e39b78bfcfda8a8efde9a532910d721a8eec75f952b281053f9e980442eafc1a46c5efb42c458336d5537a668bcb9e04c0e3a
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0
 
-iQIcBAEBCAAGBQJT5Rx5AAoJEC7dUkA7aK9HTOwP/18AfFf4lSe2GiYxV+CiEJ3r
-r4sHuRsmXDO1CkH3ZOSasLPdRrRJCYhGirYY2RbxXXtgFGhrcWWr3FDdr1TtBHti
-dDb0PUanzXnFRNNHk5d3I4CfUhOk1bPA6kIHLjSLnd5ptyTr74/ZSm7XBYqKNQBe
-PlGdLYDOykMkvSI8Is5v70Zw5YIWCuXYiU4p7Y2BwjJPzeeioa2ZwtwxsnVq76Dt
-834E/80CQ3dXYpgU3h7wKX2Zj1EYDS7smGpQ3w9bsWR1iLXJb0ggwofpxFRKcQWI
-fUF2hw2Qrh2/VRWhO48VNq4C/PYodX0ROvQaKncR9OE0iLOhpy+Ifzgd7vKJ4T8U
-FIPkYdGG+i6kxjojgVJtZCSNfZuJTVU3nslJvjwhTI0kphnPDwJelsrKk68q4799
-e7qVuazaZXLYOw/4d1/3LmnumD4rmv2xelkSy3EoIsgVr0shQTz4rqGU66F3IN2U
-cnFmCmbohKIav1gPmI8FMfEVevTMwrtR9VDhB0cWXMZgLaDbWpagI6bb8Uue3jAl
-+JdQ0XtWhmKIGtCiyzNUbcBwuqX6i+Ac/Nn//NpLsosr/P2h5/ASgiDzS/C+wG2y
-xt9d/zdpGm7zu3HbGcpadSBUrOm8QHBTFV0xEU7LD5YIxFCiK3hGFhdVnvOdMVhB
-9Ejd07RGQc88KnSW2O4a
-=wCmI
+iQIcBAEBCAAGBQJT5nhNAAoJEC7dUkA7aK9HWlgQAJag+S5yM8JKcRjafACh3ibm
+A7RUwF9zP3/nDqLopuoxkb/Pvnd8XeGBXYY596wOW599znT9dMULNxbzPxybZ2UG
+7kAMNUHM4/TQ69hcMr8Mb3CsjMjO0GTdGMsohm4kAid1B1mZlzBfiTylujRTcbT9
+7hsGAbJy7+q1L9FOXP13kGprYyzmicHWDgy26sIuuRZBwxpo7mhVkndhg7Xg0zwL
+2Y0pzh5f+8pmx0BCOjwgzgVbfYyM74JvEpOBqZNQGbDUtvlOQzozbSsoXFlXOKck
+arPF+YyLSEPztisouxr5AWJ92UQTD7BTL1mGKNbYIw+Y5bao4STGdExxf0m2D025
+8ZPnChAS46SnSfMwKr0hN2D/czG0osrNSUewGoiqFzxSnk+7L5fevKBNGyt+oydZ
+Ii+UCQ/ZOc3dEaZDuPNbYryqNdrKApImdcyEWBU9xfHcDKkrIXG62NXXEW1N5u5j
+wBN5jxhJgdliL+m9LzWqCa6qYZ6ftQYChkuGqyS9tG9UOCY1L32l5TsWywhNo4tN
+rYyEPFemyjrZ/QJjjcPS+t1Bnrr9Mmj5iIa38EjCcldKCArbYzl+GrcuZkC7ly9m
+oo2cFYAuk55r6Ql7akyvEiaH6alLwzguMLm+qHZ3IaZQN71PAeQ7A3ItdlzVhDS8
+KzS58X35y2DYcF1YKmw5
+=0VTk
 -----END PGP SIGNATURE-----
diff --git a/sec-policy/selinux-kerneloops/selinux-kerneloops-2.20140311-r5.ebuild b/sec-policy/selinux-kerneloops/selinux-kerneloops-2.20140311-r5.ebuild
new file mode 100644
index 000000000000..4e0c1fb7ddea
--- /dev/null
+++ b/sec-policy/selinux-kerneloops/selinux-kerneloops-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-kerneloops/selinux-kerneloops-2.20140311-r5.ebuild,v 1.1 2014/08/09 19:34:42 swift Exp $
+EAPI="5"
+
+IUSE=""
+MODS="kerneloops"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for kerneloops"
+
+KEYWORDS="~amd64 ~x86"
diff --git a/sec-policy/selinux-kismet/ChangeLog b/sec-policy/selinux-kismet/ChangeLog
index e05d676fed24..bd6f995f0d2d 100644
--- a/sec-policy/selinux-kismet/ChangeLog
+++ b/sec-policy/selinux-kismet/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sec-policy/selinux-kismet
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-kismet/ChangeLog,v 1.42 2014/08/08 18:50:04 swift Exp $
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-kismet/ChangeLog,v 1.43 2014/08/09 19:34:15 swift Exp $
+
+*selinux-kismet-2.20140311-r5 (09 Aug 2014)
+
+  09 Aug 2014; Sven Vermeulen <swift@gentoo.org>
+  +selinux-kismet-2.20140311-r5.ebuild:
+  Bump towards r5 (fixes duplicate context for hiawatha)
 
   08 Aug 2014; Sven Vermeulen <swift@gentoo.org> selinux-kismet-9999.ebuild:
   Make 9999 ebuilds EAPI=5 and transform to make master for version bumps
diff --git a/sec-policy/selinux-kismet/Manifest b/sec-policy/selinux-kismet/Manifest
index e314805db0a6..94eebfff320b 100644
--- a/sec-policy/selinux-kismet/Manifest
+++ b/sec-policy/selinux-kismet/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-kismet-2.20140311-r1.ebuild 387 SHA256 16db72dc792f7ca488b5e14aa3d4a09dc8dde0ba0f1c597e3196bc95a76e4939 SHA512 eebfa2ae675be2f68a98fd7e85014f1966236fd87ae5b157bba88858054ff5afc1f4ab63775128d7972fdcbcb48405cacbe43ba5613ff43bf9a4458e94ea23c3 WHIRLPOOL 1a888d4230aa3399f623214ff9b9789299f11e9dc091c000d4cfec3025406d74c0915b5be7086fd8ec319b303e404823a5accd791980b158a2fb6d093687aa33
 EBUILD selinux-kismet-2.20140311-r2.ebuild 387 SHA256 9fbd98514fa8b6ad28112afdaebf68b7a83781e837dbe920b8368accba5ed0f2 SHA512 fa7129da1bd75d1afbd3cf398075b5d103db3855e536aaf859af68af2f267390e7d105c2c447067ff34ab5e14afc3de15bc5197f18b255628b9129479697ef0f WHIRLPOOL ef0a295c9d63251f4456c17a46043e3c6235cefe108db5ecc95446c922124bf6c9b399f3d8455ce589fb8648661f747dec92e8fc95df000b706cbab4087d640a
 EBUILD selinux-kismet-2.20140311-r3.ebuild 387 SHA256 072cc2882ee86d12cc70abbf702cb175fa23fc298df048edba387961b977b7cd SHA512 1a2a22b16bda28c200a80528fe830a370ddc04adbf9b8817b1588c76175a80a2b4404e3d21900d8c5e83db58804438a4a01de666e57db5e457a0e7df9c06a392 WHIRLPOOL 25951b7db07b8d576e222fbf1f5ef7689243bee9a94c4e6e6a0c11715910f9bee0d80d0e9520d835024cd33a5f6439727ce940b3023c80ce46fca70f4f8fa0c5
 EBUILD selinux-kismet-2.20140311-r4.ebuild 389 SHA256 16aff833d2920dc84ee34acf9eae508cbcaa55f9ef70715f21c1064ab2d00d19 SHA512 cd370ae7460387d1ec71361e6353395e634a9596cd7879233b9f718d32667e7339bb84b41989b56db5ae3735f4ad32586036ac4f6bb502e767f2aa01cbc6d854 WHIRLPOOL 7d6905d8e08504180ae2e87a69e84fe688c93b79f7e8de0237392e9295608627423bd44c80bad45a5009c4e2e13297cd6be7e0ab0defa6a31626a2dbf3f35f0e
+EBUILD selinux-kismet-2.20140311-r5.ebuild 365 SHA256 c3e6baefc699ef0e597a53b2c31ad7e7eece4a36a753a098bb98162b351ff07c SHA512 09b6f57c085fdd5503f92f131463c301ee6c2b249940a0a6be508f6fe40d7bb29be028231dd14245050fdf3a927dcdb531f3a2c50b73be5bc0d680dcbb3765bc WHIRLPOOL 14a116c799d3dc6d12efe3e5b12ad9501df1192403fa094fc6fc32f7fd6ac826a6d3a8ac784d393bc59bd982dd845de60fa928cfa70579b526f6b48af1b12e6f
 EBUILD selinux-kismet-9999.ebuild 345 SHA256 4bacc33b4c623bee2b750ffec8da0c538cd1dbfbc71c8b4227491a203501e7b2 SHA512 1a16cc959e8b37ba1ec29f98d9af87e058f6c82b3fa5bd898c1d4313159eacab30ebd27ec985691a120c332828e93c6d44226484a89126aa5ccd139832579d42 WHIRLPOOL bccf8e2d07bb9d556093b5344171d16b3191c39d79f3b42ae7ef89b88c9465638000712fc324b00b95a36ac459e9ff24a3e1fff22610806b2395a8fc004f88f4
-MISC ChangeLog 6512 SHA256 f9bc16316bc7b8d0071c302b6f3f4e055df2bdfed0c58828da79f3c3d9bb220d SHA512 03ac71478cbef18d0fe3abdf6e86bccffc164119de9a8152152b1d8cf563cc8781dc6895f7a1b3d12d31ea591c365775df52017387ed5ceb77c746f964f94dc7 WHIRLPOOL 45233187b2177b15aa38e91140b52e3d5d5bf0f914bb02b490f999ec6b5422ca5f6d7faa26505d40c7fbcbc7210bdab021ffcab4bf95ab4e2282b3788c8dd9ee
+MISC ChangeLog 6704 SHA256 f7a5d051f22fe44db25ecca02295dde1633c164093a1d370f3a3eb7f5f805677 SHA512 737207f821f7918822375aaa2554196dec04fedb49ac1784f371a94bd337f85b937ffa3b3037c7ab60c86ceeb6c1c9819130e9511c2a15315ebe3ebcc6f65b38 WHIRLPOOL c3f54ba4ae1185282717198a8725b9e06090a89ab40419235cbdafc4eb6039bd3b1584b27da97ab8ebcd19ceac46622b84c046579647d2b2c1b37ce107ca53da
 MISC metadata.xml 230 SHA256 4b693a7af5000f3560b7f9a07f0db2f278fcc3c750f0ce2b84a52060ae6be6be SHA512 d889a873709b986012fa001410be8f3af7d92eac72ce0b344feb8df32ad8a6c4c4d1d428d273600216b38a4dfbc889250af70cf884ec69c1e8628af879b45387 WHIRLPOOL a70f267111dd3671b9a2db61c41a6e30ed9e3cb64c12f06d7b51fe5a333ecda5a9e08a281f0b287ac3d14b62861479cbb66e09353ee2f76f375bbef346a4502c
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0
 
-iQIcBAEBCAAGBQJT5Rx6AAoJEC7dUkA7aK9HNF0P/iJlBhdxT68Qr7EgieXWcsPq
-EfxquPJ0Em+ilDyUbmOyfe1BXKL2vyXBDVhfc3EmvOMIznLybFIE4jqOkTsVJjnX
-VIDCQm1hjXEWwJUFnBHI444+gXzYlxpv/vmqRaaH0wq4rxVVGs9nTrQbFw7MqOQo
-1f0tyS95+4ujfJZIbKI3tTe6u/sjwQTkBdKcCHXFVgtXTP1Ee/bMCoJSuPVqXPzg
-x641b96UJF315FuGcktx4epRyuFQuFBxKB1dAlxQRMKoNYR9t+V57sDlPc/F/SFq
-5PIiWB6i3DIXMX+RQ9QD7zcZzaaAw+1f8u4Qs6usHr/dAfFyZmlroADNsKi1YVpG
-unsbD+cY//fArpzanabyB+DJxTzTQirwlkc05O9WcBMxOguxomKTmP6MTMOVazQK
-MW/0fYUWyG6crk7m9SAf8k9Ml1N6wT1yvxcqkSkSBz2AUqDhx/DcmVl8cGL7t6iq
-jvs8Zh+w4Y7dnmGps3iw7Zsc4Lb9n8ccMxP+8l6B7xQSKZYa7WCGytm1vVhnvwyp
-+bnahh98nHp+IJNGafA2oCw2O06onRlHYS/aGV7v8kIAeqdS4mkifRPUl1H03ZP6
-DJRm+Kia5KLLHgiG23waCh9EllKQDO+06GALRA02reLTgwhlyzeZ5eDfUApvMw83
-Dr7BxZ7hMIBfsqFno9ew
-=BhY2
+iQIcBAEBCAAGBQJT5nhNAAoJEC7dUkA7aK9HV60P+wWyL6a8CpWRtFmnC5MMLBx9
+wazo2ypy7qm8plsd1Bxc8RxFiDPmzdfHh8RPG/Y46KOLOtQSVxlK0BID9bZBkNE9
+WpyFpe3+EM48o4PaMEZwCnz3Sq7HcLBLHKvPjjjkRx/LYBQQ0n7XGJRNFbTB38Ys
+94emLdHmemYj+rZV50h2/lV6H5KHz4nrB7xh6Z/L252r5wadG2r8szNdMBRHF/TM
+xJaOsi5gYHgMy/+5bgWLdWn/As/ik+8r+YSG6H8coXK1nWcZf2tsC08fHyl3M6fR
+9WWiBcTHFJAUCd9GU+Ll8M064dzRDUkJJPqcLDlboSwre3O0ZppRZdDK3MFBbF8q
+MVqUhc5v9KcVIN74iY6wzshiqQvyJTvANZvYi6btHWODEB9/GusImKD6bWWhzFOu
+yd3KKVRoDSwhvToApqYB9mG/7KEtAN281AzzncvP97WvVM5d4uBQg3tKIt1tkLaW
+a6ijsMUzGJ00tl7lE9RlDXnsjh6MhSQeIZv6jIHRg+VdSUL2e8E21xKEkN8kSXCA
+SEygee/m1g1/fh44fqgiCNENMu6muyyaNH+ZEZGFm+zt4wPXj1U34KF71WpDbQCH
+IVmGzvdGhiEbjzsdE3BbsDa0S6KLzY9IXHdJchR3wPwWWgDmsdf+FjNK2D7cr4qd
+H4v84sBiOD8RBx+WSUnu
+=HapW
 -----END PGP SIGNATURE-----
diff --git a/sec-policy/selinux-kismet/selinux-kismet-2.20140311-r5.ebuild b/sec-policy/selinux-kismet/selinux-kismet-2.20140311-r5.ebuild
new file mode 100644
index 000000000000..0834fd3af31f
--- /dev/null
+++ b/sec-policy/selinux-kismet/selinux-kismet-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-kismet/selinux-kismet-2.20140311-r5.ebuild,v 1.1 2014/08/09 19:34:15 swift Exp $
+EAPI="5"
+
+IUSE=""
+MODS="kismet"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for kismet"
+
+KEYWORDS="~amd64 ~x86"
diff --git a/sec-policy/selinux-ksmtuned/ChangeLog b/sec-policy/selinux-ksmtuned/ChangeLog
index ce76ced3f92d..4b8efca99ab1 100644
--- a/sec-policy/selinux-ksmtuned/ChangeLog
+++ b/sec-policy/selinux-ksmtuned/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sec-policy/selinux-ksmtuned
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-ksmtuned/ChangeLog,v 1.42 2014/08/08 18:49:56 swift Exp $
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-ksmtuned/ChangeLog,v 1.43 2014/08/09 19:34:36 swift Exp $
+
+*selinux-ksmtuned-2.20140311-r5 (09 Aug 2014)
+
+  09 Aug 2014; Sven Vermeulen <swift@gentoo.org>
+  +selinux-ksmtuned-2.20140311-r5.ebuild:
+  Bump towards r5 (fixes duplicate context for hiawatha)
 
   08 Aug 2014; Sven Vermeulen <swift@gentoo.org> selinux-ksmtuned-9999.ebuild:
   Make 9999 ebuilds EAPI=5 and transform to make master for version bumps
diff --git a/sec-policy/selinux-ksmtuned/Manifest b/sec-policy/selinux-ksmtuned/Manifest
index da03b852b933..3ddf4159aa11 100644
--- a/sec-policy/selinux-ksmtuned/Manifest
+++ b/sec-policy/selinux-ksmtuned/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-ksmtuned-2.20140311-r1.ebuild 395 SHA256 4c4651b0ca389b7430c48e14d11b634a1b48bb2987f5c36f2c420c4c77beb0b7 SHA512 f96f81e1484d14fedbac77448f9ff9bee45528dc7b667f66014280d75840e09bd62bbfc12aec181985d529292781b1458f6c2605be6f2e018ac703be7323ed4d WHIRLPOOL 8091d46433fd566ccbb09118481ea0ea7227750853bb5b0f13efefde6a90288ce4d9f364ab15eb9c821275c69beef6bc17394f4b3f4a103e07adde06c5c87d6e
 EBUILD selinux-ksmtuned-2.20140311-r2.ebuild 395 SHA256 63d9bfc71a080b235f7ef7f6dc3211795b6c90fcecca95f6580ede2b125ecb25 SHA512 b797d0087a5df38651d332bee93533461859e8baed56971aa64d0e999da8e1efeb2cd61347148d94879913e0b848888735bf9d14e3c3cafba3a7c8710375f68d WHIRLPOOL b605b47c38bab8742f44ee7de36b0a4327a71d7019f177fae699bfe4348c53a9a30ab27d2aa005c3426426160de04ef36a8b9b0603696395f355e4c9194f3536
 EBUILD selinux-ksmtuned-2.20140311-r3.ebuild 395 SHA256 6e17cd6a2a44cd74660b53bad13e65682aa27e8190cee130cc97a9486318a3fd SHA512 88d04b1e263b284ddcd036a32dc47677ae853b17d51bc9bcc9d8309b599a93ba833bc4e42f09727b422e3d853cdcda9b08a735b8deb04de4b405c4984a790f6e WHIRLPOOL fd6295ae45a48e7cf533baeed311eab7267f5ae3b9499b805b667ecb9a9c4682bd6734774f710d7d6c9c79dbceb2ad5f6cd0291dc7f22f40a7be2b53ec374bdf
 EBUILD selinux-ksmtuned-2.20140311-r4.ebuild 397 SHA256 f9dc978c977da32f61284e3a08a7d9c3a470f9bc661bee319926aa2e6661cf56 SHA512 66abe72c62eda016f1766a23fff8d183af8f30fe2cd9b79460b8a9eda067040de9b08272b80f1a654c3fba063eead39759af84169e6bbe679bdbb9d1822bded8 WHIRLPOOL a0cfcd91ddb22af9f380231aea46e49cfa7cb23279aef343a0923b8078d5a395370e12c9ac36227e50c69b79b58bd0e9de6abeaf49b1b904e229a1b156d0f81e
+EBUILD selinux-ksmtuned-2.20140311-r5.ebuild 373 SHA256 694ae567315fe412e07322c898d5130c738603b73a5421a55acb20cc36195184 SHA512 a38218983dd5a98dfbc03ac80b25520f4f0e3a6555a71ec32e169cb472963ba91008df6dd547d0b76d49775b7f4ca42a9ac3f679fa2140cf9baab455f4f53d5b WHIRLPOOL 8b1c17212b0911912f34b39d82e265f44f3c8d9d90a291ececcfdcdce84b5e8d70b7f0dc370d2a41bd44740b87449790fc30c8073c6b138cf1a85091b2bf324b
 EBUILD selinux-ksmtuned-9999.ebuild 353 SHA256 9df6e5be311adbfec72f111957b41770b74daa050a99462cc0a2eb4a1ee10033 SHA512 94126bb8fe23e9ca1715dcf2f8f1ae2c83f6a9f6625f46e2a5470b410da08f8a560e6785bde25530ef08a4f0fdd856abfa557d12ff8e5d8761501c03e97b99ef WHIRLPOOL b40ce0be79d40770d93cf55537021423bbc9976d172582be9b66bdde462628870a13a74c6067d86c9ff07a9115fc5ed502fe39ce5b8bb67a9837bd1fa4d89987
-MISC ChangeLog 6672 SHA256 9f93b544a98aca57bb4cdabcbeb2d2c8669792669b8b1bbfdee820f31a36a708 SHA512 36d7f11e54a2ab421712e98727ac9ffce749a1a129204ebc3d67bc9bcb2466a0c294b12077d9f750e4335fb9bddcd984088f6c9342f5f847bb01c08bfb132236 WHIRLPOOL d92eb2d3686f439626d3f26c379f6e1db1ae9e4582b2fe3e9003b84b9971de9beaee5166d757fa7e517f3cc9103d53184a0d2f7f6d1c5d52f21ccb8e01f7d377
+MISC ChangeLog 6868 SHA256 eb0f3ab37defc5cef36ee6b9634ad488b9c9b789bc53b5c87e039ea58c5a98c5 SHA512 ded9c8f2ea937e106550a63142073e08b714c09f70fa4ae297f88ef2b3deade44670357ce01d138269f2574fae6e566c8925e7069848fa7a6ae52f2ab96640fa WHIRLPOOL 8950da19ec5518da0a8fcaf9fd63869ffc2013a2894d18b9a2d86f8e53a954c3d4d5ddf41a935c21bf4e7e8248e090f2ef65438fcc09b06f21c1c0a51c63b958
 MISC metadata.xml 232 SHA256 f1efd618b6b5b29e813fa4b440235661ad526dd36d371e8c901b987372e750e9 SHA512 fdaef15233878f4b8785a1f98541c4ea7d16b667d7c2e866c777c1ef5ab67b8a426a9db9bb64e43b14c2c3f7e28d6670d90925ffca29540edaf62fba72b448c3 WHIRLPOOL 2aa838ef9d78ed664fb5cca89496e794ec5acb31f26d8f19f5b13bfb883b6433f548011aeef1972bddca89a6d12b87b3ef8a57fde86c7dd9c71fa7a75a83cf74
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0
 
-iQIcBAEBCAAGBQJT5Rx6AAoJEC7dUkA7aK9HimMP/2Nr5QYL09EG2DoyZWDT2crU
-5jp4LlQtn2gHFnYbvqDOn7VHe8pdwuwvKot8vID6h/cUA4cmXQWCMgVrupqCyEID
-HtH4k92MD2uvSGxneX7WUjk4YLYiLhgAYm7L/rH/5mykILlyPp2mncP8CYBNa8p5
-kXZTUPGMtoJfvQB7L19Ams2Uh+nlZkIBLM9iR1mAoCyS7NiPHHuAURTIVa0kgtpX
-inhDz0Y7a/Sx6qNrHPB4K5t3S1YPlf92wPFB4Mytwu0CgOEyphzS0H0BTU9Cilk8
-JGDdMgbmVdBdnkvh/MeziUjo5rPDjbp2CZGsDbaiBE0tFU6E/kg9dgP6NIKVziVa
-JhAi7NBPXLG7HABz3A93a45bf1Le/qNGoQDUZzSrhLGtWPxMEK77PyKOk6lftC0L
-kSkCF4UmuzCw/9y4s29ARcJ28OZmgRdTxiMfncn1CJ4kNeNTf69yYrBVwMa89drv
-oZ5yUiQyqutlS2BZE/IXOmaQVKnwtq1crlKgjv3yhU+TJ6ovQ50g8QLQOxXKgtMx
-VUJRmAjI8KflMt0VF6ip89AZnvNaJgMGPlnwJHyGtcnLk+lKp8JzMi7ZpZrl2a74
-4Z6wQb4LTzAltMSKJnJuWcI/0W9qiT3sBpl0JB6rcLqkf8b4+MMmNgHIIm/ky4Da
-EQNWowlkhEJ1Y3NlcfzZ
-=lqsj
+iQIcBAEBCAAGBQJT5nhOAAoJEC7dUkA7aK9HrlgP/0lr6EAnP9A+YTKiRZKENovg
+JMnJQbJbVEtZtVWi8KAUK6uvZWs3JIWLDrsUFvpBDjeZcmX6IjvdzL9Ntj8dUHTT
+eJzQRJjA5wmHR7s5tLzNOcp8XK53NSu3LxXgokduJTHJNpDYv1acAXM4BydQ43xR
+YHaP2pyf9Axe8ayNTxnuotM3N8IqaTzq0sJth/KyDUfTWZ/NQDf3FdaXxDQObgon
+7k9hZQbMEmKqsG7/WH3ypXEW2C4JeG2QSHkoInSEDRsAlSW//PmER0Su5waq/Bq9
+UQSdRDEh7CXI0eMqWWfVLNjhWet4yL2HrPOz1zTseBsgMlHr/wIZNihQNIpKdDoN
+ugFXVFmHr64QGXw7W7o+ZBjHsBV5Jo8acwno5ZRIGbk4wGJFOOBIXtD6A8E60fOB
+dQUd9ptW8lNKwKLdBPbxx8uMjZr9IOShu49lO9nfIYqkslPo2hjTFeZyQikTrNHG
+gcZOEmNjyeG+vOORhk3TpwPQCLw6OfDIbk059IXuSEnQwhZpQEPuU2kyf7h0ifM8
+AEKgjHdttuQDztzugl1dP2FPv7hykI2HEN3L9RogrJuDLMnoXRIB3Pm0Yw7uHdql
+e0bDlnuT6oizP24xzXhc2bV3rotbEl9HmKHjNVMDiNY8Ku6jfCMXoNeQSCYOAn4y
+3kmh7bW8Z0vHTeMY49Km
+=RY6D
 -----END PGP SIGNATURE-----
diff --git a/sec-policy/selinux-ksmtuned/selinux-ksmtuned-2.20140311-r5.ebuild b/sec-policy/selinux-ksmtuned/selinux-ksmtuned-2.20140311-r5.ebuild
new file mode 100644
index 000000000000..f43c37b90092
--- /dev/null
+++ b/sec-policy/selinux-ksmtuned/selinux-ksmtuned-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-ksmtuned/selinux-ksmtuned-2.20140311-r5.ebuild,v 1.1 2014/08/09 19:34:36 swift Exp $
+EAPI="5"
+
+IUSE=""
+MODS="ksmtuned"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for ksmtuned"
+
+KEYWORDS="~amd64 ~x86"
diff --git a/sec-policy/selinux-kudzu/ChangeLog b/sec-policy/selinux-kudzu/ChangeLog
index 73336e749cf4..df09934db34e 100644
--- a/sec-policy/selinux-kudzu/ChangeLog
+++ b/sec-policy/selinux-kudzu/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sec-policy/selinux-kudzu
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-kudzu/ChangeLog,v 1.42 2014/08/08 18:50:04 swift Exp $
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-kudzu/ChangeLog,v 1.43 2014/08/09 19:34:30 swift Exp $
+
+*selinux-kudzu-2.20140311-r5 (09 Aug 2014)
+
+  09 Aug 2014; Sven Vermeulen <swift@gentoo.org>
+  +selinux-kudzu-2.20140311-r5.ebuild:
+  Bump towards r5 (fixes duplicate context for hiawatha)
 
   08 Aug 2014; Sven Vermeulen <swift@gentoo.org> selinux-kudzu-9999.ebuild:
   Make 9999 ebuilds EAPI=5 and transform to make master for version bumps
diff --git a/sec-policy/selinux-kudzu/Manifest b/sec-policy/selinux-kudzu/Manifest
index a7919a785874..352d6c3c3f9d 100644
--- a/sec-policy/selinux-kudzu/Manifest
+++ b/sec-policy/selinux-kudzu/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-kudzu-2.20140311-r1.ebuild 383 SHA256 f09a9f652bb5b5e4e3c814f8462762147a8b6252f7fe3eb6a8874ad1f42ab2f6 SHA512 86b9f1feae0d3815f371e5d50106cca7cdcd40a4b44a4f9ba01b5a48de8dfb8ae4dc0c32fa158149a5ef037bc1fd07259201d2c3cc9c856937442abd208eb9ca WHIRLPOOL 1413ef8a0a57eb33b4a1be2661f41a806a9b17ae14046bd1daf10a0773503aa2c401a24c8475dd47ae6bd528bb4100c0edad9950832527001f143e0f4140954d
 EBUILD selinux-kudzu-2.20140311-r2.ebuild 383 SHA256 6efdf3f019af41d4c06f27c735a2ab1b3a4a127e21f01afd26af75e630c1deeb SHA512 466032987932b8721cf388aa30795efbd31bfe16ee267328b39580cdf40e897262e26dc3e393b203736b3484f9c6a785364ad7cddfe8ffd737f26d7acb8d3238 WHIRLPOOL 9cb2578ec2c5a416d0f9998630c23bbd12ec5dab9c962ac49cb28b7a2b0b1db2decef239c6764d4aa84d50dc83f323d3f7c29c35f6edd4d6d15006336eafd4e0
 EBUILD selinux-kudzu-2.20140311-r3.ebuild 383 SHA256 b4c5e99cce4a43aa4ce55f27e884556a15baddca8e4ab015ecd1ab751a6612db SHA512 bc94f7d3e93efd1e61c4c767ee41c2ecd7b89402d53f22c281c251c5dbe5de23a7935d6a37ac8a6943a1b89935c40d349db647a3d2e31f504c07c60d0356cdad WHIRLPOOL 4494b8c68ff8b93fea5461208615056ae668231d980365c5670ebb8f1bd0be02ba86a9a1228a62065f929818a626fbe7d131bece4cf09f6f0ce702156546a8b4
 EBUILD selinux-kudzu-2.20140311-r4.ebuild 385 SHA256 4f3132ad42cff001e429f28a8ad1d3d1ca7df8fc440392661b3932ad4b1fa230 SHA512 e6d2c7b7295871998c5bf19cf90c0082bb4f39da36ae30ae584084dc132e28793028f0fd4cc8dc33a277207984da663e8256c9130089eb557f894904af8350d9 WHIRLPOOL 12d8f7a1820ab8f33bb93bb6f59745eece07fc802425afbdb9abba1c9800bb3c23bcc5f146fc2d3ff7d6acad302ea1028f92c86ea90e152c1c1c09a902987d7a
+EBUILD selinux-kudzu-2.20140311-r5.ebuild 361 SHA256 8b6892a294a9f999d01bfc54d193691a955276caa13083b13ca33e80e309b024 SHA512 a40a3c54282bc59911216ca30b978d880d91470147dd97c136e787b07c630565064334d315610cc9efeab406f8eded7a9f7c5d3a2db431cd51a11bbb695dcb22 WHIRLPOOL 839553d0198261c3e76ef2b3e87498472b1bef41355f7ee9895b4534bfb10d5ecb105bdffe7e25d5146c95292e7162ae330f6331726448d2e93baf8825bfe017
 EBUILD selinux-kudzu-9999.ebuild 341 SHA256 ff4f5d8e5c9c5e1eb0132f2215e63747258056cd79b01e02de5547877050d19b SHA512 29701d18f8f80a5650d4e3f43f6a810dec26076eee694774c7d485b26cedeb7f88a2b8f9daaeb9d411546900885b431289b990140d9267114cdf4bb32d9c542b WHIRLPOOL 94934e7f961a087bace0757afde3f4be787fee38ea6cd4996bef543d3b0ac2212e824bf91bd3dcf722d39a208302ad3b81f251d6cfd3b4683da74b3a0c9ecfe3
-MISC ChangeLog 6437 SHA256 1e55389757b338c5b6c45cdab268fe90bab12c3219f08cca4b4858a2e181e9bd SHA512 9f6e110bed20bf1cc17303ad29d439959c0a57d5ef0d4f0230370f43e513b65f8f6edc08f2d7da0d501e7aa4526aa4c863eee3be32537ec895fccf3f193e236c WHIRLPOOL b22824993981014a741aed62e3a4fb0ba854b75a1f48d0a52ff8cf79d4f4563383e55d776ab9208b26f959d829549eb01f2651d61044b89d3ca5843add54ec5e
+MISC ChangeLog 6627 SHA256 8d157c9d95875dceafff37ceb67ef193f612864674685ae077481677d7b362be SHA512 4d0ca8d300772fcef4b4c3748ec5a53006166574e70a807894c6b7333341283054874861d288332c6dfd945074248558b6b4b6690886607b07727662410c89be WHIRLPOOL 4ddb4de620d7fda9ff2f3e8c55c569fc65423e250992bfe4f39b9665feca736c0323136fffff7fcf8c47e6f2c4669d7da8fbf19dcf27c7c8df6f602dde895d08
 MISC metadata.xml 229 SHA256 edfe13b5acbabb2e539f1c1f809388412cd00f322a4fed6ccca60a4b2a39cd2f SHA512 4877d0344fd0f235416cd85855acd2b60ebbe5d1601a2ba88fc39dcba24df5d0516e1365022eefc8a57b3c898f99fcbeec1623f99a3514ec513454a8ce49cc38 WHIRLPOOL 9f8a744046b0e96e59cd8e27fc83596b3f001960d3ddf927028af5b6185b00dc8fd8c6c5988500660cc290b99739844d70644da53f6845ee563918ab06e7c08c
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0
 
-iQIcBAEBCAAGBQJT5Rx6AAoJEC7dUkA7aK9HP/wP/36CJa7NdmTQLrWHrdTR+R5O
-jhvym4VUmMYoIiP0EUsmXv/DNRMmvZGIqxd6dnC8oN/ZfdE8/VV+S/psrDkZdIGc
-tzvORs596w/uYIltTn3frTf5GQP5VCJHp4JW73IX1vfYLGQ2kJAl+BELVPJOrDmy
-30xoXtyLDSTVUieHdw7YUaUrPin4sQxDsRDkBa1V6Wee5CogB5mJ5gPgLvSyBGcG
-qEdzz+HJYthOygIPCqti1VqQ/V30rEk/mxSXM72pLlv6Bm1Cb3rDUJwB2bvZ5y5p
-Q/ChvVUfZLR+aq+DWoaZzzg2LvsNOld+w4B51l/u5Au1ULERhQRMap0OIn5vc5KV
-SbUvDZAkBUItRFSW+LqXLsqaE1nKBrSkQGjbtPM80h0m0pqJodqWd5g7moqdCFSV
-3J+ACvK9w0LiYgVlPaRwPDEnNiurNh/uOl0VViL8hBzqHfpwBWiapZNcyDFaUIgN
-fHVMOGvdo2hRDvTsW+80mmPyjVrp8unKmWd1D13THtcnz4nw9EQsDeay/WGiDHmQ
-D5UD6LnzuBUMjrS/0MGLFKri0JrPp+t6aGoTtisL5RDs9ygUeIuM+byurP6gYlEM
-2GGzS/2jcV1pNqgeI01Efc54GXDNZtzscPs108dmhHjNpHxQLa6/3NkXZCEx8Jha
-/zqSV2sX7mLNdnmo+4IS
-=9pxT
+iQIcBAEBCAAGBQJT5nhOAAoJEC7dUkA7aK9HEbsP/RsIEmnEQN62z+Ao5xYO3G9k
++QrTAzmpydi7nvSyKoD9hAV5NZszbjWT2godAMbQ4s29x0lQzAvY/7jryKp9OCi2
+0E9URXkKjbPCVzBXG8zgfIGu69NAtIJpzAZ1/NKV2yJ8Mxw+AOIckTO7BOVct2XG
+EK4bGpSwGBRMrw9lrHXp1xU79iQb8zySdxbiOdQrZfSA+IWKcWJuqGUynZCtXOeC
+lOU3M3g+fr5Y3IORj0ZuTRl8q1LhlD6+xZ1JPaPcmX3u36p9vgaK7Dlq1Tm8tRNr
+8oE2eADupkkRp8EjxatuQOyfOPHkl25gnpBvkPV26q9iOtyzmjUJRhpOlypE0H0Q
+7oP3SXF4O9qzvkl/iEM//SoOMQSv1/kq32Spj1LcR8GTyGb83WT9/Z9DadvMT/hg
+rqDeKeu15m1U0wCYwVNjQrwEppP89/4FskAVlytX3kP721fTGcqPd41Py877xbP4
+ht4aWRWRLRhvSUe2yFX0PNkBCpabmnjV3qmne6xsRBstvfgXpzT80ngmJIKPMGBE
+p/jmmLgu85Ed37Zp9Cl07cMVlhddKPC2QX03sCpIWx1aYO6jjIZmezYk5aVV4OEL
+VkfiXxk7OGSi+yF916NaVeUDmRuzweA+WgXP5SF0lzE/v+QaG4fuwNhNoAjh/U1w
+Hkqd0PvfKx0Uo1J5Nd1J
+=SLK+
 -----END PGP SIGNATURE-----
diff --git a/sec-policy/selinux-kudzu/selinux-kudzu-2.20140311-r5.ebuild b/sec-policy/selinux-kudzu/selinux-kudzu-2.20140311-r5.ebuild
new file mode 100644
index 000000000000..39f9a3d05850
--- /dev/null
+++ b/sec-policy/selinux-kudzu/selinux-kudzu-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-kudzu/selinux-kudzu-2.20140311-r5.ebuild,v 1.1 2014/08/09 19:34:30 swift Exp $
+EAPI="5"
+
+IUSE=""
+MODS="kudzu"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for kudzu"
+
+KEYWORDS="~amd64 ~x86"
diff --git a/sec-policy/selinux-ldap/ChangeLog b/sec-policy/selinux-ldap/ChangeLog
index 193c74862ff4..220c42aa4ce2 100644
--- a/sec-policy/selinux-ldap/ChangeLog
+++ b/sec-policy/selinux-ldap/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sec-policy/selinux-ldap
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-ldap/ChangeLog,v 1.43 2014/08/08 18:49:59 swift Exp $
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-ldap/ChangeLog,v 1.44 2014/08/09 19:34:10 swift Exp $
+
+*selinux-ldap-2.20140311-r5 (09 Aug 2014)
+
+  09 Aug 2014; Sven Vermeulen <swift@gentoo.org>
+  +selinux-ldap-2.20140311-r5.ebuild:
+  Bump towards r5 (fixes duplicate context for hiawatha)
 
   08 Aug 2014; Sven Vermeulen <swift@gentoo.org> selinux-ldap-9999.ebuild:
   Make 9999 ebuilds EAPI=5 and transform to make master for version bumps
diff --git a/sec-policy/selinux-ldap/Manifest b/sec-policy/selinux-ldap/Manifest
index 93df18edf57a..ab04c9656627 100644
--- a/sec-policy/selinux-ldap/Manifest
+++ b/sec-policy/selinux-ldap/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-ldap-2.20140311-r1.ebuild 379 SHA256 c960f23e52f552e6a9439c32a56eb9e1c62a3519f713c8d07f3a89e26148c8b3 SHA512 d6efac64cfae12e2110fcc249182fd6f382f0d614e83a243125adc6cfc2f5ad8649552d34ad0bbe3829a1517c7d1b580de5f7cd727043e2fb419d1fecd66e2eb WHIRLPOOL 5097f7c8a2b2d21c950d7b4c17dec8ae59dd92aa784b30b000b503f68c1c44251930f4ccf23e633f694e5dc39cc2a96dc271e2bcb2522301c3f9fbe990d0469f
 EBUILD selinux-ldap-2.20140311-r2.ebuild 379 SHA256 9e4777ba12dcd384f4d303338dc732c69aeb1b7711932c7d2509ba710c7f4729 SHA512 b84ff5444294012b7f4b0ef9b7e722c7b6be0f4010c98133258a20d52d7b41e569acbbc04bf48fd48aa100dcd8e1b1a61ebe2560f8017be511cafadf8a11d9de WHIRLPOOL 988c9c84d2dc68e84fcde87ec591a1bdcd48ec6413d9e54e00c236ade28950a540a496b4c9e13e7389b360fb894022ed5ce31e35c4e5214bb358cfd452a3306a
 EBUILD selinux-ldap-2.20140311-r3.ebuild 379 SHA256 fb1151a4a6a7c390c4e07f06eaa9e08743547933a8e72c791a141a281ff5dd53 SHA512 3181d0416c1e4db59756e86b32df556112a0e8fc798b54b5f67ac0257aeb18e7edc25df98ff519fd28fc3531124b754b8dc1d91119cd5c215e14b89085394c16 WHIRLPOOL 2cfbb389e840451ee43f1067de5dcfc18932128035e2ef50af58b7db99a30968336f3a314c989e34d8ab41fa649b8f863787f16f579b57801e1163ad584b9822
 EBUILD selinux-ldap-2.20140311-r4.ebuild 381 SHA256 d52d4ac083913966314ce93c28319a392ae38ceba0250cfb8eeff0e0675069bb SHA512 9d0627980be63433fb3d200e17d4c3817ce812de9d263542acf15d6a400a7f70cc54ea74232c1cba45fbbca0580a753b6317cc121bb155204cda63992c7467ea WHIRLPOOL 7925d2b0414f0ac3888f24b4b2955cc3cb4efff32ba8e90f8aa05e521687e45d0174ef63e9e7e2e76a19a4dcbcb3a6c6308d2894b09e3336638786aaec606b67
+EBUILD selinux-ldap-2.20140311-r5.ebuild 357 SHA256 6e340912c7f8d5aca02ceb3ccc2d7b4d169783c037618c8b104a535442dfae7a SHA512 b9fab78f88bc4ebae12550081d73bcd7066ee410230b4e95e1101bcef6441832e5ce77a8a8f3babdf41d52dcecec695da6c07e9d77eefc12624adbd3a0451e0e WHIRLPOOL 52dccb03e937c0c1115f860202f9db74abcf687d96377121be30330adaed9b80fd06862d17bb4462c4d75dc3600d93ad7aa93b33502277bd162747c574b2c122
 EBUILD selinux-ldap-9999.ebuild 337 SHA256 d013c1df139565821292891ccf6d72e3fd87f5326e53b55268873569d48e31d8 SHA512 a020386e9dc9dce1c05fcab936b3ffe79ea324fafa99d34d5c06615e0a2c52c839a17b75478ccf73b9614078a49168f77edb378193da6fe185001f82e2869aaa WHIRLPOOL 9f6d6a02cbe66191a8003818c9165b00d106ae27552e96f9f7d12f04d169df4ae01d084ee3144c4e4ac0593168c24d958b583b113a99865bffd18e9985c95efb
-MISC ChangeLog 9759 SHA256 acf74538d5557c518785d996b8309dd0bb05d3eae9c6f3d813dd16f4158f10f3 SHA512 dc1eca5d1fb6f63a00cf2f4dd11f6116e774abd87124de8195b965d4c1adfc7410da7f06c35a70f885a6bb73412a449809fbb40d8d47cdd7dc19a115537d5dc3 WHIRLPOOL b4948012ea5b574809b9370e3a9bb1a8f7e7bda134ce7305be2309573dcb7ace19090704b747a4ce1c2a019584e1aee4b46c409fefbac8be5b18a19c02745357
+MISC ChangeLog 9947 SHA256 d66c6d28cd277353e3bf148ae2e75c84669baa44dd97cf8efccb62ff461dcc03 SHA512 84fafd71f6d43c19a389b9a705650de23f6f937f78670c3f4eb33a18f8b96c337535c61eb0034f23fa74f5a73b149c388e9ed6c787c7475b1c8ee71b0ddf8b80 WHIRLPOOL dc135c0fcead6d92294ac13ca4d9b07a2632bb3e4329ca07c74e9c51c64d600762171754b0d3e13fd97becea9705199cb27a7f4a3cfce6718d221461dfbc2240
 MISC metadata.xml 232 SHA256 52b9b6e6d6f33940bd146eba8e36de809589263d70d3ca58d67cd025ab4a5872 SHA512 87e253fb724b3b114dd1baf2986f4486819d3a7e69ec7589aadd54938436177e85e3cff0acb00c6f49dff65fda37c98b8f4e86c840484eed9c22d0819d354f38 WHIRLPOOL 7258fde0c062b171b673b95dd5197ec580cbd95861e123116ac47d4d7e8b079614d1c965e607cf4dcbda9baa771fa33c9025fbf9428cbac394417b21d18d23e1
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0
 
-iQIcBAEBCAAGBQJT5Rx7AAoJEC7dUkA7aK9HM8gQAJb+KLv6Rs6GBE9oYBRXawBO
-/zCsCtsoXmAg90/dhDBIRelKrVyfDJeci+k7GOTmak41suz1DwFFyoINystbz47U
-12FpXabEdgoEajXC9owXQmsNO1bnnGvenu+Cc6Tib8IZMEj5oCN0CbXMr4idmtHd
-maRnlf3RllmqYFFrYXPT92+rMJK/33OURS0CDTmFLihF9s1CQLMGjLWziqFSiFS7
-exWw0qELSkYC4Xk9mtslCQq8QOLEIXIdmFxGkb4L2E9KqV04CG33cqxxKMrLeviW
-gie2zaUTOVTO9k04DMERBjJtsixXwJtZArcJXO3+cLXzWF5BnfHSWTNxVodjSn5Z
-hGKEj/sRcxNvni1NDoJ8ejlnqpFQW1gF3CyU2gLvO2F7GXKlWvseBCV7sGUGm9xk
-5onn4y4gqXuKKT6MZVXq5iyAE3B7l9CzNObWGTc/nDHiQ3VP3C8K0syX6xGqGTJ0
-X3kgbXHOKgjm/297y0PcJ6eI4dR84uybnk7BaMvmxCSXSFesAUhxVr9TdLa8Ef0U
-tY37f0xyqbSadtNRI16+VMQ8V81TOjFq5sZROP7/YSzoa5zGjOntVyRofkZq200r
-PCRJM/7/ATz/X6RrhRiQ7eDN7scNhxdXake1ZNO2xKlrnko+3WXrDj8GUc8rVDR9
-gIk3+RbAa4MjMCuTZvSy
-=GAN2
+iQIcBAEBCAAGBQJT5nhPAAoJEC7dUkA7aK9HLSMQAI1WpJazN5/DR0obP6dpfkVk
+JOplDK3O/X+JX833xVxW5SSyIS0+I1gxnWQ4Uzz+UeNJdn98UT0k2Vfy0DiRUSdT
+6+fuqR5eQXAszznPosMcYQg5q6QFcj+lJWsO3jwJQ5xK2wOIrTm5tD4CNb9iPRRp
+ZgGUQWUFbG+OYF5TFQsEWOKRMIBPv3HIYoJ8/myRIZx+gSYl5TuprM0pLcnxW9Fu
+4wExoNH6+ygH1iMI7u7Sc7T6AwplshJx3U+tAx7eqv4X8TCqaOM9p0bTHCYswasE
+pg3jgQ7QNduWIDMula1T/2JPCdJazlqxf7DiNYZYnvj29wOxGdx9gAmmtzmI7wZi
+f5CsvcfZ3Oxwm5TAZ8Uzn6AHDfAquDU/9rvIn94Fg+suHinnRj1oCkl4WpbBAS+f
+RWoR0vKrhYWp7Tuo2WPS/aKtG32t4pd1LBT3IeC2tzgcEwQFlJRAfzyevgk5r32z
+DK5nQBgrgJWMQZXygp3lhPxxLSIWGKoaGWl7VHrc0/YUkxaHIPUnmuPWXArbMTcm
+WHx9Ev04BGeLFZMEgwtfTnlNQh+BFu2f6+FJHGOzrLHfy3ETFwonsczylVtJMK8M
+LLGYfV+s92GIHrS9a5QzHdlatgxkVI4VrUXkuJKFD84L86DnPT8ks0ha7jwa6Qqj
+bAJDal9NyU4+12ofkUAk
+=rCiP
 -----END PGP SIGNATURE-----
diff --git a/sec-policy/selinux-ldap/selinux-ldap-2.20140311-r5.ebuild b/sec-policy/selinux-ldap/selinux-ldap-2.20140311-r5.ebuild
new file mode 100644
index 000000000000..693cd52b0240
--- /dev/null
+++ b/sec-policy/selinux-ldap/selinux-ldap-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-ldap/selinux-ldap-2.20140311-r5.ebuild,v 1.1 2014/08/09 19:34:10 swift Exp $
+EAPI="5"
+
+IUSE=""
+MODS="ldap"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for ldap"
+
+KEYWORDS="~amd64 ~x86"
diff --git a/sec-policy/selinux-links/ChangeLog b/sec-policy/selinux-links/ChangeLog
index 94bab1ecdfee..750af30f9833 100644
--- a/sec-policy/selinux-links/ChangeLog
+++ b/sec-policy/selinux-links/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sec-policy/selinux-links
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-links/ChangeLog,v 1.42 2014/08/08 18:49:59 swift Exp $
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-links/ChangeLog,v 1.43 2014/08/09 19:34:42 swift Exp $
+
+*selinux-links-2.20140311-r5 (09 Aug 2014)
+
+  09 Aug 2014; Sven Vermeulen <swift@gentoo.org>
+  +selinux-links-2.20140311-r5.ebuild:
+  Bump towards r5 (fixes duplicate context for hiawatha)
 
   08 Aug 2014; Sven Vermeulen <swift@gentoo.org> selinux-links-9999.ebuild:
   Make 9999 ebuilds EAPI=5 and transform to make master for version bumps
diff --git a/sec-policy/selinux-links/Manifest b/sec-policy/selinux-links/Manifest
index b86310c98ecc..20b1216cde84 100644
--- a/sec-policy/selinux-links/Manifest
+++ b/sec-policy/selinux-links/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-links-2.20140311-r1.ebuild 383 SHA256 64384b465d26d67b99d6f43268ec804092906c71639af0d4a741675c5f5b3d24 SHA512 e127c970f70fe0d560e28b2c48bac92f0beae53efd8d424ba6a29d3f9af09212a7989a65f79bf0dee2f9017157611d7d8590d720dad4a0bbc20af7e488e0f6ea WHIRLPOOL b7f21a2abcfdb087b35b2dd9a061ca8b1706e7145a6cfc6b899e38775a40c1508653bc24ce7d8ba4394f3c0d84d9fd7b198c4e99878b72741897397f4c9854cd
 EBUILD selinux-links-2.20140311-r2.ebuild 383 SHA256 34fcce275971d3f38ff0ff6b6b8a71528323c5e52b6c1e6b47db1794bedd2d35 SHA512 d44cbfd82a1339f970f9095c1ef8c162a06185dd24602effd08023f329fe7ff402249e317f9d8888f4eff36d6b21e60bda40b21e7a72be835b4f783e3af893d2 WHIRLPOOL a756050823f803e1a79bfcf6092ed1da7a454cdbbf64126d5eedf26a05fbeb4c55e26e9cfe3af8a0e3f4f6e2be55752000e9756fc4ead508b06661c6c564726c
 EBUILD selinux-links-2.20140311-r3.ebuild 383 SHA256 176bd5e96d06959650a32c655019404c7dbc0b8884ad0a13e02b4033fda17ab3 SHA512 bdebba776064e32a40cd679776d1489e0dde3d383f38c7edd9deae03380cd504e167eb400374338cc04e73a31d0ae6fe1fc5277958eda6146ba5474a6096fa76 WHIRLPOOL 0c3def75ebd82a7bcfd6f9bc8579d86df4f61fe34e85c30ebbdc47eddd3e762107342fbe43155d0d6661b77f9966641880608db038a3b528cd8642d6dc2b5aad
 EBUILD selinux-links-2.20140311-r4.ebuild 385 SHA256 c3788070d6f1d5c76688c5a97399d8ab47dbaf68fc69e35b9e2b6c7414e8c0ac SHA512 392ed26670de05b9ca2d90ff27d4c3c677e6840938f2092d9d6df4579822b62f83bf1e53eafee4de1f9d102afadb94619d3c5cd241677f8d7cfbdabb4d4f3533 WHIRLPOOL b9e27aeed8ff8c85394c497478100175e3a72ef868141b6748b01d64a45726383226f52831436b93077f29e73d979a2bcb22dab95f99876e8545894f01863855
+EBUILD selinux-links-2.20140311-r5.ebuild 361 SHA256 e0fae1d4d8f0c2dce4ed26bbe7bac387450dc2031f90489d3f08efa54893df97 SHA512 302418d43d36031a6878a443a4e91278877095ad7764e2add210c3f101d5e8528d2add2ccfe2105735066d7d37a1ae1da9a51885e80500b7e17c9a2f6511027c WHIRLPOOL 31720d171de3ecc7a6414ffe027387251c9937e4c25322692b5cba5a1a33e178b73b2dfe9de02f8bfca294a33492213043921e2916f88d80d8e735d4aa852a1d
 EBUILD selinux-links-9999.ebuild 341 SHA256 e35c681517f8a94eaad38ee633d0eeacb12401f0c228b2f18890806c28bed0ad SHA512 42696b68d6e2fbf690d0825b6ad052b32ff4bab61757ef59eacc7d05326037050de9e18de9eb7906808aaa6bef012f66aa75396b154de154a3ced2c75acdcac6 WHIRLPOOL 9702159ac8f950ac7d5a753ae258944f6d11df2dfd904150aa5d1dc59af3b3f194a9752586d5ef7d749194f842207551e8884f7e965e263ba7255f54b855b452
-MISC ChangeLog 6696 SHA256 696d60d41a978e5525130fd332096543001d3c5c486a24efa626e0d07cd086f4 SHA512 950ac1cd8b91c43cffcca24f3c8150785c06e816ed4f8ada431fbcbd756e9df49166ce5eea16df940e773805c8128111f021c4214291eede102f7027805c57e1 WHIRLPOOL 470b175742585eca78334850fa0cbda32f912b5047f07e7e9074dd68bf3b51bfe2772179e1d31fd3707cc61710ad104b62b7f8fee34a29b6266c564aa76421c1
+MISC ChangeLog 6886 SHA256 d2eb5176c6801da54030356e31fb5241b6e4c04cebb9b8dc2a561389896a984e SHA512 5b81ba8dc4cc4121fdcd049205913d90454f60ad2e3ddb45049da9ee18c36499d71d690079cf9afc168cf1df4822cb580d0f03584fda0d2a56bf31ce910c8063 WHIRLPOOL cd571fdb879b60797534f9d75e740201b44ba80cd4a36b6671b7ab793c5c5a84e3e052bd7235a26b9fedd226af7902869d9dfb700b0f04074ecb87e94ed6c3be
 MISC metadata.xml 229 SHA256 65a1256cc0999b4166e9f4bee4ccb56d336aa9c103a3e0a79b250f4f7188d7fd SHA512 14c206b8e059cfecdc790d36ed19a84ef5d05bac14cb7049bceb6aa15fcbf8f8e4c368f9e638c9aeacaff5538b4331c0e38cc087066c993863f972ab1bb76fad WHIRLPOOL b1dc86182d814352d38b01d154be288f14efdf50fcdf3d6e692d8deb78d1727415e45e2f81016afb14255b464b62312599e7cbefa912ab12a7ef60028fa26225
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0
 
-iQIbBAEBCAAGBQJT5Rx7AAoJEC7dUkA7aK9HEHIP+PiQUrkwI4jq1r9Yl/9950A9
-6i90lSaBA0EKyIAouYNu8TGZIQ8FOOPwL6T7uG23BLKQz++YNe4sScO4rusjehU4
-5Mkw3y4ctDfimklWUn6E09lzS+yxbrfERlCmE4dNqcvpVLfWXydl1aZ7ERWsj3ew
-XOho8i3bHz8H5FP8Nc8FDj7uXGABi2i98MB+wpdL252PwWayiluU6Qv9Z97UuWyO
-EZa5hoo0MgFUW153uRopr0TXpOKax/XTcnB1BR1WMaSz+669r6bB7BuzMrD4nK4U
-QZ1Vy8ums5P4j49gmwZpSkj9O2KxtJxVayi84MDftWmW6LLeL23Yi8LWlVK/3VGO
-p90a8spACQLIzp/ApnZF35uS8pXXmZZ6BX0+ALLypRHUazo2+V28kh9iHu1KSvck
-5SI3R19adT9YGrMy/WnCh4zN22BLrUhmbCUGZP1lfhwxgNBdzdIFdwYSvIjimUXS
-TXi4kAK9CbreNXa4+uJDC1Du6GtYH0YrIKk8fbNooshV2ucbQ4860M13LQG/6+zu
-2SmSA7SMQ1b/VsodOZY6j/ZCaUJvOjPPkffWBMieIBNmlhcWsIUCo0Rfn8PUCi3M
-2nBNVBWekmcNDWPREH/0mmKXo1sW9s36hd5O1tGYKJoXrGmnqAiQX1WWSP1lOC7x
-Wszv+a5d/yxl+tOEiGE=
-=vRG+
+iQIcBAEBCAAGBQJT5nhPAAoJEC7dUkA7aK9HQOEP/2gXfROfkmlD7YEmdRt6gBZR
+GV8mQ9ZV6hSJ5DNirFnnLb/isCBcQ9ud+Iaw/bql+dp7mO5ZUEduVsxGP8BXsaRu
+KkGw3SfiUc0rEm5ds6jDx7/LFf0NSErwwLn/Q+4hN9tVVfu385ClLbgcHIcQEzwQ
+OvD1g2V/xQeQb9uCCO0uOi+x9cwBorurUlza6UQ3dCdtSAnT8oAURuDFTD0au9EM
+cJscEpH79D29Mr2K2r/X4/IXwpt+2YF/b7K2iGOrv+p61okE3XwWAiDlyMeFVOq9
+P683CfEsqt4yiMJwOFy8Q9TUZwGUVGm7PdvUEyhkmVKk5vyuBY9eNMbXtCltD6HQ
+darH3kYIj6h58BspcKglSgZxbZTozJ8MqWOQiR9uhH4eRbG+8+/SnXEFzvcz3W2c
+iXKUulOW0Gh0mtix5oAeN/HVOv9/SA3bSF9O65TKqvEhVMaCqv3/qV8SM4nOyI/K
+P2MyxvuLw1L9inJM4JxePO1yygXfi4I/HuR4bO9dm0WpgZAUIQF5ePG2J37c//sJ
+kR1iWHkLG9PtTVq3k6gHUOzcJ45Fu2k4qcq7oa4utIcL77hDiUh98HPRfDoQqa51
+Upl9fVTCxATbmUedb2p8d1yLdZM7WnK7AXE38dZ7yZstMISWMFGICRo/wx48O6rn
+7VKramkZJJqZU7yo9w2n
+=UxW3
 -----END PGP SIGNATURE-----
diff --git a/sec-policy/selinux-links/selinux-links-2.20140311-r5.ebuild b/sec-policy/selinux-links/selinux-links-2.20140311-r5.ebuild
new file mode 100644
index 000000000000..5acf53135795
--- /dev/null
+++ b/sec-policy/selinux-links/selinux-links-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-links/selinux-links-2.20140311-r5.ebuild,v 1.1 2014/08/09 19:34:42 swift Exp $
+EAPI="5"
+
+IUSE=""
+MODS="links"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for links"
+
+KEYWORDS="~amd64 ~x86"
diff --git a/sec-policy/selinux-lircd/ChangeLog b/sec-policy/selinux-lircd/ChangeLog
index e7e0079b5cdc..4a16671eb4ff 100644
--- a/sec-policy/selinux-lircd/ChangeLog
+++ b/sec-policy/selinux-lircd/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sec-policy/selinux-lircd
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-lircd/ChangeLog,v 1.42 2014/08/08 18:49:59 swift Exp $
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-lircd/ChangeLog,v 1.43 2014/08/09 19:34:27 swift Exp $
+
+*selinux-lircd-2.20140311-r5 (09 Aug 2014)
+
+  09 Aug 2014; Sven Vermeulen <swift@gentoo.org>
+  +selinux-lircd-2.20140311-r5.ebuild:
+  Bump towards r5 (fixes duplicate context for hiawatha)
 
   08 Aug 2014; Sven Vermeulen <swift@gentoo.org> selinux-lircd-9999.ebuild:
   Make 9999 ebuilds EAPI=5 and transform to make master for version bumps
diff --git a/sec-policy/selinux-lircd/Manifest b/sec-policy/selinux-lircd/Manifest
index 348a05f88710..5bb737280060 100644
--- a/sec-policy/selinux-lircd/Manifest
+++ b/sec-policy/selinux-lircd/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-lircd-2.20140311-r1.ebuild 383 SHA256 9369d86fd65ed914c3c951694ddd853c21ff8fb4c2cdd126f75684dc0c1a515f SHA512 40cfe44977432425cab4bf6181565123b5e880c57633760691695a6826b109daaa9e3500421689136daa58c12dd39b0eed92e62898400d7d47bdf552f583c6b0 WHIRLPOOL 92713a78fa9348e25596823badb050b0dead2f1879a3d049dce99d452446723c74aed0896d42f0af139ffc6fc831f450e05fb571de3b03bd33c090bbe04be8c3
 EBUILD selinux-lircd-2.20140311-r2.ebuild 383 SHA256 7c2946984703783317da057ee4154f2168d821f4320efb186d9161ee726464e8 SHA512 51d262a09f81ce4eb8cea6cb9abd99defbe42c14ef15b652109e1689c0090bbb72e685e69f52024bcb20db357769db41073781383250753f4030c724d58c19ae WHIRLPOOL cd9320356f49edbd279903693189103fd4ff1379f9491f502664d6ec621e1fc95196ed16365ac95123547cbd6bafab1d9a764b93148d733576fad25328d32ba7
 EBUILD selinux-lircd-2.20140311-r3.ebuild 383 SHA256 8d93cf8b64524aa53a035e09026228a5130088c756f5d71380c935bbb98c84a9 SHA512 9afb777668b009fe8a627457c1e24a94b4ec5e0c89c8a1a5d779ebafafa4ea5dea45b1a41536f9a6c5d662058841df2a933e48d947c174834e579770336bb7fb WHIRLPOOL 34fad08d4166f94c6b9b24d3a80921fe31775e330167b450f8eee5b233260781b17934d29a0d374fab713fa8c6983ba01f76b689ef6edebb62db470d9b9b9a53
 EBUILD selinux-lircd-2.20140311-r4.ebuild 385 SHA256 df9929bcc1b303e10f945624b95547878038732eb53acd6eb949ab35f64841d3 SHA512 f9424912f1699d440ed8a18f827ea33ffd027a2be30fafb54108ef21bbf40bf5c8a37660a593a49531ae07880a000f8fc13944614970ff9e1ee815fb5f117b77 WHIRLPOOL a759160dcef172201da9612fab8f4c67482495fa4bd711996e4ceb3395bcfed7c68d5e2ef4d3c2a6705ddd21e0177245ed2aa746ad8724bfd69e86dfa504d9ef
+EBUILD selinux-lircd-2.20140311-r5.ebuild 361 SHA256 4a046b7438ba5d9316351957163505e4e9ce7fa2f599cd0239b83e1013760500 SHA512 ae989c5ef2f4862941094afef7213d3ad7f325668c3f567a47ca400670765bce86bd870212c83e91d21b66329755084f99a65edfedba27e2400e27ca276a3534 WHIRLPOOL 452ba71e93b76a3b38fbb51e3d30bd74e6eb02029480aca50822c978bc8af14bc5ef6757ed25ab505f42db872d19d7b93b9301dda7a567216f9c7c4fe07cdabc
 EBUILD selinux-lircd-9999.ebuild 341 SHA256 389e1345e91b379c508c6c4398a1e7f011698f6fc77fd5d58d451374e5d12076 SHA512 2b9b0d636cd6ae6349b3e7adf9cf9cff89f51a897bd7215152e4af5463837b3313cc5d9641f32bb474d3d53ef6ca6b0f07a6ee03acef1ba52b8abcd2a72fca66 WHIRLPOOL 5e2f2b71583ca3416fa990460ab8778ce2219b50931f8e97bb0ce8643814a7c4e6d829be0891838e1b5e8f636d0380bc80882240dbcc1214f4f6f4c965dfc3e1
-MISC ChangeLog 6437 SHA256 ceab1cc27cb918cf44ea5c9a859f0ce5a4ac2c9d9d7f8ce989e2df5a5ef08fa9 SHA512 cc8abcb95cc26e597f00f99ed8ef790df269db52af7280c8bb1a93cc2f784c9ff3ffbad015ced14a6760396b5af5cb1cf357149eed3d86f4043cfb694e6ea7cd WHIRLPOOL e95ebba8138942ab304a0f980d607070e2ec20a9020e66ef9783418d86f2c53286f9a46bedf0d6f8313d396cbdd9243bbd16cb68e69fb2af9aa8f001d09c2010
+MISC ChangeLog 6627 SHA256 10c74dcb03e2c3ce56a8ca995aca971bf4fb900f2d005f845dbd1f6adbd91edf SHA512 ac406f0d2ec22bfbfce14dd0d59af85084fb03a74d93f0d413b7e4d9913a22e79507876f5fb7c5ca4b045cb76bcb9d3574631c56e96fa5681a29b87b574e2f4c WHIRLPOOL 17de85e7e9ffc075dfabcda5b2ea72d3e3f7db932e6c85c4f6d88d1d009a2675cbd60222f5de60df481fb0adad57cfb6dcd005fdf14bdc3e2076784d32eec23a
 MISC metadata.xml 229 SHA256 561e66ce3d6fcf537a68ec15b471ae8b06999f69b6c75206d5537fd1c67c3531 SHA512 840e6d0a492b4b7abbec758fff2ccc8ea34af3acc25f034f5f1d85b7f4eaa5401d0d8de84b240abef36de26f395ab66e4ea7b653d1eebb072993598279422514 WHIRLPOOL cf04f63b91ff11ef881983d9d531979b6be36325e39c60591810dc120ce1d933366b76c3cc9b69342c426c9a5250384109ff2869476ee73281addb547a7a3efd
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0
 
-iQIcBAEBCAAGBQJT5Rx7AAoJEC7dUkA7aK9HvRIP/2CAONa8lyynhL4lHTTaJfm9
-arD/GZv9w/oQHHOdo3atzsESu3UmwWfSmgHgET97/+3eBttqGPnz3BPAX0odpvMm
-t5zCDzgGGtoa+xpxgkCbokFRufRpCAPkES9ZR6wIqNgaggRvaaZDEGcCZ3pErkuK
-l8U2ee9tGbRAih2Z2ie/dvja8jfeMvUzxKkxg/7FFGOME81C9x4JefZj1WAtLfDd
-IbqPFuBiQUpYdHpR29eovlttKt2Rhfq+2Z5tujYz9uA4d0W/EXjdz/yvsJ/GmysH
-k01jEbKnFhU3VDjqOoksAsQ9VOENVVtcd+DPoiEsSy7xhMBbLwXn6p7X7jB/RCaM
-nZkaE2ligJqkg7OFYPs3jL07tOI5d4cihkpBJov3DT4I01Dg/HCv2xaKxhhXJNo7
-JOtkGcf3TnkPTjLhpK7peDcGXiOyyvLDb5pwvZ8VnYeks/PW8+nbyFY8+52GpS3D
-3BLzdwGqXoHtT34D8X1xxn/ABZdTnNrQhot3NvAiYBEe83iUuBNKwrrYeLmB4nrn
-vIAV/Tmui6fHrDaoiOnk0JEl/Bhu/8UIhhEshUbUhQuGNEmXlWcvsMju2X80eQq1
-VpeNa38eRO6ufJrWgRqmchsGn9+wJFfrjx6W3fN09lxmsZ9Ac/zmw0CEXbtyMKSn
-5vS2l0EbHUvDlbFu7i71
-=35bz
+iQIcBAEBCAAGBQJT5nhPAAoJEC7dUkA7aK9HvUUP/jA3MNSN4vCWvsZyTTG81otX
+xcfyVnIbuZVhQBCP/lAfJKlP2XmS5dvyuXpXiYSTOMkzmflgcN8rLQvXDuGpYVzv
+4jATcCwp640G3tfBrAk8kCsZQbPeb3R/htPTyYZIh+1YaNQIiRP7ehG+M9sqFDDt
+huX0Oi/4En/SVZGCvzENfZPIBWQjgOBPmvhMOF325iHhSvu9W+TaGadSjUI0Vlis
+zPSJbam+vB++zIhrC8X+VcmtALD8A3CDiA+ry0f56/p1RccR2i4TpE6aYn0gnRB1
+7OZwfqQloQjaEJJLGAyJIZmjP3l60U7NnQqHhJUz3NXCrXOX5pKl8DhTyZutyvzN
+TO9iqtKnwjFvruXByz+t2EEiHr80V8sN4DXokZnGh1I3VNcaLIL8ReC6rcgwxdg5
+QvvGyYDmab2yp7d/vT11o9PJdkSpHIfPjYdqeMk4i19wRmEmkXZhe77aawVwKftk
+i0U95qc/yC45VKeI1Pklbd5fAgWQRogZYzUdTsMPIBqxuUwJlVri8uv/T9Du5JbM
+IOFJr6W6deOXOG1T5jLFIBk3qsQ5sAK+K0RnNfyuuLVdYW5Hi2B/k0dQ1+k7JLKm
+BHO+JbnowMqiHDGYsh8uQZCIw0FbINTl8wqJnapESp+ZMdBpZpaKB2ZJ257KI4qg
+aWrgQL4J/RkGjdMzakRX
+=7NIb
 -----END PGP SIGNATURE-----
diff --git a/sec-policy/selinux-lircd/selinux-lircd-2.20140311-r5.ebuild b/sec-policy/selinux-lircd/selinux-lircd-2.20140311-r5.ebuild
new file mode 100644
index 000000000000..bd415fdbeccf
--- /dev/null
+++ b/sec-policy/selinux-lircd/selinux-lircd-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-lircd/selinux-lircd-2.20140311-r5.ebuild,v 1.1 2014/08/09 19:34:27 swift Exp $
+EAPI="5"
+
+IUSE=""
+MODS="lircd"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for lircd"
+
+KEYWORDS="~amd64 ~x86"
diff --git a/sec-policy/selinux-loadkeys/ChangeLog b/sec-policy/selinux-loadkeys/ChangeLog
index efeafafa6675..6148f63c41aa 100644
--- a/sec-policy/selinux-loadkeys/ChangeLog
+++ b/sec-policy/selinux-loadkeys/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sec-policy/selinux-loadkeys
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-loadkeys/ChangeLog,v 1.42 2014/08/08 18:49:49 swift Exp $
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-loadkeys/ChangeLog,v 1.43 2014/08/09 19:34:31 swift Exp $
+
+*selinux-loadkeys-2.20140311-r5 (09 Aug 2014)
+
+  09 Aug 2014; Sven Vermeulen <swift@gentoo.org>
+  +selinux-loadkeys-2.20140311-r5.ebuild:
+  Bump towards r5 (fixes duplicate context for hiawatha)
 
   08 Aug 2014; Sven Vermeulen <swift@gentoo.org> selinux-loadkeys-9999.ebuild:
   Make 9999 ebuilds EAPI=5 and transform to make master for version bumps
diff --git a/sec-policy/selinux-loadkeys/Manifest b/sec-policy/selinux-loadkeys/Manifest
index 902592ce901e..7a61374626b0 100644
--- a/sec-policy/selinux-loadkeys/Manifest
+++ b/sec-policy/selinux-loadkeys/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-loadkeys-2.20140311-r1.ebuild 395 SHA256 0e448d7eee90280f361ef49c2bb48eaa0bec09158082e70fa63071d3688ebb4e SHA512 ff7eca2c7d6b7b31ff8a5eabc41a71b8dd58b8c928059e7d50c3e841d5e35727b8bef63b3067f24a8f844dd5da2c513ebd16b4877bbd086b5e235b4977349118 WHIRLPOOL 04591fb341ec110b7b6b3aecdacc319253a8dd5a78fdd052c2da698632ba372aa5aae6c6513bf9b8e73ef749daef38c9efefb7bf043ab6764cd91b269e060a55
 EBUILD selinux-loadkeys-2.20140311-r2.ebuild 395 SHA256 f01d9e3ebb346425c68597b39cb85fc8fbc304ff0be580810ea7148745cedd82 SHA512 dda0780ffced71c7fd7960e93f4b758fbc370e30994c6e3a1c2b65b357207d92a6dcfdd0af88fa7f696b5abbf1160293dc8367af1bb0b9b5c0be0fea0d373d2d WHIRLPOOL 59d04938acc4610bcc2cd817ea0491d3d9fbe74e95a08b41aa1e5603236c162c7d50ddcdc56896f34d5248d03ad1b8a47a001976f2bdc756cf0e43aaefaae46f
 EBUILD selinux-loadkeys-2.20140311-r3.ebuild 395 SHA256 8927b4f064c154a031717c69d2393f8e32092c5f4467ac013450988c7e954605 SHA512 e9a18450c1556b472153f81441b773c08032f5ed3dfa1ae3991707af96dd5efa2ae35654905356d085e1e35ae448464c192d6059f3c18704b5431caba77dc7fa WHIRLPOOL 6dada460c189f37a2d0d89b3062fc0da25cae5a0050ebb489a655cde0df8f0ab31c93649243491182549eab62076306f3e4796a41047d5c4026ee59808ba4eff
 EBUILD selinux-loadkeys-2.20140311-r4.ebuild 397 SHA256 b3fe441f4a05f398745a932f165523622ae026ed4b04d4b58c62caecd27a7a6f SHA512 751a305d83cac1bb2b9684c20486e50d438a0749802ad327258f64a2d9ad0279aa0434ec78599509e32fd00691a5485a796f2fc0b0abb85b4f60ab00568759bb WHIRLPOOL 397db65ea21116de07ad22ae49245343b5214d418447c396f905b1d4f1783426a36dae0a612d009b90f7ac320544effb76be85f60a7b840dcf5e53d87ddf98b6
+EBUILD selinux-loadkeys-2.20140311-r5.ebuild 373 SHA256 23c6e9f2f6f8aaf546073bc5a6f8e4e584836cfc785ffd5b29d8ecb41390196d SHA512 763fe2c301040f2e1e132a9c32cd602100bcc2b290e41d2104f1542bf8908d4048d2f40b758e26a236367167686964d8176963e326d0bf3b3d02fd31ef21c3ba WHIRLPOOL ffc258f3ab2c407a5f6b0c87fc146f493cf72da55e832c91a1323ecc92950bf178d7139bc43ca4785b374ffbfbb5e3254828f3ce5c29f40c58c9d242bec0bd53
 EBUILD selinux-loadkeys-9999.ebuild 353 SHA256 9df3710d22685342c8143341a6f6fe71fdfb09b66d3097acb8358bfcaa45d206 SHA512 1ce48ad9a6ad7057486c3f19aec274502e04275851655973c3f08dafba476c189dd2e5f09279e94bd4435fde5af9157049300b5a729e6f48ab207228d3ec8607 WHIRLPOOL c95ae9d38869b3e79afef2cd3bf125bfbe7993c5ed61b64b8f8c0d873fc20c6cf0eabfd05e97d6cfd043306b69a53d09cf995e077fe85b66e2e55ca0b3ac4e4d
-MISC ChangeLog 6672 SHA256 daccfbe0cd3c3b21723a63a76a1eba77a3c29c31bf64477c054ab146e09df013 SHA512 fd4550ebc94766574839833339ba295ccff48aa29225e80d148704d66d5f413e834243b9584c94cb49d9072cf45e648b30896c8d7a55572ddfa4db52c008d38d WHIRLPOOL 5457b1e78df905065e97c1e85cb7fcb148920c573fe50073278aa89f7cb102801532fc999bbb93012da5ea8137788e7793ff2813a2f8f0df2fcc509a728bc9db
+MISC ChangeLog 6868 SHA256 24f89fdea84de66989fc85be5d221629b8d938108e3d7354ebbaf4579b7721ee SHA512 5aee25f73aba5bb8af59a2e2174cde1767ef350ecadb71be0aaa3b5dd6565777694f4f544ca1d32403bf555b1f4c0844b1734d0f2a21a083b2a95434dd032e0a WHIRLPOOL a14482cf390d9062ee44d1b1a12e7ac25152613ebb326aacbce1d10f98ebaf7bbd5a11727c8a165a578ef579406a720b5e625379608e2eec2e7dc29e6e7f2a48
 MISC metadata.xml 232 SHA256 d68ab1113c5164dffea79402611e976d1b8bde6bd8a8842b7e7a0cbb7fca6f00 SHA512 2151023399db499d9895a06128899ead57f39e6c3f98e3ef495bcafa07d744686bde5efb5db0448efa391a791399d06d5b265a3fa8bb0480d6cb80f6dacaa3e7 WHIRLPOOL a43c0f1300a5a4f3ba926b5401fa51c7fab95f9033ff1850bf48d0f012f619ba9f7c626bccd003f270b4f0de79123f78c46e372bdf4dbe35c390b79195a620b6
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0
 
-iQIcBAEBCAAGBQJT5Rx8AAoJEC7dUkA7aK9HOY4P/ib7EKwOU109ITqxKayxYYQn
-HrbQm+2NOZjFVVS1Ih9m59cVO/N0RK3pebiL6WlY0BDAwOnM1ajHhLvNNY7Odcnw
-vhX77EUWWFoNkeXanflVUZBmxQ4X7hm/hykqDYF63W920RH/Fpoa267F0mwZGxGz
-RzYmMOe3M6FJ5idHh5Zq5Ynf1GN3RdbzkDHQAolGIcgXbuNcHOp1XogmhAukpSQe
-bRA5efzWHBCRj6FLqQ9h/Wt9LxaGKQiCJ7WEKX2zpSCXvJAfUbaFDFgpQ/Q6/nDB
-W/A2YzdxHJWMOMzzoLbhotk94900HvNbhtsnmauebrL/xVJpbVuoZjUKk7uYt9Q4
-0qZfpdknWZij5S2f0B6OPrPvv2DXbcBIFR7A1VpXaECS8ZjfDZl1P3AjRH4CyKuD
-lWVTbGKgmgi1/mCBLKSgiywzTfHlMgJC4+u/EoVW5fhbuk6IcaQL8jOeZDFOkGvL
-DxT+FoiuIwIet89zX+zWyzUCvf6TQjp5VEssZ7DqR3Yc5qToQWY0KQWJ1Ddy5hVa
-algIfKfA084UxGJyGeGlCRpqvN7J9OMeeU2FmhMVSbb87tau7bnLbYfkW7Ttmu+V
-MkwbBXSxYYZJ0iMnf/4iIWO8eMSchOxECcMqptB8jxeZoALpnzccbIsredi6yjXO
-c2PiAgZK9NcKwJv9e/OM
-=Pil/
+iQIcBAEBCAAGBQJT5nhQAAoJEC7dUkA7aK9HJXMP/iiQdFW1UILGKtrroKCYfVPq
+qp10aQ1M/h6oHUlX34VYjAXBnNHDafm9pfJo9gFVkupnKfrrCfkDWqq7hsHFZ+/J
+RThQeAJCVYnyjxLFdUOqPupW12L1IA0jmzmOwRTSyjbY/df6+Laue8/nSAlH++0i
+R6qz3tlaxW7b8GiEE6LC0N89Fi2I458mZIPWJMQe/eU+BItPn4g0hSYqItG7BR39
+dIA/eKLiXoaVz8vuELJsrF4uaHqsPBBtlM2Ql3DEoCsOGZvyXjUauxKFB+Pyk+Ry
+9qhAwoJMePWjqhI9Yss99fKwCfJkYLT/W5F6Ni0qeC+MniuIiAazLyKrPpmuS1H1
+l33sxxaC7AdYPl+FwL3cDOCeG/f58rrNADekPha6HOuswIMriTRQTqCg2zxQuWFO
+GhHDHm0Lh21ne643isSWruuqguxbKN1KQGnh36BPnghcx1bmEVmX4MF2Q74vbWln
+Al7E9FYtt54+Vu7OipfU6Zrcy0l5PDmmmMrQ5TiEhCl2om65rbdGMIRiehnhAibd
+Lfj6bbW0Q0Mua3qJuM4n8zPl+7HoOIhUscCDeH+ipg5/lxqYvpR/J60JZq58AeDt
+4q9Bp7yYI+zUyDeu0v2n7YCDpXTCTIQTGM9jONQiG0nOEHtEhvq6N99mVIFtgAVs
+MC7Nq1nZ/4Cix7JIp2u0
+=m4rc
 -----END PGP SIGNATURE-----
diff --git a/sec-policy/selinux-loadkeys/selinux-loadkeys-2.20140311-r5.ebuild b/sec-policy/selinux-loadkeys/selinux-loadkeys-2.20140311-r5.ebuild
new file mode 100644
index 000000000000..2227fa741210
--- /dev/null
+++ b/sec-policy/selinux-loadkeys/selinux-loadkeys-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-loadkeys/selinux-loadkeys-2.20140311-r5.ebuild,v 1.1 2014/08/09 19:34:31 swift Exp $
+EAPI="5"
+
+IUSE=""
+MODS="loadkeys"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for loadkeys"
+
+KEYWORDS="~amd64 ~x86"
diff --git a/sec-policy/selinux-lockdev/ChangeLog b/sec-policy/selinux-lockdev/ChangeLog
index c22dbc4fded0..a32a79300f36 100644
--- a/sec-policy/selinux-lockdev/ChangeLog
+++ b/sec-policy/selinux-lockdev/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sec-policy/selinux-lockdev
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-lockdev/ChangeLog,v 1.42 2014/08/08 18:49:38 swift Exp $
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-lockdev/ChangeLog,v 1.43 2014/08/09 19:34:09 swift Exp $
+
+*selinux-lockdev-2.20140311-r5 (09 Aug 2014)
+
+  09 Aug 2014; Sven Vermeulen <swift@gentoo.org>
+  +selinux-lockdev-2.20140311-r5.ebuild:
+  Bump towards r5 (fixes duplicate context for hiawatha)
 
   08 Aug 2014; Sven Vermeulen <swift@gentoo.org> selinux-lockdev-9999.ebuild:
   Make 9999 ebuilds EAPI=5 and transform to make master for version bumps
diff --git a/sec-policy/selinux-lockdev/Manifest b/sec-policy/selinux-lockdev/Manifest
index d1ad7b430cb0..c1a1531ff714 100644
--- a/sec-policy/selinux-lockdev/Manifest
+++ b/sec-policy/selinux-lockdev/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-lockdev-2.20140311-r1.ebuild 391 SHA256 20c9d72c90c9fe05d29caac12c6f2d0cd0dc673f162563aeadf85d7fb7e9e757 SHA512 f7b6b241bf919ba705464a906f757862fb756ece855604bbaca787c8f71f6899183a7710674cc216e4f9f709027dc9d772d7b58043a487788e6d50f80e68bb1d WHIRLPOOL 5a89274ed7b33a18ee87af9c662270b55b4df7b5e37a598397a6b2ea580c96da56641a7b976aca4551c11419fc2c141b2d63f49aa6131cd4085c3a8668819b86
 EBUILD selinux-lockdev-2.20140311-r2.ebuild 391 SHA256 9e4d84accd5631ebecd78a7484ad5363a86ff449ce8b6e055d68c6ecd04fc6d2 SHA512 cec4b55be4e6177a5d26e0d33921b07bcddd560e75ff178e5ca640110195518cad244ee02a0816560c216d70cf3098865dbb58d2c92591ac7a30d949c6c3da38 WHIRLPOOL 0d34f8d0410b6cb7de38fccc14cb9fe4422482b86f12d16506e054aeb6f3f1549a4d753008bb7f4ad1107b9d6e2c0899f3a64ca04528cc0665dc2932cee907af
 EBUILD selinux-lockdev-2.20140311-r3.ebuild 391 SHA256 88b4b5719e1d9c51e0c036526226409f4933ae3e4a419fe7cb16065e8f254c4c SHA512 b4ba88a93ca6dbfb92df4476f29b76f228d2567e60ebee0408d0ab7f5478be7edf99be7ceab4ed1976d3c98afd506d7bbab92f1ed10d3520b314184bab652f16 WHIRLPOOL a0326907bcfb9153448da4cc4ff6d94926d5d7fef08cab1375efe9e08380d079ed7e8a765d58b4107ff04f18a67bf9bf81622f1b895798f5e4eaa5cfb3ee1a43
 EBUILD selinux-lockdev-2.20140311-r4.ebuild 393 SHA256 945be366fe445828f3493ee282864052209d8e31ee686a382aad501783ec477a SHA512 a659ce1066051a65e9711f8b2476cd5064ab0629f67fed056742e0619b9b47b2b698504095d5f7c6121d8b06661d9bbedc489e4c581e387e726a4cf81689f481 WHIRLPOOL 43716271a824e415302a68219577e55801c3d0cd6c4f80a29354bf353bfdca3fca2fe8aeee8111b2256f3f666a803327b50164ab9efb7e591c32958406bb779c
+EBUILD selinux-lockdev-2.20140311-r5.ebuild 369 SHA256 2dffe6f448582892fe3c85894de8748859df84037806adcfc6f7e44abda8433b SHA512 192f5d85c2d436fcf2b1c05e6210a9f6e566f8acbe8668dde8f97a4a59bae26eeff2ea3291cc0937e355fddfb0bfc953a523ab4798675513e5a0d2484b62d278 WHIRLPOOL 27bf9485ec27b13a0cdaa444b0b1ecbcffbc3269f7952ed1de4a72d6d1206f8cb7828615f611baa8962ee5c57039de9f391b9de4d30f20ac10620841e009abaa
 EBUILD selinux-lockdev-9999.ebuild 349 SHA256 37902a67f07193ee0eff743c286298d979ee210b58bd168a8196f71a86c789a7 SHA512 07e6372295ebee8b4070eed50ffadf1dff07377e3b3cb35588943e6b299fed437dfc71532480a6a4c1bfb6bb8c4595471330796b2a9130ac1429224786710c04 WHIRLPOOL 64e3d6e99fc4d136d8db47c1b9d2ad72ce0fb60ad88b3607a3ef54e7a447ad4b0d3c66a3788afe818b7b5f23511868061204bdfbb8836ad2da00af70a2ae989a
-MISC ChangeLog 6589 SHA256 57409530040a86caa207d5995ef8ad8aaf0d0a19693d9dc40b311fa3d46cad26 SHA512 f7513672d8145b8d83a96802871982ee04734dff91b3cc308684609da11d1e59261da181cf59dbbdf7357590bcdc0d4e4db5e89c95520c8f780c84c36e6712f4 WHIRLPOOL f733d3675108a02bf102b0f529d17576b08d390c102505a5602c91112267ce7ca4f0eeb6680ff736bd20e1fd8e04577a2e6dafea3bc90f0a4683d1da1b18f45a
+MISC ChangeLog 6783 SHA256 36e769fe80911b2020e4ee18f5548997f27c8c55bb2a086528b388e418fbc376 SHA512 8ea2ad607c41a79b1b484e1c1812c0acd417a6bebee071585b7b7301794a4d514c33ce6b660f07be92fce3769f2c0cb730208924a7b65fee08ad1bcc9054c4e6 WHIRLPOOL c10dceb53ccc87ef4a845f62631af6842d129aef1caaf5d82dc5c4d495dbaadb6b8897cb6b4ca56b315a34cc7db65e3d0c5f4c00565de599bf5ec7ccbed2b9aa
 MISC metadata.xml 231 SHA256 ab2046bc8a8401251f812558be3c68b8e50d065af48fa899659ead7d2c46afa8 SHA512 4e1d983a075c843a652ce43a8374fdf17e9f10e2026848bf68238527d25b404b6e8a6994969b257acd02fb97ab3c67074a730294192803f9365c1d9e7cd737a4 WHIRLPOOL bf626003651b2df740d232e1625fbe8cf2a5bf45a99665b24ea6a32699445c6958758bb338d8be80122d4305125094ed10f2d2e0e5fb42a2a1479afd33553547
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0
 
-iQIcBAEBCAAGBQJT5Rx8AAoJEC7dUkA7aK9HYZYP/1uUdDwZyzt3kMaTo2sXD0CU
-O119fwPa7uag7LJEoTPVnT7kt9giQv0TYrh1Dh7WGiTk4IQQ2guWQ/2Y3+CwUKD1
-/80zdUQ/16r8kdd+CGbt9jpdiDYQkTFdpsZMn2L/qx0fOweGm27aVyVQDePHZXFV
-lZldQYbtHaHRHS1JwHv8tvB3WyZgY1IHrpfQqL7bffXwKS9zPPM90zyICcCi3QyP
-QPw7/q4pEPgt7RsKP8a10JMdNYZqBx9xQrnvUFofOPIopTcR6DmwM5al2WRs0VIz
-1mG4MOWn/FNizvONMyAlruXcYtO3UI0/iWO11ej72lMrXDTrZep/LgT5zeuXDIbn
-aubzhTWxVu8HiOzIQ76JNDftehK3rapzQuMImO4dEUIDhrMkw4Evi2UHpus01XeQ
-ku64ScwNlJhGXywpYdDJoAvXYfhE2kkXSdxvN+B7/oLrrx/BOGXyc1gYGRs3JKyQ
-lmKfQOcQj1MEEaz8fLwxw+5oawRztrXPm5v1Zmk2vgspvU5Ap891hOJbRDjwLx9B
-BiJp/t8dnwNs48awqlNlg3OgCFhX5CCv2nuYP4lKSiKteF4ux+l8A22FIK3TnZww
-kDr9/SMiiPo+d8pY+J9aVOcp24U1rSNiYBjjkJgDP4nylCgZInE2RTvB8jUnx15g
-3TQe/Jbz0dc2WhqK3+lE
-=uA9U
+iQIcBAEBCAAGBQJT5nhQAAoJEC7dUkA7aK9HQGYP/1ynkayD64dv4ePi/iVR5EzN
+y9ecx1DNe6aUsA+DHzFt1NQrvn0OPxkNJJ/Gsc5dB7upeg57TCefIOmGoVV5SEkR
+ng8ZxR2zrLEbulbCRZS/ZOeVyB+Geb8Qcpavsx1R5OIQH0aaASTu4D7EMiwG8Yvn
+jVNDS+reTJmly5d8/80WdpWq4yBlH077Wkcgb9s7Xav1ue217UEBjXySXn4TcIyq
+gJ5AAxn3Yy735Cbt9Pl1ImtffP/UgUsRQSdVvdX60Sa7P7S42CuIXYYEJiyXA3HM
+uOdzeUzfWrFaMvuhaqJ+uKkYBrqhC3qySGYIKYJ+xEaXvUOGAKBVad0qvmsr0lCT
+RXqxhGJ/1E3D0grQbF/5eiC3QdASY78gqJFdYOu3SjHtquoGvEjTy32xKAiEgNNv
+erAUwhZSddBsh/wtQvy71vq75yZfYC7rUKXWHVaxOZ8/5gOruzJt6g9VPqQpjZ+k
+Tut7X1lBLaHmrpRpAKAnm8ejO7iSn6keXCMfwiFgVtVKyiiyjH+CA9H6TAmbzBCH
+6CzBFZ7tcQvC7ZQmQjPz+ekoBtPR80fwcsxrW/ACo5Tis5+MraZAHfQwvTq4AeBl
+qWTtta3Ibc+BUsj0gaHQKaZCJ19OsGKHPwRbKXTbT/iJzG4ULcOao1jThSXL+os+
+49uNjR7OYUJmBW7ibgCC
+=Fubr
 -----END PGP SIGNATURE-----
diff --git a/sec-policy/selinux-lockdev/selinux-lockdev-2.20140311-r5.ebuild b/sec-policy/selinux-lockdev/selinux-lockdev-2.20140311-r5.ebuild
new file mode 100644
index 000000000000..5f836d0d93e7
--- /dev/null
+++ b/sec-policy/selinux-lockdev/selinux-lockdev-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-lockdev/selinux-lockdev-2.20140311-r5.ebuild,v 1.1 2014/08/09 19:34:09 swift Exp $
+EAPI="5"
+
+IUSE=""
+MODS="lockdev"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for lockdev"
+
+KEYWORDS="~amd64 ~x86"
diff --git a/sec-policy/selinux-logrotate/ChangeLog b/sec-policy/selinux-logrotate/ChangeLog
index 8ff86e3ae521..5c8c7ca603bb 100644
--- a/sec-policy/selinux-logrotate/ChangeLog
+++ b/sec-policy/selinux-logrotate/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sec-policy/selinux-logrotate
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-logrotate/ChangeLog,v 1.68 2014/08/08 18:49:38 swift Exp $
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-logrotate/ChangeLog,v 1.69 2014/08/09 19:34:22 swift Exp $
+
+*selinux-logrotate-2.20140311-r5 (09 Aug 2014)
+
+  09 Aug 2014; Sven Vermeulen <swift@gentoo.org>
+  +selinux-logrotate-2.20140311-r5.ebuild:
+  Bump towards r5 (fixes duplicate context for hiawatha)
 
   08 Aug 2014; Sven Vermeulen <swift@gentoo.org> selinux-logrotate-9999.ebuild:
   Make 9999 ebuilds EAPI=5 and transform to make master for version bumps
diff --git a/sec-policy/selinux-logrotate/Manifest b/sec-policy/selinux-logrotate/Manifest
index 03b269f69076..818a79d86662 100644
--- a/sec-policy/selinux-logrotate/Manifest
+++ b/sec-policy/selinux-logrotate/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-logrotate-2.20140311-r1.ebuild 399 SHA256 5a95c2a97c181ee2c9501b868733dced65b1ae54725c5282c67b6cce51adf50b SHA512 f6443c0f0cae636f3d5234dd207e7c225ed208d7b86e0f59150908a63782b8033f669423812d10954bdf2fdf697a1881d7e09f071b8c7889ce5c94db080c62b0 WHIRLPOOL ddb6983044153e6b6a0fc81bc2a5fd58c2221c1216486cea2f2ee12b868c53603c444086594411896eb958386abb5aa61aa3ede3b86da66802031d991c2e76cd
 EBUILD selinux-logrotate-2.20140311-r2.ebuild 399 SHA256 70e17ad79cc56cd5ced21e2db18f4e4b4578ac078fb3e3e507eda8597482b7ac SHA512 a5c025ce4251cbcc22fcee0f142e769950f6e73af3b55cd04c91954f9692894cf3022ae4be830bbe37a9f35ffd9f6141ce6eb136bdd33b0f39d3225d2d13cdbe WHIRLPOOL 1a2bfa153d7b8e468e2155577124f585260a5d7cc5fdf06bf3dac6de1e45b8305fd91e697ac34e49ad47e24fbd7056a2cffd2a70aec87ff775710dd7d42b2019
 EBUILD selinux-logrotate-2.20140311-r3.ebuild 399 SHA256 1915dfc102f39f78e0c7d0b87aaa1257c09a11685f90252565dbf95246adedbf SHA512 e5cd02bb1a64aa97ce3902d64bb2e5bb0ff65af930ca80e80b21be6b75bc61b9a5ffdbed49efd29c05ebc503579819ccdc55099fd02b8946bb219b65c81c3d33 WHIRLPOOL c715b5265dea890f7a562b711dd77d27097e5eed957e5d1bd436288fa8e5e4393f14561e19329142a8a11320ff47c76a56ee41b2caed0249e64bfa93429d8d6d
 EBUILD selinux-logrotate-2.20140311-r4.ebuild 401 SHA256 c524f30cf2bed29251224448ec1d2f342869be586d2d3b9fea90efec54de5cdf SHA512 fc9dec3b40f0269f377893131184cca63991434f7323bd9e0f2ac4f582e7dbd9516aba2e5d6299d657d7a0a3bf3d541aa4a964c97b5bc5879ba82f97d1e2b1fa WHIRLPOOL f8df2d7a47e5a4f2670b03204af525050270d0aae2d83f6c85e85de9c584168641ef54ba465a5a812db1105ed9dd35645f15e25138cea35c4f0ea6b444830a61
+EBUILD selinux-logrotate-2.20140311-r5.ebuild 377 SHA256 5da7165ca71b82b174de483b47f08d44512b7b320b794a99952c785a3d79d1df SHA512 e8ccf098a7cca1b1d0cf92208ab13d4379fd978bd033da68f5dd428405ec428cef555f574926c1389c92317b19683a472a5cd9b7fd3d6139118e5f869f29f6c5 WHIRLPOOL 9c82245b8c7c42ba260f2e1785b24da02fa7ff93a5864c5ee4aca50a970ea0ccc87179a03ef11d6150d257c927dd228bfe325e3a3db80e1d674ec9de98d17200
 EBUILD selinux-logrotate-9999.ebuild 357 SHA256 1cc67e7481e898cde595cd221d386d83c351b982938ac9b83efc88055f424dd4 SHA512 911ce38578164fd74cb6cf0b6d30b178f203010e42b9cbf15bd02028401018c514d72cda49849d1caf36a816dd3e3d5bb1c526c45ac603172679434ada9ccea8 WHIRLPOOL 6a535d18e6d2b2cb04efc8c5cdc7258960c58f17ee9dcfd73a045b4d09df2796bdd52d76ac209ba0d81e29d6841101566d49f698375c0697da1b0b63070aac3f
-MISC ChangeLog 10541 SHA256 4d215b27c20c02bb60912d2dae2b7cb3261eab30924566214d2ccef60d1efdb4 SHA512 749054eaf98652510cea5478acb89dfa38e9e9bc6954b093542c8c9bacefe57b93e282741b1b7029966054a6e7400367127498956712898c7bd0d306d1d5336d WHIRLPOOL 5b3ea85a1750da87a9b63b4bcab68b1753f1df86c4307394a3d5755003d453c7ef7a6b112b4c84e4fca8345c36a8e8b31aaba459d7b4e0c58d49fda9d5d00ea3
+MISC ChangeLog 10739 SHA256 ed9ad5b5b69c0a82d55846b4a3a870412fb45f41ccacf87b581bf2c7f8322785 SHA512 3481c334e0d0390294b203e7aa3afac22c0bc7ab7dadc864bc30acafb762301855abebe7955d7d7597fa3766da5d5d18ffa165b8a3212eec1885783fd3bed965 WHIRLPOOL 2078172a350e43815c396dc8d986380eb40d2a519e501e4c9597a416e1204f24c7a8c613caf151424ea0e081378c902ebc09aa6d8c6fe94c6d251e6ad41937a2
 MISC metadata.xml 233 SHA256 81b3729aaca54c6a6748af2d7297e55a0f0fe8b05f085f51944e228638f604f3 SHA512 956cb5e0e770d030855619cc0a59b09d583bc45c1c536071c199000a0049afcc872749fc2cbcbffd6f0bb8ab0a44fbf50b76b05ee9f87c88f5d620c46c8a0d5b WHIRLPOOL de4643430f4c85e746e307fd1d51a9229d3d4482258d806fb60bc6d7780cfe19b6b2561b0a54484b0fc999d6719df4eeb3b27b423859586fe25bbb2880f79dd9
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0
 
-iQIcBAEBCAAGBQJT5Rx8AAoJEC7dUkA7aK9HvjUP/2cBfKLG7FGZmsS+i8X32rIT
-FwMKuAoeCzZLVfo1VEYegcpp7QudXKInGncalhxPGJRY7tyZOZlxi9ViiMyb16CK
-wJgWBXe9+zCbleeZ4ZactYFlyBgmdRNlvvhCQL5u/vjhzURnMCssj1Xk+TgoCplh
-mly6kj/Xsinsf1fNCmhpXE3CFNOpkk/cNPYX3p7Oz7P6avvm7IkRpoXrA63S5ZFG
-PMmmg4J2WVhiYNnB3cNN86h1VxRhq1TXFG2o1ki7HVftbgY9Gpb2TJ4o3nf1mJe3
-ElWxNrBsmXreXbq9MTMVJ7tGV7XpzzqS6oCHqBtGBnrFakDg9b4qQEPeY3/QNnG8
-APTM4C8XUtnpHakLwdU1AkBGpMslzI2WtwdcONIl9uXRsWo1rkl+6rI4kdwiFax7
-SzSF75lZaazR18r3D0o13xjgUkjBTtn4RgvSI+R4agKzhcNVwmZcgP6Erv4UDSb5
-sTW2u4oePFUrA0n7XpGtscnyKvhnpfE96XoquIxK3kQGs+LLZ2o+60BgMdqp3uWj
-WEwUVZcPb8Y60JnFKRTinW6QhExxbEL2AUFsGBTwC7etF5pGRsCz6HonpdCehfGg
-SOtvn01O3Lre9y7IPfoDqy1eiXTL0lOo0dgU9/bTS8AShAF2CSUp9P57Sbzc7syU
-8OYrViChIuG0+6D+Eqzo
-=TeOn
+iQIcBAEBCAAGBQJT5nhQAAoJEC7dUkA7aK9HPiMP/24IVQFawaEKWUxcQj5eLZ5H
+chviL6rjGo+GJ6Ex70ADhW6a5bQimpSM8Yjy9T4Wrm0sW2X5sNKXzjjiC2WMdHs2
+KE1LxnTvGNsYt6VdogsUD72G/6xr+2kmBS6AZUYLMLyKXclSTpCo5Fz6XqNMvn5U
+GgBNnbbcZH+P7FWBRrazJrkkvd/Ar22wyzU3K6QbqmM0351NOoNrwXubdCwp8Wou
+ztDffL9JTRuyU9TLHdtsGNjLiUVk740S16ekkh4Z4xMmTFkDgfYM72TIroua6btb
+8xSYkoPaVfncJCIYKygBRN6wPjJxk0lcse9eEkiCU7cgT7JTUAQnUSCV+K4V2nCR
+uHWvd4V2+2ulkqUoes0ruFD8fT96gyXXZTODwGvh/ZzOzGjx8+MsYfaSQvucPOPq
+jg7PXcZU89SQ5WRHCawh1bs7cmCnGbkoUJKcJckvlSODCQuoX4WJL/aoopzvFL4G
+kM9FymkOpEcZqAFYkj0yg8IpbuXyifvERkttMNsckZP0i4QwhCR1zXN2bT2d6mXu
+XAzaWQE4Yy07kHm73ZXZc1kRJ/3xUpB5T3hGUXC3PxZxVFx5i5tADD7PRiHEdp5w
+pc7OyVeUgssr3qT1uMa2Fp0l3tDN2cWVhzoDzNwsjrB3OSlyzbOVY3LRWEAhn1D+
+lEPTz+SEHzDQXSKuAHN1
+=bdaC
 -----END PGP SIGNATURE-----
diff --git a/sec-policy/selinux-logrotate/selinux-logrotate-2.20140311-r5.ebuild b/sec-policy/selinux-logrotate/selinux-logrotate-2.20140311-r5.ebuild
new file mode 100644
index 000000000000..fb9865174414
--- /dev/null
+++ b/sec-policy/selinux-logrotate/selinux-logrotate-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-logrotate/selinux-logrotate-2.20140311-r5.ebuild,v 1.1 2014/08/09 19:34:22 swift Exp $
+EAPI="5"
+
+IUSE=""
+MODS="logrotate"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for logrotate"
+
+KEYWORDS="~amd64 ~x86"
diff --git a/sec-policy/selinux-logsentry/ChangeLog b/sec-policy/selinux-logsentry/ChangeLog
index a491eaa0545d..ada8a186345a 100644
--- a/sec-policy/selinux-logsentry/ChangeLog
+++ b/sec-policy/selinux-logsentry/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sec-policy/selinux-logsentry
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-logsentry/ChangeLog,v 1.26 2014/08/08 18:49:22 swift Exp $
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-logsentry/ChangeLog,v 1.27 2014/08/09 19:34:39 swift Exp $
+
+*selinux-logsentry-2.20140311-r5 (09 Aug 2014)
+
+  09 Aug 2014; Sven Vermeulen <swift@gentoo.org>
+  +selinux-logsentry-2.20140311-r5.ebuild:
+  Bump towards r5 (fixes duplicate context for hiawatha)
 
   08 Aug 2014; Sven Vermeulen <swift@gentoo.org> selinux-logsentry-9999.ebuild:
   Make 9999 ebuilds EAPI=5 and transform to make master for version bumps
diff --git a/sec-policy/selinux-logsentry/Manifest b/sec-policy/selinux-logsentry/Manifest
index 99ff45bf2b96..5ebbfeb5d634 100644
--- a/sec-policy/selinux-logsentry/Manifest
+++ b/sec-policy/selinux-logsentry/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-logsentry-2.20140311-r1.ebuild 399 SHA256 36aa872fa5cb9658986ab56a8ce764dd1dd40dc00cfbcee84a3513456d558707 SHA512 6cc86f6d59dd7c4e081e7c6050c3959f158413cda17875607897060e2acf6af0442bc234f04c397881e7dd74f647b53c41ea46f4047f04d8c0e808d59a7a3614 WHIRLPOOL 6da331f79e970ff84cceca18abf90b52938b233f28a614d36f12773d8897b25e9176e90efcdc0a178d5bfa319788e6e02d7c97c17bdc33b0b268e86c07391e7a
 EBUILD selinux-logsentry-2.20140311-r2.ebuild 399 SHA256 ba43ff1117b456a2b87e125943c9fb66c0b5d5d55977109e5dc1e928173d4286 SHA512 39b1bbff2d21ba04e4e7e8fde0d712796379e40d411dce8e3a60995670ad01a54681ec3f52c87a47e9c267d426316538f075e9370de89abf59223e453e371bb7 WHIRLPOOL 604ecf73f3f080b72f5f2ad96dac525e5d59cea9017a87aa4e85f890a675b4108722bc38f4faf01913a3267e2a215e1127b88ae461c37f33210f165ca819a9a8
 EBUILD selinux-logsentry-2.20140311-r3.ebuild 399 SHA256 8e45379ede6191edb90d5b84bdec4ff461665090233b73225ad69543d0660270 SHA512 5613ead2741d46fe33841f0b3c347f5f2be7ac64fc3f7db574832b0c4596a0b020dae5a560176d3b74650acee93399c7ae69aca131f15166b0cb356efacc888a WHIRLPOOL 177039c1c1fa2ba174ee1d31031317375d68483531f518a021a536da644b5be8e72c54c5e4e6aee7a097a1e6ee93021dc0e49dbf0a9004a6bc56a86b2f45a68c
 EBUILD selinux-logsentry-2.20140311-r4.ebuild 401 SHA256 3942ffaa637b1c470f27035525f2b6dbeb7b88459a1de10caf4db0646063f3ad SHA512 833dff8ee3a33b5e1049ee4e4a3dea3cd97adfdd376199f921b12b0499437a7c2bc925379c16ef0a68af0dc543e37cac0a1652f225969389e23a5e682e402ced WHIRLPOOL fea08cb6db30ba4f71c7819e8f93265018cfd2d58589bedf4c2441157f7df16c03f7aa89997719407d6065885c1699b52baf739aa717becce1d77f56d94a077e
+EBUILD selinux-logsentry-2.20140311-r5.ebuild 377 SHA256 209bae7df16b867677334382f0f2405b27b11610f164b38eafbc408682c916c7 SHA512 5f922b1e3cd5f5f9290ed0f9703ed9d265ef6e2043c49435a497ff40ebc08dbbbc5bf1407157b75f3abf450c2daa00b107d9999c307589996c3cf3eecca166b6 WHIRLPOOL 24781d73f08262e5abf834367620bd346d220d3d56885373ff2a47e1e03cb20d51af9aa105e437d3e606e589967b97a41f807b76bd93fdbfc532a70ca04a58c9
 EBUILD selinux-logsentry-9999.ebuild 357 SHA256 75d1fbfb678134449fa46614bc5cd6061645cedd5ffd07e51f19ae8fce43381e SHA512 38040242085e19353fb2d3a7bb8982b27cd3ad8a7ccbbfac5bed493081e2a3a441a4c7fbd48cc6e597729732208f9f5e2ba965dfb21d344b2b16144d30a5af0c WHIRLPOOL 6d0ebb99ca54c8c9346f7893bfdbc0552906266a13fe4bc6d2c390b4da1040f3482b4365507443062a8ecf5295e625ab74825c8905c78077414d9dea02ab5e9b
-MISC ChangeLog 4354 SHA256 5a4e748f69aabd1ea3d140d48c4a5cf39e80bc4d1f5d569fef9f0a89d1b35b8f SHA512 53b05861d5bafb8a214d7e2c9a9a68cb831410b53421d8c90508cee1549e2db3e07bcfec113a7a16ad6ae21fc547eedc20357fcfd441c4dadc68b0efe233fe7b WHIRLPOOL ae1b3d4b8c01207945c416a52015f7084b502043497cba819a6c0ecb03be9c2ede1e1280e2d345dd035fdc2566cce4469cbbb0467bca179dc8e06d902eb9f705
+MISC ChangeLog 4552 SHA256 47f7845adc55c84291bf281b2bac516bc2de598864f4800cb7c7b89987dbf682 SHA512 6d081fd1e32fbc7b1a41262cb3b4eaac2e919100d5c7982c50602e76c5fc3ab0e20ff9a08c832e668360ad9bfd613ff80171fd7e869aa2bd692af0ee0cdee29f WHIRLPOOL 9dd99fc7d3c828f8fd2261159156eacd31c2392d0a11d4ad755fb013d4ce14cf13d6efdfc67aca3221e328c88bd96d5513e4ef123e198d279807f2e0fcf3888d
 MISC metadata.xml 233 SHA256 a45513bc35d897e5e2b9c39919be68b9a0ccd9290dc80487cff3250b3b26cdbe SHA512 1c526a40fd66b268ff5247123032d1dcd7c840dadb48fc6ba84a72827b0689512a14996316baec616e9739034528b460fff94588d2662310e49095360da84c63 WHIRLPOOL 01cf20d72fd1efbd0526df464841c8f4f7af832897772fe0e13ade17410ff0f930fd9b03d1c32ddfc3ec2fed1c88fe1de6736ec8ffe146f45e0e2d3bed67919c
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0
 
-iQIcBAEBCAAGBQJT5Rx9AAoJEC7dUkA7aK9HpxcP/RlJQgQMGa4xjdTzSqSQuitg
-5Tr3e5TwueWj5qwixus4AzPGUhwqbrFoOg/JKc/6zbRHD1PNh1yfqVEUTjCC5v/P
-yxJ+1rIKzkwr+uixdXB2od0K3Qc4w1HNdN5kmg0+1hVpG+toC5blRtmG7e7y+G1A
-0pPLe6qJmNVCxwL5lUW7Kh67dGMRp/BMPTqXnTD+da50pAmkaHhh7yd+jPxxBPzz
-2WRkRpZgd1RVkDXcGJzQXPnMbAWMcgWJpEQSl83AGSpVbAtDnEMfrJOrCbfBCuXI
-Y9TY6n/hb4SgWMH/yTzLPZBk/6VaC2dXBF3f5FiIKVO6jk2199cZMBG2gCHdI/5L
-VP8xVVuh0RzrHH2PDGzJb53d8clam6vw442A0GnPJzLg88Z2tDm8ESlUjU/TN3Ei
-T9Bh1sWpvn/XR9MAUPQXMdZJqEN3Vcl42oZGmCrwtvah1KJXJqN+cQNu20PNvoPy
-v32mWX9EsvAoDuzFjrXy7MgLZT5cqK/DDIuvesgKGKQBXg4iO6xhvDhqmsC6AYUv
-hbq/l9qw7dwB67BZmwkF6CxhBy1Non9nThsF+jkOPqxyNMOFKG86arvwwTNDeVO2
-+PF4oAC5+1fm/syEaAfxTVdl+5LAzfs0ZTJc43v3XGV6DGi1r3/iFNRGXI/yDqcc
-n9KjYZGgakT11ScVoJdr
-=1u4E
+iQIcBAEBCAAGBQJT5nhRAAoJEC7dUkA7aK9HEoEQAIG7fH3vLkMtYyTqBj9sC4Ew
+si7sMnROFBeChSB4hm2VTjnVe232w4FO8onQG/PtoFvJNT5pk1Zhe8SeQlr1HLyf
+9tPDqd9sQLqHXW7BhxiVayuzxNuAxWWelLpTmMpK9Sg5hAB8NjTRA01I/y3Fe31T
+OQwQ0mjD3RfukaCT6b6hshMOztnAcRCumDVcSrNI9i3AKOR7rIIGkVyXwWuQuFSo
+GZO2H3JF2MhFkbkIg2gvXn+LAgZDglhasuDvRBxDpoBTJXqfwv1gyXbIllWXZoOu
+ANKjncbukS6FBnDVSZZF+xIdYEmLJw86oLmUWwQzUTOu5uPl6GNDA6+bZgheKAJu
+ujEDkwgYuf1Q3TEvLst7jDy6y4J88x+xYOoRON1hlSSodDjorYmdQ7SV/tXr4ojT
+oejnYxlpQif5YiEKp7/5odYq3WmQPx2B/UUt/gg4dyXgU0WGAmz9Zv7L2cJNB4+8
+GITq7nJzeREfwzxIhaBpwztoi/Pd6twH7n2J+seliJ1aJyLQOdQs+mMQeI2XdN/N
+2BGnwOQPqQ0U2U4by+jYzfIQg9hAfMdPiVOkIoQUemI5vlVXOQRYiDjVFrtwQxBw
+aMWnYAoDnzqcJ4ydFTl2BTJ2faAW5fWDesFh9GeR1nuHaFM2S+dEr9j70DXXSolb
+pr1XVJOg4gQYyN7+isdX
+=oHPQ
 -----END PGP SIGNATURE-----
diff --git a/sec-policy/selinux-logsentry/selinux-logsentry-2.20140311-r5.ebuild b/sec-policy/selinux-logsentry/selinux-logsentry-2.20140311-r5.ebuild
new file mode 100644
index 000000000000..6b1253119827
--- /dev/null
+++ b/sec-policy/selinux-logsentry/selinux-logsentry-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-logsentry/selinux-logsentry-2.20140311-r5.ebuild,v 1.1 2014/08/09 19:34:39 swift Exp $
+EAPI="5"
+
+IUSE=""
+MODS="logsentry"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for logsentry"
+
+KEYWORDS="~amd64 ~x86"
diff --git a/sec-policy/selinux-logwatch/ChangeLog b/sec-policy/selinux-logwatch/ChangeLog
index f9c75ccf73d7..c0b6c5b91329 100644
--- a/sec-policy/selinux-logwatch/ChangeLog
+++ b/sec-policy/selinux-logwatch/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sec-policy/selinux-logwatch
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-logwatch/ChangeLog,v 1.42 2014/08/08 18:49:25 swift Exp $
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-logwatch/ChangeLog,v 1.43 2014/08/09 19:34:13 swift Exp $
+
+*selinux-logwatch-2.20140311-r5 (09 Aug 2014)
+
+  09 Aug 2014; Sven Vermeulen <swift@gentoo.org>
+  +selinux-logwatch-2.20140311-r5.ebuild:
+  Bump towards r5 (fixes duplicate context for hiawatha)
 
   08 Aug 2014; Sven Vermeulen <swift@gentoo.org> selinux-logwatch-9999.ebuild:
   Make 9999 ebuilds EAPI=5 and transform to make master for version bumps
diff --git a/sec-policy/selinux-logwatch/Manifest b/sec-policy/selinux-logwatch/Manifest
index 9567eb0e94a8..6461e4dd1b73 100644
--- a/sec-policy/selinux-logwatch/Manifest
+++ b/sec-policy/selinux-logwatch/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-logwatch-2.20140311-r1.ebuild 395 SHA256 e2a48525985416dab37cfe27a9a3841acb8de717fff9feab86df6956989e2ce7 SHA512 1e1e92371fab052ed2fa1949f02754b613cf23f6a850c5f7810b02f0da3b4cd2ef74e93ca264352cebb4ddeae621110e365370ba087757898aeff061de06046b WHIRLPOOL 85777f6e6242d88b75b35e66e6e653f50475c7fcdd9130fbe740ae7120d0de33834e34fa54f4fa94a968a7befa06cd7fb751a943ad2b24435cd91a3440a36702
 EBUILD selinux-logwatch-2.20140311-r2.ebuild 395 SHA256 b4f89f6546310e8dc15804ac174397c93c531d86030538d5df50b71c09a453e6 SHA512 8737bfb0eefc6ea5ddcd7f2baa8221a421df925578cb09f8224f5c50ed9ed0fb53dd32fb46be3f24deb8d02f2186f3a08b35c682d9032ff6519e9fe70689892c WHIRLPOOL 57f8053541eae20fa75483726f802fd34cc2abd0a5fb7832aaf2258a86b345580d54796dd9919d05667a4766c5ea9196c1673ce8b226b4320e1ca595cd5d03fc
 EBUILD selinux-logwatch-2.20140311-r3.ebuild 395 SHA256 723f5363e98e0ac1ebbc8441478cd5036f204e9a833b2d7e4fe509747cde2923 SHA512 2c52d5b11d53e63bacf0bdd5675592bee5e20e8d9bb2f6502452d639165a5d1370dca48e634f73bda316ca6e09b661ccd71f24a16031741ed8573a742f8a7e56 WHIRLPOOL 5df61e205ac485aa0286c9722bb084be04954760021e868ebd2029a7747b1a74dbfc15bbea4ce168ed35fa40ca1e71427dd14a29374ec96c9786b27e4ca336d9
 EBUILD selinux-logwatch-2.20140311-r4.ebuild 397 SHA256 1e412fb6091ce5c42e4ec958df1ec82810f33ee1560739a24557b8bda7add232 SHA512 0e911de9584ddaeaa906753d9ad13756a4ce89508cae2388702a7fb1b9a3798f6db433432f0341f5fa20a72481b10f7c92b441493b62a847ae59e4f367b995a8 WHIRLPOOL 4b0327ef6baacc93e70ea11530f2d152d9a3be7c20be0f6ba9281fefd62db13a7047a2c69b979855ce04c66f8f0b37985da9f9bf4c1907218fdb41fb4b641c71
+EBUILD selinux-logwatch-2.20140311-r5.ebuild 373 SHA256 b63ce4725d8b879df5ee7ce4bdd1dd8d2589e19d7fd58755dac8554ec61cf721 SHA512 990c9afcf0c4e6126f57e64b4f3e7855cfef6832d252ec0ff0633ab0fb7fbddc02312f53d7c2b3c52c768b4674b7d7213ee22632aea12d3a9c029ed6168727c9 WHIRLPOOL d77179234a6b218e8861204093a2a4d81cd88ed28c3e86120120edf101b7420a5687e45fcdccee41ba1b633b0cc5688a646852997f9332c1f94dc7ef5696a317
 EBUILD selinux-logwatch-9999.ebuild 353 SHA256 996523021b03df379e58e5a81c419365c0fb6204cbb7d33b29f114e0d06c0a91 SHA512 16c6ff9bfdefb59e4fbd670692117e4bbcee78e421d7d4ded1e34c3d480084285bd7f8ef77a3f47a33e24d2416034cb2e7117d83c075202b86cc35650a78e4ac WHIRLPOOL bd855eccfae2f08c0239f16e24e6b3ea49bb645c1265a5e7cd58c699078a2ece7a51e1c9dfdc93b3f2a311e90131eb3e745c1409c18361aad1fa1d15fc8aad84
-MISC ChangeLog 6672 SHA256 0ee810ab0525f9b0d03a8fffac48ca9fb84b3f1173eba687aedcd21e5fc428c0 SHA512 c7cd2843fd88f75c8236ef7580d0db09b2d3bd8e69667879a54a324e4f1a14bf4084fc1523c6063b1a17e8a254d8cac6ae15130c0618287cec84554fcb1669db WHIRLPOOL b8242cb5f5eca21881c107242e8e03c9100f845acfbc5d5944c6eca21a2d8a676b70d2320ba1cb11020816196bc2e1240bce7a11847071a47631cc28f03a1235
+MISC ChangeLog 6868 SHA256 1b916073dc719d0ea4fac2bec1153ff1163e3299116901caf6b049923af342c0 SHA512 4b73a2afa4e87415975c40e7ce1df22d6c2dea0835953f718cddd75d24443d312e03c2268b9ae9b94cd1c04b4d34e88ae4fc4a7c4db4862114a7b80f366dc185 WHIRLPOOL d577bd133a0bed581e0644126730316b8b4c85a3ed414801aaa8d879e5d1a948592252b81d6febf9083170360a6b3fe36dac14593373630877ed0e9181f0b447
 MISC metadata.xml 232 SHA256 baac38e9dddcca11438ab626384e0b0b2797d2b14bbdbd29f427a598f574a702 SHA512 99c355f6a2a06802542123a53ead33e07546641c3f84a3cafa5a05d9e5158d3a109f23af569286cee7ee4affb40d001edc9de7217f1745e92f9bf99ff49db263 WHIRLPOOL 74932ab392bad71aad48ed138e472e946750e87c2f76a9c50fbd3dd6e6618ac11c7f508b770b25a195d71825ecb8363e157aed65a8f89a7947fdf684c2ca0f6d
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0
 
-iQIcBAEBCAAGBQJT5Rx9AAoJEC7dUkA7aK9HnKcP/icbJsVpIsjB0kdTQKMf3ldl
-cytNgyw7WBSZ3rymLR28LJCpWGWSICoNaBP+LSOARfmSfRoj+bP7GvWAFoCV10Cd
-RQOznJStgF4DFuCcD1hYP7tiL7x9f/9LRbpZR4WaZbGUHrTkBmzLJlQBrwxmdAJO
-Z+pFzf9wrhkBzTkfrBXkzwbl+MjKA1CUc0+P0teS9mfUv5p6CWNfL5KLWBMdzC0W
-/ExrsTdAjb9AP5MEWRm8ar5yZ8WanzoGCsdYHXkWUE13cc25s5RHD0eMBMSw5Ej2
-vX7vr/OKdN3VRVzd0WrogD4WQh8Gj0jYYLn1zRqZRJAC5JZD26ZwGJ/IUsrvgtIZ
-7suv70sqaX7P+E7JsJYdfXOwuXJEInLCzy7sa2va8YVsjhYgoCMYpFNwgDlJoxTF
-3cVkr/7WMdFdUD1JD1Yq+Mk+t6gHn+WFDrdmafPBth/uLEOcqT00SQlRt2NJ2GWy
-vLylgeYwkSh1Nc/xIPod6gZkrBgEmkni1/HSRbVxIWMjatqlRds4C2OUgJ6K1OOR
-UedN0QMWo9jpQv5gPFJXXzBYwb/m1uk5s5pMzaV89Sp1iQ8uiyVabu8rnn3eU1Ph
-+H/PJh0602VZ83fGD5kOAXYcbchjDY33xw9lSzsCNAWX+J7pIeWppVGyfZq8AsUj
-D5lv262/Ohzf+KMT8GCO
-=iHBo
+iQIcBAEBCAAGBQJT5nhRAAoJEC7dUkA7aK9HlSkP/jJvsAY0TMJr6MTDJ8lL4QI0
+dQ6EZAPzbI2M6qes9mgq5u1SKgj2yiY4hzO5BbG7OW+5Kqk+hJJIBbSoahz0933c
+qgBZwMogmrykqShynKXr7Qdma+55KlR5l540Nndk1OVCe3S1F8o6y2f3ErMXCyIw
+zFEmLeZe36XN3hHn3GAIXSRzh0ExNkFxaiA/LXlwTg9dXu7OwhtPvgt7vfKHYcrd
+OqGE8TOdv3az+Wf23DZ7bpY2pB58EgS85JxFio5k5HX7Xj60zEJyzIsS6wc4Xxby
+eRGj8MvKeLz70nyeeLjnto07rdlZ3ap+yRJI16v99cHTwWgtUFToLiDV7lYip3JT
+Qd8FMhQSYi2xZJiljXp/+isW4X5aWOnqcsySw6TZYvVuKlE6GnPKNxSU65b4s7ps
+EsqfDAS+3t44MjQBBVLj6XhnPxXP+f/rkCd/m1MXSWTTzLvo5Hxr7JXluWsUNL+D
++W1wnSlgymIuMojjzx+v3jgbIXeJMSF7FOCHtIy+/QaDiMqR62JJw0Z2BN5HLBuA
+apVK/qp66lpyWPVWes4mlR1llVpiGf2yUIHZia6dhtFpbm/jxxBUIJD4NP1MyMib
+y/9onlk1qaHDTpdCTX07PAaYr96uAEWC/VhgtiQN2pd0Gmm9w3FKBbGE0hRrljdG
+ZvNeQ/FYEVuzVL7zY4Ot
+=tQpw
 -----END PGP SIGNATURE-----
diff --git a/sec-policy/selinux-logwatch/selinux-logwatch-2.20140311-r5.ebuild b/sec-policy/selinux-logwatch/selinux-logwatch-2.20140311-r5.ebuild
new file mode 100644
index 000000000000..cc194782264f
--- /dev/null
+++ b/sec-policy/selinux-logwatch/selinux-logwatch-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-logwatch/selinux-logwatch-2.20140311-r5.ebuild,v 1.1 2014/08/09 19:34:13 swift Exp $
+EAPI="5"
+
+IUSE=""
+MODS="logwatch"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for logwatch"
+
+KEYWORDS="~amd64 ~x86"
diff --git a/sec-policy/selinux-lpd/ChangeLog b/sec-policy/selinux-lpd/ChangeLog
index a618a14de588..344a87938388 100644
--- a/sec-policy/selinux-lpd/ChangeLog
+++ b/sec-policy/selinux-lpd/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sec-policy/selinux-lpd
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-lpd/ChangeLog,v 1.51 2014/08/08 18:49:37 swift Exp $
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-lpd/ChangeLog,v 1.52 2014/08/09 19:34:35 swift Exp $
+
+*selinux-lpd-2.20140311-r5 (09 Aug 2014)
+
+  09 Aug 2014; Sven Vermeulen <swift@gentoo.org>
+  +selinux-lpd-2.20140311-r5.ebuild:
+  Bump towards r5 (fixes duplicate context for hiawatha)
 
   08 Aug 2014; Sven Vermeulen <swift@gentoo.org> selinux-lpd-9999.ebuild:
   Make 9999 ebuilds EAPI=5 and transform to make master for version bumps
diff --git a/sec-policy/selinux-lpd/Manifest b/sec-policy/selinux-lpd/Manifest
index 79619e635314..07ff6e3978a3 100644
--- a/sec-policy/selinux-lpd/Manifest
+++ b/sec-policy/selinux-lpd/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-lpd-2.20140311-r1.ebuild 375 SHA256 183bbeebd63b6caa5fb746f0699608409e88b0d58a188061d664335d13e475f9 SHA512 ee527ad1af80755fda6020bbd46020ac92f0eab2a533e857ff3076b43c28efad31adb892479785336b1213ade65dd80a4db94696b03e2b663f3b419fbc2daa83 WHIRLPOOL 4dbdc903ce2cafb756d45fce96cecaa0ea84864a8f365ebc5d7a5ecab40f4d6155722e52d0215320bf40186b249506d5865d67a9a80e79876661a5959b49e204
 EBUILD selinux-lpd-2.20140311-r2.ebuild 375 SHA256 fb6dfa1eba2c2e7f5f41db090565d9b053d98d07f236812d4efe28e7e1b9178f SHA512 9ac4df77534cd9799291537993adc7f68e656449e391838b4f52ddf7195a505b16b443d678e82ca38b87d1d88950f7709f044e04267c2e0e49574f45d300fa49 WHIRLPOOL 820effb33cf081e9e3f23eca013f498ea4a91c3ab050363b39fae2b64f7925658d72358664ad2c835c977f3d2fd482a5fcf465f1e8b898273f77422c42869455
 EBUILD selinux-lpd-2.20140311-r3.ebuild 375 SHA256 cc538fcd8dc2cccd5ece5f3871ef085cbee2343b5b538cc9bb0bfc8cab3de494 SHA512 32c1070b8109f7860f9aa3789c6864afabe1c97d022d22037d6171bfd1b15c4bf782235c0a49a435d3cf33c3b1d69755ef448c545413f0299c8c448e55b495aa WHIRLPOOL 8887873f85cb0571c7b2fb6ff9cc2b06be51a94cd4aa7a61b7d307be8a697642bacd4cb2103838bf60c17b5620ece49ca62cbf85a0ecdd6c81b6203339538847
 EBUILD selinux-lpd-2.20140311-r4.ebuild 377 SHA256 8f07ad31a0567b1384575ef25d68cdefa2f91075e33de31fe7b508a87153e718 SHA512 fa9282794e7de1c17c6081b29286879d4894fb46cc3cd34630011139442dc0da2bc21f3e89d4d68037e7ef0e49626c9660c4e3ae87512faa9abafff0aa0f3bfc WHIRLPOOL 53ece2a5cee6795a9edc45bed6784cec0b91604019253dacbaa90a1dd4571040bf9df7e4b5d15c5a88d1528d6ebaf8947872d7261c72effa57d1e54fa129244e
+EBUILD selinux-lpd-2.20140311-r5.ebuild 353 SHA256 c5960ab3f22c103f3bc37e94f3b6dbc73f03774c27aeea2cb566e3ace6738edf SHA512 57b8dba47e6670114fa3140e0c768eef56295565d1cb76a14fe8fb79a61a253bf0b39d1062503810e9b4ccfa01f0ccca04ff9c1815e1afb0ca635867546cb23c WHIRLPOOL dcfb0b27b86c4f47ff8c171801e2808c10b522a03ac5f93a42795c1b55f6dca7751c6134d66a56f783e5b096d4eb74212b844b5a45dd5d1a9750d7869dcee2d8
 EBUILD selinux-lpd-9999.ebuild 333 SHA256 ac26c57764febfbcd51d08e07188f53cad78e51dbf1b42dd0dbaedf210400e57 SHA512 a626faa4751478a9a7baa5d33e6dda8298109af1cf7a23678e10685accc19e4b6666944f656ed1e8240b840c10cf7ccf205d5af38a50365d497b095b3428e6e9 WHIRLPOOL afcfadb99af78bc33a60e7b447475652d24d87eb05e927ff494b84f90aff0f45774defd9eb4f81da183357bbd11aa8a448847d537bfb79f50141d0c51a9d5e97
-MISC ChangeLog 7769 SHA256 cce7005cb35ccf851e4ce8d5cc2d327eff8d4da931edd605e88821d50c3433cf SHA512 3c557ab2cd176239aa506753850d4eb51e0bb7b47d3abe84c6e9da43df3d1db34ca0595c24383a8f26614b4858dd416516897113de28852f64ab362c6b375ab0 WHIRLPOOL d9ebf1fe85d8ada908f0d91cc94d9b059da18349e43f67e92b2282f426079554a4c7058c2d8ba745196c0e2fb5f67d15cf89fc5916518c5574ab669e36871516
+MISC ChangeLog 7955 SHA256 47fe78823442dc52dd8cab7b023f4c69f2502c50ce909202d532a51cc7534b6b SHA512 75b23072ed1365f7991a8da40f01d40c149ed3435b382b7cbe0e93c41810d683d42ca62d983b97da241cba1cd5ce0b33b48a749bf292d0851f636747b64eddb3 WHIRLPOOL db04e4b015963bdccc466a487269beaa3687634ca27d284e4ffa92e8ccded88ba564248d5177820b1dd7b928f6d06d6f6c1959207a7b4a56d68672af485db145
 MISC metadata.xml 227 SHA256 64478dd2b9d0596f47aebeb25e1aa44ae2b543c4c3efbafe8e4c8e0f1bc310c4 SHA512 6898e3ac54793fd5b540e1ffbaf6650dc168cedf3e0b51121bdcc002349c6143aa5c52845223ae6e25dadefcf6b8c7dcd44fdeaf1bf473e5d4d76a1cd6da5963 WHIRLPOOL f58810644688531b807664f52d93f315e3f92e6c2ad0923ee6f77cabd5b01adc60d583fc5e153ab06b275f68a162fc3994bb70d97d2f25c467194e66c8ae977e
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0
 
-iQIcBAEBCAAGBQJT5Rx9AAoJEC7dUkA7aK9Hc94P/RJXeUgotNXvhEHMgGZ7xdfD
-xUeCsgasFfm0i0LvzDbmkuEw50NN+CioP/RPY/gWj6hJpBFaRJ0sYWeg/tLuE5qk
-Mta6Z7SzQrtMN7UYvQ5zpFNLIrA3BjT6sddp7mjOIYSdxZcPoJMhqRYWwJ32nxJb
-WBciA673Jje/LeYD1Mccv5AqC2TJHr2GJgu+FSIUVkwkqq5ubUI3DqWZgbtY63jU
-zmRx5mYlW4TipnfZp3+AmBjvw2AgOqRDFaeoJoyZ7gL93RHTnLUUJrh03bm6KNcs
-y2lmSz9xIaDfF0kfiZP4Kva02V9sKpRINQmNpW4MPYxiNGDb44TYux3Fb8QSIfQv
-pJ44gRHKS2kGLr2V8i1cGTIIMRSWWnbBYxqHULtRmHtszyosdQCy9i9t9XcD0haf
-egYK41cZeNH3TfumSddmcQyn6nuFLnGXmzlpmmEFfQH8VlVwX9Puo8nOPpAMspX6
-eGOP6scw/HCyLtYT8frWbc6ODtGnZHS8+YxwaT9itcwQbCAI4FiIuQq0ytb9+ZkQ
-lPOTOmKlv3KsL/fISTtWAf5m9SR7eOLTpzE5ywL7S2a/fHsyxSRGsIa7m4wfF3fY
-Exjj3ZEbfBaU13LnEi3IAns9TURcvdggGth0gbp5WmLsjn+Odfxfs/TQSFw5+fDA
-ogO7iizExxGlczhqHeEN
-=SmIf
+iQIcBAEBCAAGBQJT5nhRAAoJEC7dUkA7aK9H+WkP/3BoF3/v5DxifFL3GpLXTxO0
+9W8E277rx27Kvfd3r/0+tn+1k5+TPg21kcaQ0nus/cNuoG5svSdRzLb4PpzVj6OZ
+cZs/wVwyrtgy3JRWJCePqh3H55setPm0aWJZEpaNycx5IqUgo9jdbhdRBu63ddYu
+S5QhqSF+nznqC4ItCzLC6IycvqGvZkHFPXZyvDFqcQ4Nfecwoh1pbGowhPX+Ywur
+u/h4iwdfT4LdOeYgfQoYK8kPWtftpxR0UhACyuur1LHcqMsKZx4+147vny/40SrD
++NPCH4uAACGEt+CMwU4pJzeH+qXLJZzZ6HsXEwiiFUphYgOYDw8uL7/j/v9Q5mAp
+YNa6Z+3lcd/UMikmSRhOrbaHCRLd2I3dVHq1o+sQ7BRaXJtKDUWScOPG60zQ9ZxE
+TlDaicL8Yi+93bB0rWKNDFY8T/f4z3v8iGYpb1WblCaRpPGS9bC4fs+VYH+EerGJ
+d8ZZh+xbTihxfmZQmt7gx8DGkLfHAmw8ZK5Bx5IxTgcDmHr+vhgZAZ35EeCEjDfY
+YMK5Jtc9OGArfrZ47giGSi30KYRzNqATtHrb07K58Q1Poy1pqd5sQaV0HLBl01Nq
+zrNkiTr5QDyQuehbwZHqPmX8CwwZXf37kMzZbwnahRNKV/7L6PewRA84P8OMBMuH
+OGIyANOU9m9R2AVqP97h
+=F3Dh
 -----END PGP SIGNATURE-----
diff --git a/sec-policy/selinux-lpd/selinux-lpd-2.20140311-r5.ebuild b/sec-policy/selinux-lpd/selinux-lpd-2.20140311-r5.ebuild
new file mode 100644
index 000000000000..3138233aa909
--- /dev/null
+++ b/sec-policy/selinux-lpd/selinux-lpd-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-lpd/selinux-lpd-2.20140311-r5.ebuild,v 1.1 2014/08/09 19:34:35 swift Exp $
+EAPI="5"
+
+IUSE=""
+MODS="lpd"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for lpd"
+
+KEYWORDS="~amd64 ~x86"
diff --git a/sec-policy/selinux-mailman/ChangeLog b/sec-policy/selinux-mailman/ChangeLog
index 93de921f5425..bf4382370c4b 100644
--- a/sec-policy/selinux-mailman/ChangeLog
+++ b/sec-policy/selinux-mailman/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sec-policy/selinux-mailman
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-mailman/ChangeLog,v 1.43 2014/08/08 18:49:32 swift Exp $
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-mailman/ChangeLog,v 1.44 2014/08/09 19:34:26 swift Exp $
+
+*selinux-mailman-2.20140311-r5 (09 Aug 2014)
+
+  09 Aug 2014; Sven Vermeulen <swift@gentoo.org>
+  +selinux-mailman-2.20140311-r5.ebuild:
+  Bump towards r5 (fixes duplicate context for hiawatha)
 
   08 Aug 2014; Sven Vermeulen <swift@gentoo.org> selinux-mailman-9999.ebuild:
   Make 9999 ebuilds EAPI=5 and transform to make master for version bumps
diff --git a/sec-policy/selinux-mailman/Manifest b/sec-policy/selinux-mailman/Manifest
index ad3d38739550..95bfb21d636a 100644
--- a/sec-policy/selinux-mailman/Manifest
+++ b/sec-policy/selinux-mailman/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-mailman-2.20140311-r1.ebuild 391 SHA256 a1af0f72d1fd92e9ce6fe33e91f340decf0d5623a8ea8c9cc99182b1af62c7bd SHA512 f0dd86d1e86a434c92bd0dcbc3472b1917b29016342321ec098db9909769d5249d63beeba926368e848856449adba873ec5ff18c9ebe924cf114101495954e12 WHIRLPOOL 70246cdd12035649d6a62f303f33a019c4a1af7f71b0de137c884c92791cd3d31c1b5cd68335330dabf3e106ad715b36b97ad7df6ad2549ede1a2422547266aa
 EBUILD selinux-mailman-2.20140311-r2.ebuild 391 SHA256 f0804bf575ab1a60f0bebb820e1bbcb6cc7bea0991773cbcfd829f121a1fe9ce SHA512 7c2424fbff529b6c72813978dc1356d98ba61a0efe591f25accd576b06c48b32e83cd1ab73d19aaeedd359ff6bad22234d653f5a5f3d5090d5933203088c0850 WHIRLPOOL d1c7251a889e25c002b8e4e5ac2b96d5fecad5d004c9a05fff8c00a3364542ea174db1b619527e373a45cad0df51a36427549966ec0f40ed9176c98a52bd9e1f
 EBUILD selinux-mailman-2.20140311-r3.ebuild 391 SHA256 aeb4b37e1312cab74649cdf5f1c6e3d00e7fe88880a0a80b84831b107d6bd7c4 SHA512 1741ed370331aaea35c4884ad8b7527fa056f4d938843075f1700ab71f12a24b311d68d66f77a34a24d6434d9425fa2967e26a6fd49f1a1acde5327bb02d877a WHIRLPOOL eb6125c09aba14370a6ebc2260b0fc3617c9e2b565bc3dc5fe0dc09ea8b542793f4704b71a8c27ffd54ca590c7daf50121009942ad05498c5881ca64e7d60965
 EBUILD selinux-mailman-2.20140311-r4.ebuild 393 SHA256 09db69e82fa97c9226ce6a0176c2fc60ddd13397e8b7928c1a38e765b4159b6e SHA512 442f5694500e378629c508ac220c2fbfdc465edbf2a2bca5d8ac354c5f908dd7d99b92ce387188a2fc23de788910500b3e1c11deba4f29fcf3a26c8721bae596 WHIRLPOOL abb1f17feb58e40ecc4f8f64fbf48a6abdd28238f990d348f792bc9771b659cec3f09bcc9cd6b9daa3ed279c86b4527a7286827be0a1620be616f704963252c3
+EBUILD selinux-mailman-2.20140311-r5.ebuild 369 SHA256 fc1f9d4c4ec05188464ab1b406db834e4c6ae164e5441deb3535ac7fcbc1dc03 SHA512 bc0df85870ed597b12cfd767de5e398eb1a1f16d5d2bb3d7c60204f412309caef047f50afb231f01c8f7499b8939780edc519f43bfc375e70072a28f452cb1fe WHIRLPOOL a963b3a43e34ce85289d5a57f6b763b01db0f224ae58a6480c733821cc27919896c1c334c85d967d5128e2bd90a7b09a0f0d65649fe9fa6e7c1f4a08b6940c03
 EBUILD selinux-mailman-9999.ebuild 349 SHA256 9a85849a5203597f33a3335186f6d77d1dfcbb6ef9272b97511476ef0e920217 SHA512 5721b14cd90b6e457eb5da7cbf34ef2a1062e8edcdd8edfc78816fce31480f763a3ac86885b9e29a39814fbfcd9c632ecb5ac777e1118ec12d7ca2c6ebabec6b WHIRLPOOL 5aa4fc534eb04fffb7eb6b4c8e7cd0fe5930aecd68f9f85970193a1da123afbfd92f15e6a43aafa466ea280e31780ee9d7d1fd77b99e8f702cb3f5c0fc5f6056
-MISC ChangeLog 6784 SHA256 1121193bd4c96f11896e2527221dbb1953d090d61ec507f194089a5bc86ca2f4 SHA512 1eb65026854cd1f8c29526bee737649ed4272dfe0a0604ae4a79b324687c4fea78c70886e07c04ad06a723cd0b55bc7c20e23fa11bf50b80c9f4161ec79a309a WHIRLPOOL bb10295527fc03ccfff82f33a915c6bc3303ba309c4f21dfdbdfdccaa308b0ab4cd24f462acd62c703550311db4cc7ed1d5314fbdf54e46dc249b7f17be3b882
+MISC ChangeLog 6978 SHA256 2013a6558f8d471258351f51a749b393da927f000ff6eda0eeefd3a190c8fd02 SHA512 83813d05c1af8e45c3a9964f1b541ed1123d4b27bafaaebe73a9563f9c91efb69c74f5feecb8585a1beb3ac282365c6e9dafcd7fb1f38c9bada3b3820693e97d WHIRLPOOL 9ce63b0809971da3ebc96929ee6d745e9a11e4898e3b2adb3974e5dc681b69ddf75e0e419273500014c0e55de4e77e8a1665e9306f263aa15931be805f0bbadc
 MISC metadata.xml 231 SHA256 8f6e300b0dbb01ffba031b573afb1206adec3a26e894628a401061ffafb3c38a SHA512 0cf287c47ab272a9f3b33430ce4c1f92b50bfb003649e9b32c2de7653895d0dfe1f9ea8b24521d0262bd8ffee0cdcad3fb135ead183917fe5008eefbd5155495 WHIRLPOOL 82b0b83e3116b59c54f19b741707a5e000a647d7acd6751c5a9f9a7c542f96fca1fecaed4971d179b232aeb6cfb48b818f62973f201dbc9e29a98fd0fab98095
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0
 
-iQIcBAEBCAAGBQJT5Rx+AAoJEC7dUkA7aK9HWekP/1XsGkVONT+OqTxnpm1FrNKW
-rd4u+Kas5qetK9VOFWFjyJHBadD0bIM4BFOlB/BYcv++efEMBN4a34UMzz3VV1UE
-XJzUWRM0RXmWsH1iwnGJJVQv8AHdfI83/bZ+tngohEwZ/JE3xXNN7zMtSsGLK/io
-gl5nVXOEP3GlO9N/PHiVOwtoMSksLUaDcXONtmRg9LWFSOt+PmBdfBaLBui12Zao
-UXh0O9PwT30ud5AhEC1LmkWWc9E21yAHb0P4bDMwbEVgp4EkphV0VpROiOc31htK
-Js9JBwZCgnmyN3efv/4U5DzW090ao87R5siBpklkMJBjvZ0fkjd+dwzveEp7V+NI
-oUlv+bAgWkoKEE2IFGg9M+c3V0BrNJqbsDGq+alo0qYaXwptmnNNcc7Xrba9m5bV
-bId//eQGGjcFaZ/fenpHFa7GEqDUMgqh0uFUe/pW0aYBD4i5WlGSI+vfDr0FWQnN
-GWXmICCvG1njbQpRPuW5vmMUqkb4SlSvZSTFfcnyeMWE6nETBDMQKBHnF6K22qto
-v6c+0kaKz2NgClQws6VyibnagSk0+ZLAnkg6VKHIXhjmxGXR+Rxgh7uRtlvfCkB8
-wrmieE/ZzN2fSfY0liU3hpYAYW0vbed4sN1wMcd0cpBckG5J8Y8rVkQDjxMQ8rCb
-guFOAo53G+ApyaL87jtx
-=zVXr
+iQIcBAEBCAAGBQJT5nhSAAoJEC7dUkA7aK9HwhIP/j6kiDljixjq7KXrVEhRHkI7
+QI0BYkHN3vMrLxl/soDsGIykZr7kl1U2OaEOe+Cg7KVRs0t8EaXaJlPe+CifnBxm
+uNxAGoa2VcTqda0j/Noi7MBDXUdoE1vVmT59NlHSIy+LTd24+/13ZmM8PC7VQOrf
+u2mZxdY5VNY0e3ryFXkmd+FvFs83Cw6TlIQfuQKCoJCbj+l7+x+4rhTXEjcpqAqR
+Z7PO4kLwTZerGxKzHUy7BEfP56MPMtT+Wg6KANKAiFoDzXd0Uq4hbu9ESYakoQJU
+Y7nTOpOhLowxwozSRjb87bubxbLCuRuQGDxcCBs5q1f8aRk/jkTEIle3dGN2+d2Y
+X9Ep2ZjSh7skWwQvfYE5rpYBTMVoH7H052bDbHdSnJF7sgeWi98vE12QYt/VecPw
+RdXxH9bvEdAllbUxHMjPXU3UgSmBDlQhU+BMuDvFESr0YZdo5hKxLMGTqsuAYi/G
+8zmjcrYHzoBCDg8l7SyhDS/JeTUI2uvZhtWX0fQ0eEx/R85C9R6MZg6RzIeHQsxZ
+30cGmMFe+/2ZtbnxwyflWpJl4K5FcOD/iFFMCaiUmmpbSqqerw1D7nFoJPQf/u5U
+1n5nj0n3et0NiG1e8cQ3T9rVTI4ru656J5oKBJbFRBmky8fFMsnfIsqgT4At2xp4
+gfs1VTMLgPDpQs+KcscZ
+=OUdS
 -----END PGP SIGNATURE-----
diff --git a/sec-policy/selinux-mailman/selinux-mailman-2.20140311-r5.ebuild b/sec-policy/selinux-mailman/selinux-mailman-2.20140311-r5.ebuild
new file mode 100644
index 000000000000..879308face8e
--- /dev/null
+++ b/sec-policy/selinux-mailman/selinux-mailman-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-mailman/selinux-mailman-2.20140311-r5.ebuild,v 1.1 2014/08/09 19:34:26 swift Exp $
+EAPI="5"
+
+IUSE=""
+MODS="mailman"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for mailman"
+
+KEYWORDS="~amd64 ~x86"
diff --git a/sec-policy/selinux-makewhatis/ChangeLog b/sec-policy/selinux-makewhatis/ChangeLog
index d2e026f3df5c..fafbfb438a29 100644
--- a/sec-policy/selinux-makewhatis/ChangeLog
+++ b/sec-policy/selinux-makewhatis/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sec-policy/selinux-makewhatis
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-makewhatis/ChangeLog,v 1.26 2014/08/08 18:49:34 swift Exp $
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-makewhatis/ChangeLog,v 1.27 2014/08/09 19:34:32 swift Exp $
+
+*selinux-makewhatis-2.20140311-r5 (09 Aug 2014)
+
+  09 Aug 2014; Sven Vermeulen <swift@gentoo.org>
+  +selinux-makewhatis-2.20140311-r5.ebuild:
+  Bump towards r5 (fixes duplicate context for hiawatha)
 
   08 Aug 2014; Sven Vermeulen <swift@gentoo.org> selinux-makewhatis-9999.ebuild:
   Make 9999 ebuilds EAPI=5 and transform to make master for version bumps
diff --git a/sec-policy/selinux-makewhatis/Manifest b/sec-policy/selinux-makewhatis/Manifest
index 588e828ad321..89faa4e04417 100644
--- a/sec-policy/selinux-makewhatis/Manifest
+++ b/sec-policy/selinux-makewhatis/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-makewhatis-2.20140311-r1.ebuild 403 SHA256 138444b212cf9e841b5a58375acb71992ddfeee4404395df51647c745e04a0df SHA512 e19d1e1062594c202785fc83abe4b0fd76ef4bcd6bbc843984000d8fd0ea7b1551b1cc1e5f8d1a04ccc1590ec54e2d16193b2cd74b75685a6c6e4b7c2d0efa83 WHIRLPOOL 0c1d7ebf4d60b7fab5091b1828dc950ce5eb904c36ffff1d28d0bf31ebd52ad63150c517b9846890bf8dd4341fe9542330e6fd12cec5b1f85a610ba48bab345c
 EBUILD selinux-makewhatis-2.20140311-r2.ebuild 403 SHA256 88cb81454f3c063b941f503971f5bdca2247d1d530c8ee8164fab6b4af66debb SHA512 29218f2888b7a436fba35cbae2f918e629bbbec95923088f9ec7e4da3c1e90dd5a61e81beeb316fe6ec6eec867314e500b666f2cfbae2b0f51ccbf92654bf007 WHIRLPOOL 88daa192a485e63e68e59ae3ff12ea9d27f2a45d433e4eefbe8ca3978c46cd118a11eb2e79f49bd202cdf6067dfeaf6b56589966a2262a2cd46a822fbbdb63fb
 EBUILD selinux-makewhatis-2.20140311-r3.ebuild 403 SHA256 f5cc3ac8fd28358f2b2c4cc0e541aaa237a7201605b29913bade4db774dc2743 SHA512 d868df28c22500f57c380a8b56040692aa6d1006c6f5d53c05bea057ffcd0365e00c738dbebdc02cad6261e225facaf5363a30cc71c046daf17320ad50a04506 WHIRLPOOL d83979ceb3999b08ca5207215b0b32f828686a127474a56fe0dfa9ab0ce66bfedc3ed8225464f1e8110d62862b647119e52ab4128f0e8b34dfccf5eb401eb18d
 EBUILD selinux-makewhatis-2.20140311-r4.ebuild 405 SHA256 aacd441e7fe1765dfa717d9991bf3eeef654c19d60fdad5f5a451e1315ad48f7 SHA512 d69f279bfc05b1273ab844083f5f83abe283b51005dc757b73c7da7a72b3be6b5c8c79e138c2e114f0465fd888f5e8ff140e99e32aca1b3bfb5a88efeeaf55c4 WHIRLPOOL 49604287e1d1199496bcf74e6c9731f549221674ffb0d04c8d84219c3cd29921d5735586c72eddb9a26338f5cecd510aba53db634380e83c3ac1bab01e04e9e1
+EBUILD selinux-makewhatis-2.20140311-r5.ebuild 381 SHA256 568b4cacfb4655ae3eb24d5af7cad5cded6e5958f706317cda275c4a74849319 SHA512 8529dbcdb5656021aea925bd2a0406d213790b5456ff70cd8c492ebcd1c8103c57a9e9f170f5dfa209353c9e7c4d4c6748acff06150fef8e94ba700fbb1d8889 WHIRLPOOL 0a966464d16935f4c35631adeee154f08ad7754441559723d6a69a161325bbbbf05b58258b39b0720ae020dd673b43d2a1d92a35b1c31691381d632cbcee8b81
 EBUILD selinux-makewhatis-9999.ebuild 361 SHA256 c411f59fd4be6dbdfe4417016f86c3ef09467a1925fcdbd473cf502b717e56d4 SHA512 e6d3611ccca20b203c8d0af54a5090b40bbe3bf75c7eff4470574b1985209aac94ff739d6332410d66f868d46d001e212e3d683367a50bd1b6ba2430a3cae587 WHIRLPOOL 2feeb99e0f0e3a88b1208b7a016aff9dc0da08abc7888b7903c0127407862fcf9f0ab54434f87726e3fdccfae14145340bf2512ee9dc9641e5184f1b7a3dcc1d
-MISC ChangeLog 4408 SHA256 9008d193458787e95ed5af1248bffbb89d22ded0ad6c41ac663c18af6721bbd0 SHA512 36d79c56930399389e9cc04e07f239e8168cc214082fd8c780c678d9e1f9752e2fffaf4d48d432ecbe46cf5612fbc6745cd2c5dd46a37d503fa9564bf1849d0e WHIRLPOOL e96268d2472ff212c2309726ebcde5d5696df5c877550374ede17bf820384dc53a8ee46b5a821937f2467a7fc2bc7233a05ef70caa7fae70c822108310ff2d5a
+MISC ChangeLog 4608 SHA256 0166b902d49e5fff5f48231594ac5cbe60a1945d175bcd67073edbe0a843c2af SHA512 9849aa4903efaf1f8a5a16aa0f60bddfa3669807dc73387f98aa02f36561a7bbbeba2e92562c2dd27b2d2fd9dac39db71acf25a3c9f73bd736a4785506671d78 WHIRLPOOL a97ccfc86c126eb2cbbe64f9bfb6dc6b585406e600fae825d19f4e8c379a26829579a8031e44349a74af0c2fc140f6359996e5b24cef352f0c6cb4819222ae42
 MISC metadata.xml 234 SHA256 042a338bfee4bd81c79a456aa6ff64f4131a21aedef9d37e0a3d00446fe043f0 SHA512 ef23797d552f7b56794aca3fd7b4355161f053522613f105a2f6136f386b74c5ba96ac35ca0c31a8b589ed74848fd33ac75ad389618ccd934beaae7ad9fc0def WHIRLPOOL 4aa59a36101ce0a732777f1c6bd849ab8b9a3a44a5b9ef2f7e20bb06148085343214db9fae271056b8c148800fddb765ee17c073b2f4422ba5356d0fd47ed59c
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0
 
-iQIcBAEBCAAGBQJT5Rx+AAoJEC7dUkA7aK9HKagP/j9Y1k0xTOaRcFrUD6pgaakU
-iSAslBno1JNZCltu2UKvubgW7loyoZPDy5NOj4eByBA4QIOX0cCeYTGSTiHu6sSS
-5ud9ND8q6d3mrdnOgct1bA9zh+cDbKsH0A+0tt7QrcS8wVgXVony8N19W02qkx6g
-KENOvvkGfoMG3LQG71OY06JwBYWNbpzbHz7/WLW+R8AGvROOTpJCuiyN1DzmRbrU
-HOuarVn0YGnzBirfjEcCOfaolRCZU8lDub5H4y4V56NFSrdAT87lSjujmf6BhkpP
-6vNSPAyWG/D15XC5WNdCa6vXHPSkz4y4ktBXtPtYjn1hXS39TxK0AHR0gLja9lPs
-VWwbqYJ4YLWY2qVm+eIcMYKW4zgcMo7Jwb3kjxvhFvoMDaQnKkno5eUiUlIVESqG
-V5UvIWBFVk84731TmTv/HiPnCQbPq1tM0GTrHpQAAggWTyNah8TL0UmZn0SMMiVD
-88aI7ixy61Sf9aqC9qC/Fc8JcsEsYgal+SIGV2HsjaMlSLW7tAOR03vB4zRv0AFQ
-q+dTU9yF0kFJXyETKZnDXSjkj7tQduYLh0Y1GGa6U1QsR8IYJkDgQ2bgxbSW+Mnd
-edElxuRAOl5nbu0FLiyPdY6NmfLXH4EUBJbJb308NEBm4U0mjwZ72Ej2QSdoS5ds
-4cINNtO1roPSJ6ADtxzS
-=XECC
+iQIcBAEBCAAGBQJT5nhSAAoJEC7dUkA7aK9H3cAP/A8fObyN5Bhp17Pm3gHcyURb
+mQwwKTRzKVBmDQ4yzZHa0DDQLqnumdp9dbPXi9aETdUnak/v9DoCQXXIxp3YhHsL
+XyxII1SctXmqKf/U4TsD8m0z+D2g6cQKYECGumNhcmylYFe+4tf1czrjOjeKBVY/
+LI0Mtx4ZqaNiJne3YDSFhDBxY6+3zuuGxmUDVruwO0Dlhn7zY1+ayNfn0c+Iejg6
+SE4XKboApor7p1EbqezhBd+XfrLdCvr9pplhxGlqx8Y3IdD3QqcPSqqX/bni4vUO
+vYeZyVpZlNFk1NnQpzJ0j4y0pQztrJ2XBhk7DAtmIQZzfN/2aStsjEZJ8LNzPn9e
+tQyKtTl2ZSIl+dE72cTqn8vnJeBxfitENbmAYURdoamMl8x5lANqUjfXajo1//hX
+wqOjpJ6puptU7cOfoGfuyMYTtckLmoooXo2MA3CwJYXDeVVUb7XVLUePuSPYesZ4
+YzWC8rooPgdeC+HWcXF4V3fw8qeWz2VB8KDyY3zxetjmwtMLH4/iDYDew04wmwmc
+hvXLsbY8gkN3ZbGT/ltwlGT1Qx6O7vsnQcqzSKSoLcG+I3H10APlgeLZE5Ayqcd8
+QBxFVFBC9/EmSZyEFOBiDgemZCnnqK6ORwetRHIyWxgmdlmZKFA81pTzLFB35umV
+v5wBMovzs/HIyzwK6Uhz
+=DWCb
 -----END PGP SIGNATURE-----
diff --git a/sec-policy/selinux-makewhatis/selinux-makewhatis-2.20140311-r5.ebuild b/sec-policy/selinux-makewhatis/selinux-makewhatis-2.20140311-r5.ebuild
new file mode 100644
index 000000000000..e819c54d1e54
--- /dev/null
+++ b/sec-policy/selinux-makewhatis/selinux-makewhatis-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-makewhatis/selinux-makewhatis-2.20140311-r5.ebuild,v 1.1 2014/08/09 19:34:32 swift Exp $
+EAPI="5"
+
+IUSE=""
+MODS="makewhatis"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for makewhatis"
+
+KEYWORDS="~amd64 ~x86"
diff --git a/sec-policy/selinux-mandb/ChangeLog b/sec-policy/selinux-mandb/ChangeLog
index 531bdf713230..e94db1fb169b 100644
--- a/sec-policy/selinux-mandb/ChangeLog
+++ b/sec-policy/selinux-mandb/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sec-policy/selinux-mandb
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-mandb/ChangeLog,v 1.11 2014/08/08 18:49:18 swift Exp $
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-mandb/ChangeLog,v 1.12 2014/08/09 19:34:14 swift Exp $
+
+*selinux-mandb-2.20140311-r5 (09 Aug 2014)
+
+  09 Aug 2014; Sven Vermeulen <swift@gentoo.org>
+  +selinux-mandb-2.20140311-r5.ebuild:
+  Bump towards r5 (fixes duplicate context for hiawatha)
 
   08 Aug 2014; Sven Vermeulen <swift@gentoo.org> selinux-mandb-9999.ebuild:
   Make 9999 ebuilds EAPI=5 and transform to make master for version bumps
diff --git a/sec-policy/selinux-mandb/Manifest b/sec-policy/selinux-mandb/Manifest
index e751e96a5726..445524703b2d 100644
--- a/sec-policy/selinux-mandb/Manifest
+++ b/sec-policy/selinux-mandb/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-mandb-2.20140311-r1.ebuild 383 SHA256 e34f66b6087f92ee9d5862df64891b6a89ffd25c13b47322b164c84b5b0b7b06 SHA512 9ff8dd4a738d3fe32d541f5aa1181771eeaa28b35573e89b0f4d9c33a17b04a1d9559f216fb5037e307321e9f61d7391b03a8c79dda60b3b2c7fd7372fc52526 WHIRLPOOL d12548cf7ac625ee5cb10143cbe3e2f0dacb462b1b70f631989cbfa3d843863555500841a16e2ec9112c52f43cd77a78065c8425465c364ed76597e30112f1a2
 EBUILD selinux-mandb-2.20140311-r2.ebuild 383 SHA256 71e58eaeaf4610db8f58daf3c8e71d5c032985a989c028bc41d73e54144839cf SHA512 49698589e4a2aa0fc2034463234515b4236670ca6b9e2071bbe85fc45b3edf0dffaee142f69c965e4ee9e49e49cb2da74df7379ae4b49682ebaceca5688ed191 WHIRLPOOL 94faf66da1128cb107afd393c5dd6085b96fa8b3ea3076870458b5a5a750211b1dc8641250b31a2d191fe5d6f5dd0b6ba634315acd668cf67c9e767012e9d057
 EBUILD selinux-mandb-2.20140311-r3.ebuild 383 SHA256 049df3e7a5fd06a42c0e65a4b475908d72f3a50f56beca7bde11713990ec02e7 SHA512 3f69bc361446d8743bcb567dd2a04a7510ac9786c2e5ae92119209423ffb29418654e11f7dc89e2ca7c3cfe64f2f7fd053d21da58a435c011c04072c542b8d33 WHIRLPOOL 529a79ce55adfd790f48a25537f6b31f642addb35b6dacbbdb6ba8551fe0a89f3231cc512e875226c390964166756538350562dcf4882e6f24c5750349b9bf1d
 EBUILD selinux-mandb-2.20140311-r4.ebuild 385 SHA256 b8c404fa6ee251b49754baac72f481d1bbbeeb738285426cd6c5877abe651d27 SHA512 26e8ad998d65bdd0694129fc90e18cab30a86d92389a17989ac7111e9a958cec33b8035b4f064663dcd07e2bf5b6ec294c9f1e62cd3657b3df6c9df62cc3f747 WHIRLPOOL 0073417802d04a5e502eaf412d9dd62a7cfe5bb88e3809476a4f99b8fe25484c4f5835290b2c0254f4128f4aa97092fbecc247a5491ee4874e32ecbf5c223ed4
+EBUILD selinux-mandb-2.20140311-r5.ebuild 361 SHA256 44e2f12a16d65cf7fdb574cab8f295693f8794e8173d0e8e4afed3086bb19e59 SHA512 4de25e9c41df0418fdc13fe9108604d23b07184ac4c90bcb970e7cf97e031ef0a75f84827609d39ba3aefb511bed281d0c755efd7bebe79d1d985fcac50d8ecc WHIRLPOOL db7e2feb0c8232b3d2563d2f3eba5b11819512145e2a36f9c0173e7c7f93cddcef2a689f438b0c69e7a66e9fdaba4b7f63a5bb8674fc3cfe0adb7dd02d454a10
 EBUILD selinux-mandb-9999.ebuild 341 SHA256 d6e00630c7dbfafd51d7ba954845896278bb92e75746e69a2d804b536f5fd2ad SHA512 9d02328a4e2778800360a00eaaa70472795c8b0f24d8a87151db037b156d9f587662ab08d5295f7000410704c2cb3fd1b0027a88f66d8a14a40518a4311f27d2 WHIRLPOOL abb3b80b0c9e041c10c9a3fe17e192b15fc2bcb036079485f9ba6e33b0f3a1706d114863cdfb2e2c1da98f13dc1033b1cfacf0948080198870e4804118724bc1
-MISC ChangeLog 2123 SHA256 ac9eca9653abdf0511396584db60ea948219f77b432c9323c185155bb17c73a2 SHA512 b21419aca5fe34155d48d11efb01eb85aa37a381a2428dcc76a4c8f52d09c4f24e63e3f5836bc8ef4958e4d54716c7dca8ce36341054561922407bc256b67a02 WHIRLPOOL c78bb2a5c2a6e59e7bd95a02c1edda53c43b60ec62d8e1933a2a87b93fc741535d66dab821cec3ec88615843a7f7ea203033b8da0c639b6d9f705b0b4dbb7ddd
+MISC ChangeLog 2313 SHA256 3fe6f6b0def93f08de44d740a2eb05db9f93013556a150849be3d62e38483724 SHA512 f1d918cc65a5dc67eab38a402e8ea56f9f036698557aba64315ec3972846de4c637ed05cdc1a57c8c73f326eda8af63a1ebfab3e0e39459e0a7528cffc560171 WHIRLPOOL 9a194387b952201e7505e8920c5b32421c790b3bb9859c68225601c1bd69ff49d7e239402adaebf141db90fe2f46c2230c1e12c0ecca950ea02f57d503e0eb97
 MISC metadata.xml 229 SHA256 cc761abe76d089ffe69ebaa296e0de2195a64dba6267c4f72c80a5ffee3b34a5 SHA512 b555583ead8b4202493a191e86f707f23c231144f7aa1a49a62c85c831ed3e83aeb5c018b2fe0e533baefd7eaac04016c3006f1271f4bdd66897ac08501ceb57 WHIRLPOOL a9fec773b1998e3de0975883a87e267454b9fa36161d6ab932b81727b93d2222c680d3224c45e6486ae25e2f834d793ac5649428d1e8e1eb9c682ef552fd3b85
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0
 
-iQIcBAEBCAAGBQJT5Rx/AAoJEC7dUkA7aK9HqYcP/0c5RCJXqZNV5cynsKD5+q2O
-jpp4OUDzilRYFwRk0YOk6fFzmUgH5jqDe2twsIy3Fj4cMrOB20Zb14Y6jLZWzCef
-Pb4MR4ooQcczOh1chD/mdM13efdgXLClblNwwuW61KwnDMdtoEhZpcNsAuxXEZKs
-lWA4UO0k6ASX8DZ+C6y77sc6m44oC7IpfnsgMnMExHc6wrN0wH5sPEcsDYhbNSud
-MemmcQKo/C7r8I16An949LdB2UbMFix8ENjudF/x729B7bJ5pAmvQj2O8NjQiBMZ
-b+xffrUPpZc/ebKj3OpMQEj/FfzBTeYy2uzmppFAUReF5vMRMoAfA7deA/VnwzKo
-ooOCdzZtuVSuCf3G+DzIaogo1C2gFmW+1rvVfYNk2qClnU2RJMZ71XKXKv3+ju5b
-oJXmTbHaYNRkiMKdSZgPrawD5wor3stZKnnmLIba2F5DN2AfaAbWceAsBeEZoQ+C
-uVpFJzv6gizVZdGxaxEWsFnnSO27yUdM5UCM0plrXawZz+80UA8VjMHWp1Sv/m2t
-bYxuS3D9GNXWRROk1+OH/EZSXYVgFtxPN5AbexrKBVxAmuEtE64P/nH0nIt6wG5a
-KS18fR0VFRA4yO85vpfggZMepvWb0jpYvBUjR8kxzD8K8yWoCJsNcUMfXEQWOB3w
-pGmCvDC4u7XesPOUoJVH
-=vR39
+iQIcBAEBCAAGBQJT5nhTAAoJEC7dUkA7aK9HpPUP/RFkIYAZW3q6mjCbYH4QnguW
+O8vi5EHTLtfXuBp5YCkshtuDx+0qNkGvlUq0KWrRHTJrfClUxr0X2OtAFF/8A3Z1
+S21DEbuzJLu5lAT9W/itjuihhlIPDDAnKLLrifpZXC7OsAY4WpirPsaePhpOIC3a
+dBbGxq52XL661nw1qr/yf/S4vjExeTVWyD3T4fobROZW5lo5OZQEym/zwmpqiLaG
+gXqS5Sf+YZ3sgWmsttSL0piPceGkatuflvX2nQPKcqgriD9r9zBCHU7cRj+FG/CF
+GrEM928f5fJ/zOZJFGoEoF/SNKw5n+20MsBwffrKNqnW8jnqt0eHeiSo/7Vvk7GX
+MgszWw4hl5f85ReZZBy9rPiwyJf1G6tzDnQZY8jjD5rccfLaAfa1Hbbr2NcRJNW8
+px7w7kdLpT/cSUY5CCEgzcjpXhoo4CYDUTcRgCm4FhDTuohYrVvDL9kzFuIGnlgl
+SJ2ACSLWQOiHmPa0Xeh07nM2zuJfZNzk9KWagg9Qbg/ll6HmsiIIbhaDgMpGTIlH
+n78D8R2OohZmO6FYaXKvxQ7+PKe7A3i5RcsRaZW1sgZ6gjN4Zm2WSRt2pSfGtNXy
+kruINv20wuWog/v41eg3Vol6MjfGlyOPWTZWMcdcqSXPzvui2iBXpqTjP/CnXcPl
+0RA7xkZjXmZVBkIIzN1f
+=bIsu
 -----END PGP SIGNATURE-----
diff --git a/sec-policy/selinux-mandb/selinux-mandb-2.20140311-r5.ebuild b/sec-policy/selinux-mandb/selinux-mandb-2.20140311-r5.ebuild
new file mode 100644
index 000000000000..3afb3c726964
--- /dev/null
+++ b/sec-policy/selinux-mandb/selinux-mandb-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-mandb/selinux-mandb-2.20140311-r5.ebuild,v 1.1 2014/08/09 19:34:14 swift Exp $
+EAPI="5"
+
+IUSE=""
+MODS="mandb"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for mandb"
+
+KEYWORDS="~amd64 ~x86"
diff --git a/sec-policy/selinux-mcelog/ChangeLog b/sec-policy/selinux-mcelog/ChangeLog
index 90303757fb1b..df7665d3f28f 100644
--- a/sec-policy/selinux-mcelog/ChangeLog
+++ b/sec-policy/selinux-mcelog/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sec-policy/selinux-mcelog
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-mcelog/ChangeLog,v 1.42 2014/08/08 18:50:06 swift Exp $
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-mcelog/ChangeLog,v 1.43 2014/08/09 19:34:17 swift Exp $
+
+*selinux-mcelog-2.20140311-r5 (09 Aug 2014)
+
+  09 Aug 2014; Sven Vermeulen <swift@gentoo.org>
+  +selinux-mcelog-2.20140311-r5.ebuild:
+  Bump towards r5 (fixes duplicate context for hiawatha)
 
   08 Aug 2014; Sven Vermeulen <swift@gentoo.org> selinux-mcelog-9999.ebuild:
   Make 9999 ebuilds EAPI=5 and transform to make master for version bumps
diff --git a/sec-policy/selinux-mcelog/Manifest b/sec-policy/selinux-mcelog/Manifest
index bfd11d47345b..e014cc901828 100644
--- a/sec-policy/selinux-mcelog/Manifest
+++ b/sec-policy/selinux-mcelog/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-mcelog-2.20140311-r1.ebuild 387 SHA256 2846a2b5867afd1a5572503bdc960bcbc7254d74eb4989ae6f719fd28f7d6378 SHA512 36735ce25654c58be563f0550ecd0804493583316ccee7db816aa90dd9475c4c252596a3436907793a37cfcff6513fd39e878cc026e4a83ca76fc1f5d2635d21 WHIRLPOOL a4c75d26c759c7de34245be4787fd8e1891993b3e3ffaedd7b3075861c6ffd28677fbd1bbfa23c500a167386712d9b1bd1e74e869ef3d6473cb7e0745601906d
 EBUILD selinux-mcelog-2.20140311-r2.ebuild 387 SHA256 236805e66ce3cd70a441f45048f166d2f7e9f2bea83a0af7fa8ae93dbe5381a5 SHA512 f4e739879fa8e1af5605ad5ec4413fd8f7b67b63462addfde3f626dbb8256c447357e766b6e0edb842e159387761c8dc558606952df1233fa7ae4163b5b3fd14 WHIRLPOOL 54e6179466cb692202720aee3205fd61105ee4d6985263f6857aec754fb4f70d4dc0aba897fd384f15fc7ffb56f3ea0e77bb52e84d8f8cdbe6ecdde6eff2e177
 EBUILD selinux-mcelog-2.20140311-r3.ebuild 387 SHA256 1916d5a3435d0ccc1726ef6436306a6028352aefb3697f04b85b7b8c37eaec87 SHA512 3fffdd9b3020015b4bb6289a37c8e8d872d097d1602c20c8d1b6bb41089b931bd4a33b5b898d80b87017c4c1737d945107119e09cc747e1811afbccef45bf288 WHIRLPOOL 0a802f2952f2b68080f4026872e7afba2878a0d9d8e348fdde3d7374958cdfedfd78019ecd044c848f7edd2dec0fb1d5984ce85d9b993eef3d659fd65e8abc97
 EBUILD selinux-mcelog-2.20140311-r4.ebuild 389 SHA256 4f675b681f9ae6763d1cbb1b0c00fb10c8e6585108e1794278538c54b8665aa1 SHA512 035cf42bd03e64c60c63dda285b534a10a59dc84b18af848250034d924a96e785bd8a187a5d69a2be03ff2778a24cc5800b60276e8fdd541ed58de0e5ef0c336 WHIRLPOOL 58ef38ba4b2a74158cb796238cc2ba948514934dec7359c48acffe36a8607d4c0fde370f7239d4ec1611658459435f676158a3431e57ba570d9fee0b9db01d5f
+EBUILD selinux-mcelog-2.20140311-r5.ebuild 365 SHA256 c4925f4811b1b28b214274b9dad11099cc3bdc521690cc708f14030cbedfdcf4 SHA512 ad204c734514a8d77fd92a7c0c624260231a41c4d0295455e1e9f7e3c77167850c8b78abf86db9b0f37395a50630fa2e56e6ab6ce694b0b60fe44c85efbebb83 WHIRLPOOL 650848d63a1b3772b72be7e81790056b7a5a719541a7badcd3f71b00f826e7c50604c242c89dcfbc3700eeec4e08c3bed22715b8f2c47440a1e222e9d98acde7
 EBUILD selinux-mcelog-9999.ebuild 345 SHA256 4a294aea00c515d7c1bdff78bef6655adb6ca2dbcf501180119cf8d49d3e86a0 SHA512 f7c9f85db3e2d3350d85c5c7f4794e6464262434b293d350625b131d0ccbb0517be8f61737780886ef06723e255c0622ef5512c66df1f3378d1c0eea982d83f3 WHIRLPOOL 18b6643384b4b7553b984e6edac0aa2dbd532c2316f9793c8d10e5c4fa7d60ad6705666647205eb5529f959cc15c8e22d9791fa1b0543c9569ae094c22537933
-MISC ChangeLog 6512 SHA256 40c67cc0560db25f8015e8e67cbb004eff6d80c94eb9f7791e1823321d40f132 SHA512 c8515c25cfc2cea32d9d1af390026481e14049d7bb5e0bb979793689acefa9f23e720283451fe756b3e53945aa679b4399ebb2b78261d32047ef29f676b8ed49 WHIRLPOOL 4d6792ecdc80151be6914160731d4ca0032c5b9a7cf207b5522e1a3afc5d284d45c551bf504f6e753cb150ea5977831ea2ba6a9d7bcfe8d20be9e2e869b000c5
+MISC ChangeLog 6704 SHA256 2ce39e00658d0311f043b9feb756b7775d624a25604a4119a0319caddfe82a22 SHA512 6fa3f4bd8f44be51831b325a5acbdf5f44cb498240a8305eae78e3e4ec02e13c91787b886449fa16b030b851237e73258f5a76a4be8ba829b53ce77f0210e6d8 WHIRLPOOL ed0f23a1ae2a48e158529a527444ec86296119e9a81a614ca47d1f602671c63e4ed16b9ef7f28cecd9a60fc2eb87a17e6de70129ef99c7f9beec39c28c7cce4e
 MISC metadata.xml 230 SHA256 941dd6c3c217b3439776cafb67385c6b36829c7869aeeb1f531318cc555828a0 SHA512 1b648aa469af85e0215a20a42954bf351105d03db2c3377c5da1dd4b6802d86775dc303a17880f6da4d2be0f1cbefb922f89a796a6892b03835ab608d52dbfe9 WHIRLPOOL 2e1c238b26099d8c07551b7e652900c76c96a110d7f70f82b7ea01677b5cb29b22fe468c8f5b7c574705dcaa5dfde48255f30c51ed79eca7e531da923a00df88
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0
 
-iQIcBAEBCAAGBQJT5Rx/AAoJEC7dUkA7aK9HVEkP/2SUoyVFjMiNiir+dE1eXE2v
-RqlmbRJs4zD1H2hOEZ/SeX0u1QzZS0etUsxMnvNVrX0118dsnIil5NkK7JJhHkNj
-B0yBgUrXJzWh51Tbbees1/cd0TZnwex/xemQn8XfmO+M1sW4lk4kEAPcSy12mCLR
-nPddMFraJPDOs62iTOd0/JsEUGJgtkCU6PHiBBgNTJ1vjTLwld644iEdM168MtbP
-wgLkdgZJtRsawXyiy/LC6BMTX4GBWX2z+ieQUd4yBU29J05mSwhFM3K3Vm53IPuZ
-Wmq2zsC3ahAfxWSHPnK73Mye/jojFfN+Pdh4CYcfKMEWRuzCzXijmxN73GtBP6KG
-HZ+ng3PJzc9LVcfDVXehx2wBjBzQlukaF2La54X+lv40WDBSl1CHVQBixOX8BFYv
-+pXQ8jgHlGzfM6UcmzrQJVzJfHEmFiOnwadqtsrET/FP8ScLutp5lAvq5Vxil74e
-ZQOYPF8iZl9f8akQxzUufOubhoc3SaVJWne3AueDxO5vZZQXZrRpTaXWw+u6IjHT
-12yH9yl9rKDZx+mgTztNrCoZ7gClZlwBl+KBYjY8VJXfSkmsV8Bum5B38zhZJTRe
-K8lNaNvB+lmqm0xBXJETB8IlPvhN+ZdS6OkYd0zoBw5ooAhnoQhyGX0W/TGd6Wg2
-pxnYU/i7WLfx5qhqFRwO
-=tkMv
+iQIcBAEBCAAGBQJT5nhTAAoJEC7dUkA7aK9H+EMP/1cJgzQYx2rH6LSyflxKFdYr
+PKueenfkM9Eh7wAqzL3a2XV5DsbrtiTbCvlH9Y3E++OkcsBZdokT22fb8T6/XVzy
+N+oGyYpqHHn1t1vza9zO78KLLITgTRIWgC89JInDd3WsA6paV9qvsC0U/oc7tpXQ
+CSmYeCwZbPsup2VTkQhk0OEsmr3Jmy/Q+ww4f6V2+IfqYOO7zatkC2tm8/sNxnFQ
+F+GGWkjysx9jcjCH7NTjS1q47CvhgYuW9mR4mUDuWOSmdJdz3BVcmzInCK9Ob4Tk
+ibFHZfFhacGYYnbWv5teomXaZpC7OX9aEffd4upNPhq9F06AyX2ywX+bKNGNqKSi
+b6UkBnhpHLJ1gJq8MMZDoBw+7h/hEejnsGy7NyJxYW0ysPHbmYx/fZAXm8ojGZIm
+1gUjcSB1yQznsse0BGCWHpkCH/cltZn6GEbpomzz0BQ4appWno7GVKvj9x4OwlDb
+I864TL39LVBJZ3lceIyKW5ZaypjvjN6iApOzZZQsNeyxPpab6G4jgIkRTA27Ot91
+/BvS2bEEEig+dNDqA3ZMVjLHTmoRr6WZgpUN7b6poI5O5vwPAxTN/iQGi0wNCLYm
+Tfgp9BAjyd8WJdPqSM+7yr9ZJIqqiAhv3CMVaKdjFD+icF4EwUxpXCXVtvnxL6sg
+kx+zd702jFKqQIZqW/sh
+=VIix
 -----END PGP SIGNATURE-----
diff --git a/sec-policy/selinux-mcelog/selinux-mcelog-2.20140311-r5.ebuild b/sec-policy/selinux-mcelog/selinux-mcelog-2.20140311-r5.ebuild
new file mode 100644
index 000000000000..f89b1c34b31c
--- /dev/null
+++ b/sec-policy/selinux-mcelog/selinux-mcelog-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-mcelog/selinux-mcelog-2.20140311-r5.ebuild,v 1.1 2014/08/09 19:34:17 swift Exp $
+EAPI="5"
+
+IUSE=""
+MODS="mcelog"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for mcelog"
+
+KEYWORDS="~amd64 ~x86"
diff --git a/sec-policy/selinux-memcached/ChangeLog b/sec-policy/selinux-memcached/ChangeLog
index d63d51d88fd7..b9119fbec6d5 100644
--- a/sec-policy/selinux-memcached/ChangeLog
+++ b/sec-policy/selinux-memcached/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sec-policy/selinux-memcached
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-memcached/ChangeLog,v 1.42 2014/08/08 18:49:24 swift Exp $
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-memcached/ChangeLog,v 1.43 2014/08/09 19:34:35 swift Exp $
+
+*selinux-memcached-2.20140311-r5 (09 Aug 2014)
+
+  09 Aug 2014; Sven Vermeulen <swift@gentoo.org>
+  +selinux-memcached-2.20140311-r5.ebuild:
+  Bump towards r5 (fixes duplicate context for hiawatha)
 
   08 Aug 2014; Sven Vermeulen <swift@gentoo.org> selinux-memcached-9999.ebuild:
   Make 9999 ebuilds EAPI=5 and transform to make master for version bumps
diff --git a/sec-policy/selinux-memcached/Manifest b/sec-policy/selinux-memcached/Manifest
index f2c85fa6f57b..c38c1c0e97f4 100644
--- a/sec-policy/selinux-memcached/Manifest
+++ b/sec-policy/selinux-memcached/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-memcached-2.20140311-r1.ebuild 399 SHA256 be097a9391a68924b57aca2b51db8f8f2bf02adf6d3b1c12827ba903e227bbf4 SHA512 6c79acbc15f7a1a20fe2233f85b6d522e5af692f56e80003b4a230532d9e88b5bd2f7b07eec33562420a4d76bd11173e6cbf1b9f22e263719f3cae75e8da0b8c WHIRLPOOL 9bd1f940aca8f657aa7cb12ce2b1a15c31e7bb2b9dc3cd4f4ac17232326bd21fec9ad52b88a056704412316e33d8558f5c14d63a9e56fde1d60d2b52293d3cfd
 EBUILD selinux-memcached-2.20140311-r2.ebuild 399 SHA256 5c5755fce368b7e8b550bd1b7299a3933e0b899b0120508bf4f214703f70a343 SHA512 b182806678ef87be2b379e9a09e77afad1d7d6436427e0679edf34395709640f533c8551520fd6509a218052795f28c4073cc4914adc1b0cbfa2c021c944cb69 WHIRLPOOL b4d2211df5c8a57bc316e787d014cb46d1d6e3014ab2dafbde2d6864698f99485ab3b35d8bcea896777f9c9c0a0e0d2b1324f23971e40be6812767ae86522ac2
 EBUILD selinux-memcached-2.20140311-r3.ebuild 399 SHA256 ff20c0c1561d7aa586fb4374b82ef001b3c6cf6f1e1458ec85cf8d3f9002b0b9 SHA512 81690106679b3430f97466bf6523d2ae5a1ecb67dee0dee6a6c3127bc9d1607061b53dcf9851019088477a548b5aad1b8cab5c1d98a65a5ea8943cba79a0cb23 WHIRLPOOL dfd477bec2a653b55cd51f0a652013216f88446683b1e16c62d61efaae43f9b815bcf40a0f5803e614b0da3b92d9ebe1c16f0f14018a4609eb72193d7440874e
 EBUILD selinux-memcached-2.20140311-r4.ebuild 401 SHA256 c56b3fa5a515d39b5eb66f2f00d4d7805b2f8379d43770e0b678935f59ca018d SHA512 51cef66e42b707d1af0c72c271cbd19be6f0973a5bea3cc108f05ea09fafb728867f9ab6356b2541ae27cbec3c5286ad676225a5d4ecf38ef4d11e5f633ceedb WHIRLPOOL 85972205473bce2548d5f5352779570679cd35deee125d24852f14ef983dcdfa5b8bbf2bd63627d2cb7f2a77167c27e8d282734328e5607757291ae94bb974c2
+EBUILD selinux-memcached-2.20140311-r5.ebuild 377 SHA256 84f74de13a29975cecf8540d8581bf5d59c24d6c2af08afad0922a6d0ff8b095 SHA512 6674ba86bae9894ca9debf69a12a8fedec084432935b3789abcc5ab7b811b724638a54937e56c150d968273c3e9af2da0017808c4947ad442fd49da95f8f54fc WHIRLPOOL 274f513c3237323473d2b7d018b3806c73681b4616b03b656a155a3cc16260639c90977b78a272208a8d493905229132b67b96265ca593f4bb4e868e5c705dca
 EBUILD selinux-memcached-9999.ebuild 357 SHA256 5b0486183f29769115d72f65e1d658cb1689bfe934faba4d9d701999db157ce8 SHA512 ed229f3dbdca4ffde01325a0cc1f0a7928837339d4cf5f9803f722422f8dcb20fa8ff45df7700c816e5407034a281a1bbf90584518a02164c67176fd34945d76 WHIRLPOOL 2ad037938bcd1365ad623e273b7b487493fb5ba6efb11be99aaa54ae28bb16c85f51c550364d0ee9aaaf03bd1bd98ab0f68bce3719369767a9c59ce3f73ca824
-MISC ChangeLog 6751 SHA256 abf0f16a6a26ea78a12f2bd52f2219fbde2615bf5a4bd29b34afb809afe594fe SHA512 2e135f679f86b61e83a7123d2d171ba593730d442a5152be5a45bd5c0b6e86d5c91f824f2ac94da72abfcaf90da6df6af742fddbbbe64c3015f9c649cf95a917 WHIRLPOOL e0a22769815b5cb7a26b7653f36e171ed90da57ce53c7c5e7f5767d37f5dd47abdb6db59e9756f8973c01efdb66072e566a7cff806224c092d0f756aa4621df9
+MISC ChangeLog 6949 SHA256 b2ef755d27aff49d3f5db59be8fa67647dfe59cf9619a98f8d820f36ba7963f5 SHA512 90086d59ad6c321f1eb7ad34a256bcd761dd5fc5db702a15ccf05b75ec52f1c1c9423a0b3acc3eb1a34864cfa0c1cf6b9e0b778df9d51a0d98f8eed46b066fe5 WHIRLPOOL 339721c20a25abadbe172089c37b6ea26f95c1f83a57b5ffc13dc611d6c66cea3bdc9735412d501a5037d4f4c071af78774def5b845ed53b6e6c2a251be7ff6e
 MISC metadata.xml 233 SHA256 8b2abde2fdb23714f5ce66487d7ff6063421608e2997ad8eb182ad336de10117 SHA512 81a8b4b2fb82d16d91537a5244ca51147085cfdc76a9663b24d9a5c55ab16ff5d4aba4a5e5f960fdbc6b4590e310bfa5407032f66f084b757291e8a2764372a2 WHIRLPOOL ffe2791995f56df6b40770b280ee2ce51e16c52a6a60685444d4ae3965290cb84c08db557bbb4491b5c98410eb2594ad4e6cf327ac9e4da1bebf31235ad98388
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0
 
-iQIcBAEBCAAGBQJT5Rx/AAoJEC7dUkA7aK9Hp2QP/0V8vcbwol9mifIlur3UUq2G
-qbU5rEkrZMolkALq4Dyv5frXjyQDU/YHz3GZcrLgPzawYSlIQw4HqOuvyWy6+qVY
-jHR4qa63LQKNqYCkNoQHFtzbtN3FFSibxMI4c0JTGO6MbXXvllWscBbyvmWP8kpY
-/zmcVLkW5hXJgm84mx97QVQ1qC5BKBNwMClcV+zNVzPnedA5P7rdyI+sXOdl0o+A
-J5o5ELQLnmm5Y/FlTipYhlv2Ig45lUpruwLOAgXwwXJrM/3W4D+fziytH0BLMrZy
-pJhDnZd9pcOdVxqXjCGu6yy7YJaekIPAdLnpx7fM1uYRQXapZ7VEupY4FHT85z7e
-/6pACcI/T0UrzQYTDomZLkkwKnnpEUhEQhJqRIGt8pGPrXQhVsWXskvpO7qJ6aWa
-LyRhtp+D8UixI7Baff1xfaDmOX0sb/bNjdTeGAasDo5qjwzFwYVRgB0YmTu+Xyq9
-1QLhfR0Jo1yAQa9Gg7S6pXlMfQCpLgTPZj/KU7Q1M3B6qJqSSdI3YI5HtyBa/esB
-tSId2gAsCfFCoTkn+jEureUoEMoV2hq+DTwPJJdr9yJEnnad6aRsnyUkcV1MO6mq
-D9qO+TeU2ZoyUuP8R2iNJuU6EplxVs0dTOtpTxOWrmAeZvg9F/WQ+HUIh8ilw1hY
-nGgAoHGZTLAeQjj9QPXC
-=cWMt
+iQIcBAEBCAAGBQJT5nhTAAoJEC7dUkA7aK9H3ZUP/31yJYfyfIJmooIzSefXvw/3
+USxlY6d3bhXaMD6OZSvah1ko67f848hW5YuF9MvEzlWsJhl4Iv0bPQwntvT8m9Jf
+qYDnSqK6fKn1NshRqwD6HXdzeZBsSmNl1NPhcJMF+3TzwjZ8meOywsirieNiPAk7
+/qdGPQVbgfpeuPzEoDAf9EOMs8pxrGDmeLw7HxbT4RpDwz+C+P4EcE00gOaucFqX
+HnNorJVIr1MSIhYfN7FapalUKUedYiWv7y8hYfXQOpnrZhgnjjd0yRZWQBQs54aV
+Jb37si26OapsC645WP8FDTB9hUuziFkx1f6McS1/PIGzo5rSVjlaDNFKTWZw8Egi
+owgXk7+ce4vGfuGfIIwDmHotvyY9LHTF7okv4Zw22MYvAW4SMafuzU3z0j3+/xho
+VwpGyXdkpaBuaMx2bcQK19LmjNXR0HGgrlmiLOA1pKGSeSpLBUZVLabraEUxfxvW
+LqT1KYFJ9bVZ5MgLHdIIcqkR+w6jw4+/rQLKDu97uAfdxTJJbthWrqN93efoMfK7
+Ft+7Cc0ta68RL6xvW6JuCTGQedI/PRf0qSgUi2FYlaRZu+3ZVTmIfgkOb8Cy3Mm0
+13f2Z9D+Rb9P8lr0/eb8ZoBTwvsbjL5elcmia1TNQpwwk8u5g1n4mTk7qowvnYdq
+c12xtjzQr7kv+Iq43m4f
+=N65F
 -----END PGP SIGNATURE-----
diff --git a/sec-policy/selinux-memcached/selinux-memcached-2.20140311-r5.ebuild b/sec-policy/selinux-memcached/selinux-memcached-2.20140311-r5.ebuild
new file mode 100644
index 000000000000..d89e4ab6496a
--- /dev/null
+++ b/sec-policy/selinux-memcached/selinux-memcached-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-memcached/selinux-memcached-2.20140311-r5.ebuild,v 1.1 2014/08/09 19:34:35 swift Exp $
+EAPI="5"
+
+IUSE=""
+MODS="memcached"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for memcached"
+
+KEYWORDS="~amd64 ~x86"
diff --git a/sec-policy/selinux-milter/ChangeLog b/sec-policy/selinux-milter/ChangeLog
index 79e2650eb011..28bf76e14b08 100644
--- a/sec-policy/selinux-milter/ChangeLog
+++ b/sec-policy/selinux-milter/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sec-policy/selinux-milter
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-milter/ChangeLog,v 1.42 2014/08/08 18:50:03 swift Exp $
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-milter/ChangeLog,v 1.43 2014/08/09 19:34:48 swift Exp $
+
+*selinux-milter-2.20140311-r5 (09 Aug 2014)
+
+  09 Aug 2014; Sven Vermeulen <swift@gentoo.org>
+  +selinux-milter-2.20140311-r5.ebuild:
+  Bump towards r5 (fixes duplicate context for hiawatha)
 
   08 Aug 2014; Sven Vermeulen <swift@gentoo.org> selinux-milter-9999.ebuild:
   Make 9999 ebuilds EAPI=5 and transform to make master for version bumps
diff --git a/sec-policy/selinux-milter/Manifest b/sec-policy/selinux-milter/Manifest
index 7d698f558365..1b85e51f07b9 100644
--- a/sec-policy/selinux-milter/Manifest
+++ b/sec-policy/selinux-milter/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-milter-2.20140311-r1.ebuild 387 SHA256 b42941fe7c104caf972a788e82f68b78950400efaf23a727b53cc0a9540e0093 SHA512 380c1040cbf9f89acbbaf2226d37b9ba5dbb2e130828452f95e60e9bd8e614b961af98af94e3b5a1109b0ded122096cff64a9ecb8e47bcc6aed41d70f10aa171 WHIRLPOOL d00b89e9bfe102ec3fcbbc7240ab2c439cfc2f2b74ef28389a0c47d25f8d49fa0fa0d9c284e127e29e9c94a4acb9c86f17b85ce2567dde327d97a78974e0cf27
 EBUILD selinux-milter-2.20140311-r2.ebuild 387 SHA256 b3a8e84c49e2684acf09964ca4518b913379d343dab9c60ec4997957f9637508 SHA512 a18a521381c4c98d284118c7fd7403a2faf7968bcf199ae3e3fb5aeb3f11a00bcf0043853fec7363861d02d2362130e8f50baa877345339b75305ef841f0f4cc WHIRLPOOL 34aeb7061c997eb7a7331cd680e092b236b371a3698dd1e91e2da772c452046fb1ea5233abd8bcaa592ddcbe52b0c3b6171ad59c86099e62227c5d9ae0b4dab0
 EBUILD selinux-milter-2.20140311-r3.ebuild 387 SHA256 a5f9684b644d4ee97658922c6dcad93676e83a92e37495222455c6763184319d SHA512 b637ad35ef4c4667f20d8ff216fe2b337ab9a423021e4d08555059dba024e41d3edfe16a40e65f26b50d45965cdefefa192c512a60e4b6785d5c7cca6004cfde WHIRLPOOL 0e47db4dcf766088c35a94e50afcce245e997bca2c34221ec747189c1bab3aa40d2b64426ecf704aab31e85e814b5c10896bd3455255deec333f3edcebe36044
 EBUILD selinux-milter-2.20140311-r4.ebuild 389 SHA256 c70fc343722eea077eba96bdfbbce37d9c4c8034c0ef5a1dff2fd948b7c57799 SHA512 aa69a56135937cfe7dc6e0abee775d66331c64f53ab3ab2a860e5c5cfc5827cf409dc3ce6a44b58c593c3a5f789fb84788ed293d4c41581e773824a062266a19 WHIRLPOOL db1960fa5e52206a42eae9ddc3c06140a0f84e94265e5288907df43a3affef68892d78c9b5c4ffef587338100317bf2ec6944ad0ce4119cf952fc5be2f0043fa
+EBUILD selinux-milter-2.20140311-r5.ebuild 365 SHA256 791da7b9c8591403066c33502dd4baa779e70660398cdb666dca0b0a6d01097f SHA512 46c124b71da85f82c6432c991d033d6e57abfd795e994d4b3b71ac43248cca496d63d64a54bea5dedab03fe2ee7580fbdc42f0959076412b247057ba185d6a05 WHIRLPOOL 81a04bb1147c77cbbf69f2433c7c3068268a3efa4ba719ad9606092a8087be6a510d0f78660516e52a5999130995a91fd8229444f6631ca99c6ed66db9c7a93d
 EBUILD selinux-milter-9999.ebuild 345 SHA256 d0efe64b0097aa84209f6e3a3aba7643eb83aeaabb2340830bd0bbc19da764c3 SHA512 9f4966502423a481f45331979c99e38c835492bbd1037637be809280e86b4478ffa7154800f6c36702d0d38991be91897cce9c5f5ff45fc992dd7dbb7c618ebc WHIRLPOOL bd2048ec026bb80f17a7c21f32a194b49a7bd65ece0e56a68735f1eb634c173462fcaa5c695ce304dfa4ba4430287a1f99614dc9e47945fac0c84c28388c0ea0
-MISC ChangeLog 6512 SHA256 07f6afc4083e96f56edb2b50ff88e6d0a442c24219bc040f7d4fcc069aa66b8c SHA512 a6b75e495c7793c0e405c14172454faf753cf639bbd729e88b4e68046ed8f41460ed3e2448942626c297753aa907bde8df01788529b6f198be5cf1da17bd4669 WHIRLPOOL cddc48ad5ca8f4995162bec6358f90b1845956d5fee8b007bcc1be15370006dd51cafd44f07effca101e49ef161ec2c1135193e9aa952d2e240291b2eaacd21c
+MISC ChangeLog 6704 SHA256 93b7f3ff033ce5ca50cd7263c029dbf19a12f04e5bdaf891f02f946044d7d80c SHA512 d061573f280c426745377300a79b4d3ba1d8b31ab5fd2f0aabf12de33fe8223b79da54fe046b7f61e929b567149c2ff35a58cac1417303d2926f426b4d6cc9a4 WHIRLPOOL 4d1d447401c6ca979506526bd2dec812dfa25f933dbce80d66f94f622d7a2342155ab771b0211f0bdd33a303fd6840edc969f0e5faafed5a0fb270d9464cd37b
 MISC metadata.xml 230 SHA256 c5dfb28e817cf4dd0573ee44ff27d7b4ad595f12ab67afa3d814d19ae20d3eaf SHA512 db61dd373fc185c43a0079ec8efbe4e61fa0d0bdf6396d76c5c359f496a67018662ad85d26b41125e3969162f17d50dd8d80b0895d11616e427178437f7aaecc WHIRLPOOL 203c0e976b42806989937e9301d71fb50fa190a0d28e353186c3e6564736544b1c3f6e755e6e8881d54a597f20e28df3aa431638a5aec2318ca8d214eed578c8
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0
 
-iQIcBAEBCAAGBQJT5RyAAAoJEC7dUkA7aK9HxSMP/2y6XZcA9ygpRMl/m16llz6p
-9tTsxzA5L7r7kA1FGbhXt6uuTw26URFt9eiQ5UFKGTwUqE62oZcQz6XOaoyikSou
-eYj9/Ljm7ERr1hNg/CSrMUPz1th9tRclAcJi4oMizsCRyIImwRYO3At5olqc5HPV
-oLLStgvOM0XjoPRghEnUPzfnfDzdGTSA5+4DXdPj3w3nyfSqBqARZ5PSysHoU062
-EG4251DOGN20Npc5gXe99Jox90HgOXm61pOoLjQYrV7/t9WlHIywipCQ/m8Juv5F
-hI5mb7FS5R+/cAOWhFABNfs/Jr7/pHuA9MPTRJjOWfCuSyrEJruzHMt8kz5DkJhY
-72agKzHDDQa6h3QyRECtAOMVaONF+8FSenAj5R88C0sScsoiHGpDxxFG/CDIcf6o
-KfVuu1AUPtS+HmZVyX3j61g/anakfeAFNODVse2orKqk8DBX8Hk7mFS6lQOfRxO/
-ohK51EgIDaem0OBPx7P0xlr8Rvb7EWyVc2qFzPR9cuZ7zFDesS9HSTJDBQAy8zla
-I7I2ze/fOlOHH1e374wNSUjjJsfSgBDG6ksW4KAEYRV+1F8dBo5Mg/MexksU4hBq
-xYTduihu3brtHvVDgVWZ4oCaHPRGhzuLRRS1F6GL07GbGAZNkVtJir5ntHK7fT/l
-HkGqFDjSxInkZ6tgwAyh
-=LC/j
+iQIcBAEBCAAGBQJT5nhUAAoJEC7dUkA7aK9HQgMP/0alWx3J4YGygrQZeAnt9i6r
+KA3vsTe5rgXOZCNJ/meTPOYVuA90QTRft6Vhe76XB1CvdnG1pRasWp6olZ2zjOH7
++8J5qwF07ChlgurbyWDAUrv3ohQx87J9/m63dN5KQYElFLlqiQ5t2w4ZJCN0CxIq
+uU2xfDq1MM70AqjhLLWVyExVifTg7y/oqW3lJ8NvES2DJQOvBJBd6M140oNMddSc
+jxaGbGaNTxX49b4vCWbQGooC4BlYSb7P9X3wvNlrGC2WZzjivb+8SgYsEYUxenux
+Qe67EhaQBnSA6sPeyMNtJr+zkJAmKen8CTDX/4dONX0B8DVAJKEBcJTE2qj4RtBK
+86+X8oF84FAj+QLzG5bpAS5F6yUAA4FKbEeuHyNzDzIsE3M9Kjzth1QkWjMl9xki
++0qF1gNO6ZJdquhn8Z4OowhfubCwHKNE3U9mzApBo0dFzi+jZZVN9MbHc8xVoucd
+BJBfK82CPCwngX+E7V05oulUJxoFsp9c866OQW18jv4pDUBZNYJdLtR2G1iuSiHD
+3h5X9rl0Z4U73Q1mB1FNCst2Hc96Eytvk96eMvL82Qi1+ERkAZdOf08t/67paFr0
+TOpWNqyYFvpHCjpuuzO86j8EVHDfy7Gydeq5v414f+I5qa3YfGtFyUYO81nJDGK1
+9iJBF7/612LySfh2zuIp
+=MR3S
 -----END PGP SIGNATURE-----
diff --git a/sec-policy/selinux-milter/selinux-milter-2.20140311-r5.ebuild b/sec-policy/selinux-milter/selinux-milter-2.20140311-r5.ebuild
new file mode 100644
index 000000000000..a7e7c8e8f2fb
--- /dev/null
+++ b/sec-policy/selinux-milter/selinux-milter-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-milter/selinux-milter-2.20140311-r5.ebuild,v 1.1 2014/08/09 19:34:48 swift Exp $
+EAPI="5"
+
+IUSE=""
+MODS="milter"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for milter"
+
+KEYWORDS="~amd64 ~x86"
diff --git a/sec-policy/selinux-modemmanager/ChangeLog b/sec-policy/selinux-modemmanager/ChangeLog
index 7b2ed3d9ce47..8bb330908414 100644
--- a/sec-policy/selinux-modemmanager/ChangeLog
+++ b/sec-policy/selinux-modemmanager/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sec-policy/selinux-modemmanager
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-modemmanager/ChangeLog,v 1.42 2014/08/08 18:49:44 swift Exp $
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-modemmanager/ChangeLog,v 1.43 2014/08/09 19:34:04 swift Exp $
+
+*selinux-modemmanager-2.20140311-r5 (09 Aug 2014)
+
+  09 Aug 2014; Sven Vermeulen <swift@gentoo.org>
+  +selinux-modemmanager-2.20140311-r5.ebuild:
+  Bump towards r5 (fixes duplicate context for hiawatha)
 
   08 Aug 2014; Sven Vermeulen <swift@gentoo.org>
   selinux-modemmanager-9999.ebuild:
diff --git a/sec-policy/selinux-modemmanager/Manifest b/sec-policy/selinux-modemmanager/Manifest
index fdb8f806d029..c2d8f7f714d8 100644
--- a/sec-policy/selinux-modemmanager/Manifest
+++ b/sec-policy/selinux-modemmanager/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-modemmanager-2.20140311-r1.ebuild 511 SHA256 6da0da6c144e8ae32996649592910dd1f755097f824cd848ecb437392f950165 SHA512 49a769bfc2e7da6b6b8f7132cca4c5b69a7344f8674f6e4204fc9b8e4b50ba07fff32146bd505e622695d9747d447911d81d24fadc4c0b6b06821a2fbd50c61e WHIRLPOOL 458844fef248241001c3e7f13b343e77e2a4a2016a3bc9de610c22747fc85976070b81343d3aa20e26b651d30a51085a10bb2caf77c5d6026d735753821fdffc
 EBUILD selinux-modemmanager-2.20140311-r2.ebuild 511 SHA256 7c336ce064c85eb15dd332bc00faaa3e2a74e2f80dea0f4106adab98da0a6609 SHA512 fa8a63c7d7e32983ceb2bdc87f9e0ea3e09912c7445e17218356ecc21a9d7caaa78b2e75def26e6271aac9b48d25420176d2c170239f39088b62126701524f9f WHIRLPOOL 47d32560e697998d19a0cde06ab2c373072c9ae9f7495eb1eadc6974dd06690754eeeb4be7e931dba8be0d99c7314cc86442e50f726da299b80012f99f0936ac
 EBUILD selinux-modemmanager-2.20140311-r3.ebuild 511 SHA256 d9b12e3289585aed69e72d3153e36689cbe04d414430f930f0b48dfcba2c7d20 SHA512 422fcd9fe8e987b87833fcb54bda025f61251561f67272f914581a3dd75b4cb04387f44bf865b67a444b60fb0dc7d1bc43a73e7ba10191b9a80e29d28e2a2f75 WHIRLPOOL 3b74ccb4d5acc8793f7148b64b5c60fb3085267e8be89c459bcd9de3509516fddd560848265b99161f940eaee262bfaf77f5a19ea1a5cde6a2d8c3c2d4d77cf8
 EBUILD selinux-modemmanager-2.20140311-r4.ebuild 513 SHA256 c648029e9392ebe8ef5e36435a4d5679f713fe79cc0ef13597e41215d167a934 SHA512 53ec9b6f6ceb58bc3afb1f4423e04739b3b918ebf03da5f64156775ba0b1daa0a079015b58f47f08a0f5ebb112d1e101e8a021e60493b687008f40c736b2a114 WHIRLPOOL dbe48fa6d9b9f7c65108dc2203110b3b5086d1e06e60318097165690b2f95f5e609592bf3f28fb11d1fbfe40b9e3b6c086c3678e0654753b352ea50c6b52c8bc
+EBUILD selinux-modemmanager-2.20140311-r5.ebuild 454 SHA256 ab3a2db3b8246f874d83c5ed3b9a6ba28a26672ed299de3530f55d4da6f6a478 SHA512 75e4ab389e4d89934f87e73a03eaf444768ccd70b918f94c51c27854a23a105002fb4bfd748a23a299e96b952ecf1f7d7c33892050305490ea3e1c1bb16da7b6 WHIRLPOOL d8baa85725379d30359d790bfa55af269874040184cbb9fa3f74f15849b1f15fa5b1748e0b06435d481bbe10fb6e6a48e9e7619f24770c826a053ed949f944e8
 EBUILD selinux-modemmanager-9999.ebuild 434 SHA256 bdcdc90568996bccbeca6fe4ccc14eca74466f55a677e9f91fd27b719a75499c SHA512 748347f773866bb04409946d4e8beee53abfcdc7f4985c22576a5ed358943d33883505aed3b584df3e998a512e0a20ba609a275bae6aad7daf93ed68efb38ce4 WHIRLPOOL 345cbde5fac718c9d19c2d086daed6461d2f065704af62c951c6749378f70adcbf2f4b5184b2465a15cc73fc9002edfb7ed214b5a8370aa18afafe28628fc06f
-MISC ChangeLog 6978 SHA256 1ea72aef12a689c8237830286ca2b975f4fd44743a86e8412a2660af21d604ee SHA512 ffed4e8e16269259d67850fd66649e3d108a581b7cbf56d72fd91b2999526eb21fd0e6251e88c041b24c5c5420067db760abe324d57e1a5fd6792332476b0532 WHIRLPOOL 306de1844f0e23844b03bb28bd9c7d21c7fd67f841a0fab0e6157d5f5218b8044e717690743c8b004fe0e8306744b45e9377ac2acad73c2fac0baf823b6244e5
+MISC ChangeLog 7182 SHA256 478d2c0dbfad56855ff6c97c5afc1d92a0185087f061abf6f97dadeb6de67682 SHA512 e36402dd71e93fbf34cf6e8bb460a56cfd9dbd534e1285abbb7a6ead14396cdd522590d13c0cded3e6c4be797844326c516c03634dbb6c437c0608f447b2248c WHIRLPOOL b5139365dd873725457e5a47e3be9b01a82360b933b07747729eaaca89325de9c2a95e89ab975e95fdd833984eb318ff5b3b011f8e1a743c7e02aecce5ae249b
 MISC metadata.xml 236 SHA256 2cee5eefc3b4774769864e15595482b444876bbb8eeb95038a108db5188ca561 SHA512 b1fc30de4c32a70c1450d16b066f811fb4bab1a862c6c244dc0800273de770baee7ebf60b20b91cb26b6807ade20f4aad598d8a19cb0fc6aabc507f1fb3ee9e6 WHIRLPOOL aa9d19daf2838cee54ef7977a594222135db6812ec1bae42bb6ee3f524a8efb0f52ab22479e121e143a4150073cd11584c415f8cb6002b5eded3078bfb08212e
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0
 
-iQIcBAEBCAAGBQJT5RyAAAoJEC7dUkA7aK9H3/EP/i7SxcHQpaOcvxXh0zYaTOAE
-06Xr7WPkCFg2kAGS9CJ4d1e72HeF9x15IQNpJ+iSny9CeM64hxH9FqLbdaq/2kvd
-zTZN04pa9SKXHDMgOD4Jtgh1tMhXpCoTL9DW8m7FmsxsSNL1uercdxsHsEVMfmtL
-XRzg7M6cEpLCKykUa/sU2Wprrti8U5YWtVQ96CFrlU5Hpg5gpQXBzXCE6dM4ORy3
-zsn5XxvfvQOTUIXzx2FuDjXzx1+CFuEJnZgsK4LpPDkIXoSd7u5qyZgwOzmeTRjc
-AMnZ6zk/KxMKe+75SlKcMwtcMUlaYryTMNpYZEYnBe4C3kwzEyAfdWX/oDLo5IZy
-pCY/QmOdgcY3xqUMb1egXhtCeWMISWBqO1vwL62+w+7u5vMhu7IqLDhlSBnUmPwF
-cCMNNCgmu0kqQFfM+I5tcujl/QaFy73Nrju/hv+qvOC1MA6rGsA6V8a0BT/9xuRF
-6fViewIrKvw/OYOkSSlSbnLv3r1zfGMzaNX+HsaBpicSvchCFdXFw7hq8fwtKOxu
-WVqvGvyQ9X//ExcFfW9/WldMcPUTCtO9Be5fgkSeUoHjNpSNNFcNKig96A9N7t1f
-K2ycRIM0xer6P94sKBZufCNyOptwxfJvg1KIrrNzi9aFtiQj+HMhCAZQnM+n7dwS
-on9y2Ri4a5VFhZNXSDuH
-=ystC
+iQIcBAEBCAAGBQJT5nhUAAoJEC7dUkA7aK9H1pAP/3va0cAcmdriSbqrP9M4zLxB
+5vQ+LIneP+98hiLdBmV1iANGo7nPbi+3/AMv2Tbwz1gZ7TnvUwCXqsBUbSgK0IKv
+rrRFYXT0bN/8mdhQ4fN9srsD8QD4uj9Fi3XWZMsA7dBPXDQZ+/lMRlvIoXGpBLfN
+HIiBP6kBoG7mBzeweuIYSBxG7K+TwS99NH9GlxOse3lodrH0fwQdVgtoKWmiWwss
+EDTn2MmBbzp8bF6QWOioBlylg25jyB5tTRkBDRWLWmTh+oXEj1W8RuRalRKZqd2O
+X4oFe563u215Ou/WKsWo6CybwaZ3Z1L5BkMOYq4cOjFV0Fw7MtZckaQwqhVrtzC/
+C8zK7JfIyiwdZpvoY1Ec/HVFR/PFxsYDD2C+1iqPm2j+upWXgI7dl9P7eeNLzE3b
+lvS8LEP6bocHqEYe2IFn0o7nL7QLY8If9s6WY1ZPmYxDuLKGbzK/PwDzOFOabWe2
+4TuMGzh5GbEFmTcNmZ7u1jmMWtCOHGmtDyydUuMyC/gUGEjD622UgCc7xH+nhIHb
+1MRCf9vyMg5TCBHNJlOeTu6T1aOCQhtGI13HM/GmqhEdpOWt4gM4Jr98hJ5MoFD/
+wNM3eaCevSJbmOIow44DOew4YEDEQXwkCr9+w8lWb8pFaqPEtoTSYBVZcCBkdatN
+p7lDUAdxcFBTws+q63XM
+=mtxo
 -----END PGP SIGNATURE-----
diff --git a/sec-policy/selinux-modemmanager/selinux-modemmanager-2.20140311-r5.ebuild b/sec-policy/selinux-modemmanager/selinux-modemmanager-2.20140311-r5.ebuild
new file mode 100644
index 000000000000..233ddf045143
--- /dev/null
+++ b/sec-policy/selinux-modemmanager/selinux-modemmanager-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-modemmanager/selinux-modemmanager-2.20140311-r5.ebuild,v 1.1 2014/08/09 19:34:04 swift Exp $
+EAPI="5"
+
+IUSE=""
+MODS="modemmanager"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for modemmanager"
+
+KEYWORDS="~amd64 ~x86"
+DEPEND="${DEPEND}
+	sec-policy/selinux-dbus
+"
+RDEPEND="${DEPEND}"
diff --git a/sec-policy/selinux-mono/ChangeLog b/sec-policy/selinux-mono/ChangeLog
index d3d11e53fe2f..bb4ab7512ed0 100644
--- a/sec-policy/selinux-mono/ChangeLog
+++ b/sec-policy/selinux-mono/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sec-policy/selinux-mono
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-mono/ChangeLog,v 1.42 2014/08/08 18:49:59 swift Exp $
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-mono/ChangeLog,v 1.43 2014/08/09 19:34:12 swift Exp $
+
+*selinux-mono-2.20140311-r5 (09 Aug 2014)
+
+  09 Aug 2014; Sven Vermeulen <swift@gentoo.org>
+  +selinux-mono-2.20140311-r5.ebuild:
+  Bump towards r5 (fixes duplicate context for hiawatha)
 
   08 Aug 2014; Sven Vermeulen <swift@gentoo.org> selinux-mono-9999.ebuild:
   Make 9999 ebuilds EAPI=5 and transform to make master for version bumps
diff --git a/sec-policy/selinux-mono/Manifest b/sec-policy/selinux-mono/Manifest
index cf5241bb6d41..77ea2e79c9cc 100644
--- a/sec-policy/selinux-mono/Manifest
+++ b/sec-policy/selinux-mono/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-mono-2.20140311-r1.ebuild 379 SHA256 f3657f23c3685a3008cf21fa50291385684e5ec1d82ffad4be951407e892fc2e SHA512 465da963946f516bc1cb473f850517a739fb10a8227ea42bac4d12d02d52aa2be62fa71cacd88b62aadc4af7a9eb1d51eb2f4f5dfce52e8cea5d68a26b6330b0 WHIRLPOOL cd1285472d8da0653ab3c1780e1e6eea602053a6a0e2f61640759af162ca976cb72ab6b1467f5552a920021fbdbcec7b663b9e62e24eb068e31ec8d19a8b8654
 EBUILD selinux-mono-2.20140311-r2.ebuild 379 SHA256 67571ab4215a6536b044de1e00b609600c7efcb642a5bb74e2441974db8426fb SHA512 a7d22554d5bed56b173450267d5084b5f12d5f1672b926e2d49880b36e44c62587b39a947bcfd25f9480f7b9ea89bcd9461c0137b0adf104886c1728411b9697 WHIRLPOOL b04c7cfc7c96192b47fb242647981a6fcb140005dbd29e618dc7af4e371c864ed5f99d31767b540261eaf394985c4ba238e48d2a688951a679f271ed5ef3e0b2
 EBUILD selinux-mono-2.20140311-r3.ebuild 379 SHA256 80795747636bc9b03d8ef6af55a7f067efb380ed60a336a3eecf045fb6b246c0 SHA512 cf613a775e0c8401d875d5f80ef2027296eee7a0470e4b49ca3793e5dbabbf974ec600c719dda3be90aba664979bd696ee40e4c557883f20353ef0a31f5c11b2 WHIRLPOOL b5fc1a4c73901837ba58c057bdd6ef414dc91f343af724a6273d1f965fd31d4263a40655cce164b145cec573319089c8197f1c02db7b7f227d5a8759ad1c4f16
 EBUILD selinux-mono-2.20140311-r4.ebuild 381 SHA256 c740e56fb9285883f68a6a112564bad2e4e9be970d0d5477862b8467187096a1 SHA512 efedd94a4cb6cc14f6e348af44572949d13685cbae728cebbf8e3daa3974386b656de1b19a7aca7f7c077c460f605d63b96a3f3d56b0fa640806c98a039c6225 WHIRLPOOL dec5b0c46f0674f398dfb2e2b5003b9b23cb8204a68e0dfe569890f923a3ff00e32197f219187662ee96be34bc68a3c0b0100b0c2974e813dab56e3ee0aa71f8
+EBUILD selinux-mono-2.20140311-r5.ebuild 357 SHA256 2324e1a45c97987eb28bbea5f05ef80da9e32851e9096b7cc4f9d14543077e5c SHA512 d8a837a01b0c55192c9355d48cf24ec4c7c2eaefad542034d27e83ce002af90cf21a6ede2e12371176166021da197254818196a847455e0e210c613da0cc8982 WHIRLPOOL 3854cbe46fb95de6ab185384f4d8f6689388f490584a103edfb5b9282a044f26f79304ea5fa8401b8e30cb9479973c31dbb65564fafd6249393dac651368253d
 EBUILD selinux-mono-9999.ebuild 337 SHA256 84f7f7123e9b0bd4d3a7de5463e2fd63373030f9e32531e47f8e382fea2281fc SHA512 ae469d977e0691641f17f82942ee7c9750ce4a3a8c3400250f298da8b502244d4f090e7a08b70af14588709ab45f8ef3309f77ef62ff94f3fa3862d77fd319e1 WHIRLPOOL 088401bf34a8e0397be82e8a29204fe9a8cde0a9000d8674835887aae863167b61f5bfe670cf1b48dcb085161e3da3e15cfb1a01a4b43cfbfab3d16071aa0ec7
-MISC ChangeLog 6362 SHA256 df94e364a26636b9b80b29e6620c81b784390dd5fe6a8ade4680189d2f4d2e4c SHA512 94ff6144f5e5bca0754190f9435b4c6982298763cdb2f38c04c9477974001b5885eb39839227bb024a4bc9ed244b0872845f796899da3b8719b3edf9ecf4930b WHIRLPOOL 01d6a44b88427aad9020481d695582211091ae84f49f70958986c5864aa4cbd04f183b8152d20af8b2e7073eec40c949fb062eb6982b160ac560f44520a7893c
+MISC ChangeLog 6550 SHA256 c93a93d8fd24c7d089ba37ab3a0ffcbb31eea1bd24b89328a20c99be9dca2857 SHA512 4a5dd4fa45df55e30f685aa698cb612f37480232d130c95fbcff916b7c30c461971579b9afb804579b036dc4e0728bc0c604530df60c8e0121d7bd9e72322b56 WHIRLPOOL 3954d162f58cbbf0a1523c548e407dd6aaa7ca2df6b81dcd2a3daecff74513d95989413950d6f7d6cac268772016ca3ddd5c35bcf3d8c585b0d667e82f9191f3
 MISC metadata.xml 228 SHA256 e024448bc286f47f526b5712b8aeb99045634050b0876aa8ce215b40581ae2c5 SHA512 92a7eaedd798669f4937b1023f6c90f605d9e438d8ee4b10c8603cb9a0dc46df03b667b2ee812faf2fc9faf94bf50305122566b1a8cf24f25e0fff819e63da06 WHIRLPOOL c5d90a448df4008796ce36485af4ae031e75eb3c111bbe768a22d868e4cadd06ea49b201fc2b20054b5312b0322c559c249ab9dd84893d8d75a2f23cce1a0818
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0
 
-iQIcBAEBCAAGBQJT5RyAAAoJEC7dUkA7aK9HmIMP/jl4/NY1duWjTbyKsYpuBfEz
-EQ7paeOqz8xV3W/SXlRhQFSKImSDixBlFs0e6ZCozTuDJ+6WnyEmwok46Dng8XG+
-BAo9pZMaLWOpa0QFqP13N8QOtRQN5VP4B7t7Wx0cfQWOO0K2eVvgLuaOT34SrEko
-McJdlvXC9QbTzU1kJjNWiFUeZNQ4Kt7YWrPfRqNkaA9lZFjMJ3QHg0DoLf5oBObZ
-Ie0mHwPAfxTfsLi9ajNRbNLZgQftYcPOTJRJ5M7hlRyyGM8DLOov4CqT+PC54DIY
-6RY9SJA8yga8lRDFlXmwHnQ4UOecKBNQEsDm9ja0q4Bibj3Lu5Xa2eiLEKzqD41e
-5+S4FzZMQQuKXlTEMzaKoHECeO0ctqvp3SYA6k4YYRhhVG3liwczF1OQS2R8kylg
-xQn+y6N/wyywHkV74dxTYmGQrK1vKB+wGnx5//KFs9eTOm9hTGrdK0SGU8QUnL1T
-PyWqzDfuOephcbITMwxwq9/+ClGgSbSk9CIgwQr4HPglSPckyngwPcOfnxcssnxl
-RXvTVH6Mqle9zgAtyx/5IoHEpuhBZPybnrtU9/OADH4VF4iErj9ayMa3KqA2rPGl
-/loJABfZl5rEve6IEOVktkhaCtW+tVXVoTlWIJhqIn8CFoAy7L7s/apO0R1G5LTX
-CWappe8W8vwQxLlUvvlJ
-=1OOw
+iQIcBAEBCAAGBQJT5nhUAAoJEC7dUkA7aK9HvxoP/iMNHBjU933VT1NhiMN55aVt
+Jd1szTWAgIxKWrZzbMH4tZPTdtxUXWp5HbijPoccJaE/8R3oDc8Ir8RpFRF4poB2
+vmjjnBkHG2O/VrKCL0B4wKWWTawQ3b7e/KYHZ1FVjGvLOIM6h01BCYeIK7wBKaSL
+eUwhmx9uTf6YGWSkQ4HwC+WRQUopPxpCXPNMwhe6dBmpCo+5/z1NMEgb72UL6ecF
+0p4Vcrbu95hCRGw+jCqInMN1HqlIqFAVbaIpUMuC5L7FMjq+70VuoBPcfr7ryPy9
+adGlDCWL1tpm7XIWUAcKePGEemHpZ2g4DVyESPbPe0IDF8Ml5tNme0a0r0BTxSC4
+ab2JCiQlJuM6m0Sv+T0nfTj5yarvpGIGm1OCAtvx0Uuz76kQ06Tp8zkhyD6VFCw/
+Sss3sdMs1Hh0E4402WJgI68OAqgZiOe97P1IY4UWiwR+wWYko2HaAD5+jo2hca38
+YX0gFlxd004ulzbgeiK4sRFIWYmfossAPLdOSBasdyP+CMJ3HihzX0S+w3YVp+AR
+gxIGdALwS+0ueAO9cJRshFdJ9u86b12wqYJKiFL14KzCJP+v1qR2zvjLODFEWGiJ
+Ntx3nGIFqnZ5HqtOs34Aj+p+f9TrT/SMrKpTchkuyTHQRAftOi+v3oDbAfGLPlLp
+rRCWUa7WlveNRFK1Z6cc
+=78se
 -----END PGP SIGNATURE-----
diff --git a/sec-policy/selinux-mono/selinux-mono-2.20140311-r5.ebuild b/sec-policy/selinux-mono/selinux-mono-2.20140311-r5.ebuild
new file mode 100644
index 000000000000..18b76fb5adab
--- /dev/null
+++ b/sec-policy/selinux-mono/selinux-mono-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-mono/selinux-mono-2.20140311-r5.ebuild,v 1.1 2014/08/09 19:34:12 swift Exp $
+EAPI="5"
+
+IUSE=""
+MODS="mono"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for mono"
+
+KEYWORDS="~amd64 ~x86"
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}"
diff --git a/sec-policy/selinux-mpd/ChangeLog b/sec-policy/selinux-mpd/ChangeLog
index 4754ddfd205c..c6a515df9718 100644
--- a/sec-policy/selinux-mpd/ChangeLog
+++ b/sec-policy/selinux-mpd/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sec-policy/selinux-mpd
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-mpd/ChangeLog,v 1.40 2014/08/08 18:49:53 swift Exp $
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-mpd/ChangeLog,v 1.41 2014/08/09 19:34:36 swift Exp $
+
+*selinux-mpd-2.20140311-r5 (09 Aug 2014)
+
+  09 Aug 2014; Sven Vermeulen <swift@gentoo.org>
+  +selinux-mpd-2.20140311-r5.ebuild:
+  Bump towards r5 (fixes duplicate context for hiawatha)
 
   08 Aug 2014; Sven Vermeulen <swift@gentoo.org> selinux-mpd-9999.ebuild:
   Make 9999 ebuilds EAPI=5 and transform to make master for version bumps
diff --git a/sec-policy/selinux-mpd/Manifest b/sec-policy/selinux-mpd/Manifest
index 275cb7484782..7a8fe1ceef9e 100644
--- a/sec-policy/selinux-mpd/Manifest
+++ b/sec-policy/selinux-mpd/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-mpd-2.20140311-r1.ebuild 375 SHA256 1b8e1de9d3888e1612ef67f90567d3a70dbcdd0a760a4508ac7ff5a42ba8dae2 SHA512 5149075b6838f8022c12268cfb2824d174f89ee897c76504bddd0ccc6af17bf19fa8c62f26a2afb1e154c7f9694b7f5e8f07a22551fbbf8010c8cb0d57ce426f WHIRLPOOL f90a37073c8fd2eebaf5d976c88ad5841b26e319f7581d10e9140bb6ea97eda8026a5f2273a1fd2ecc96b3cabfce38fce5b772b73e1b278af5a170a530ab66ad
 EBUILD selinux-mpd-2.20140311-r2.ebuild 375 SHA256 91af5e5c7826b4b00ea9482a0c0e06c3ec3c6f5559aea6b53420a6738c438382 SHA512 f56ed96f23a72a8ea8347dec8fa9bc508e88b26a2657d48ac6c71d9bf77fea30da0cc3b27a891ae6e6ceb1e0560ed601f44df310db0bd3dbe43300399cd57ffc WHIRLPOOL 14eb599dec80e22323e52ed3ec01a535fc1b45f5c79bbb83716cc0ba988148ae474a11b54a120efd8a3bb3883e7fa484a9c2417b5623c457b87c248a0301ab44
 EBUILD selinux-mpd-2.20140311-r3.ebuild 375 SHA256 d4bf0bd1b5301cba5cf969b1e4bdb79860dd1793f923be428e3c2ec4b5ef3ac7 SHA512 270396e5e0bdb0c84a85ed2fe20202fd86c135820da4f3dfea52b81b9646875c68b7e11972550587315ca552c44b0c9c9daaaab4cb517abe085e418aaabfbbee WHIRLPOOL 85dfd7f3447a82f1080f1b8948e802f88c81cc8eb4405301fc329456747a500fb0b969d42582295cca1097155edfd3f7b68127f2678522e9b275e10b56227a94
 EBUILD selinux-mpd-2.20140311-r4.ebuild 377 SHA256 7cc8f8e3c6dbe76297604d39a93f49c854030cf6aa955110cc4db6955c6a6ceb SHA512 7fff4645289a7b81a77491de06d697679a3f4a1e370f8b8b92a912983c7eefa605cf82b2dd887e72a17a1bcb1edf11ff4c5b7394d8724fd4a32f5532d8bde53d WHIRLPOOL a6175a7d5d58d123bdbb0c1c1ffc21cb57f3fa81fc5034fa4555a9ccc5e0458b27bf8095d21b27e2c717fb9bdd1dbc0f631504117667c56e6e0f9188bf31fe8c
+EBUILD selinux-mpd-2.20140311-r5.ebuild 353 SHA256 c8328d883a4c73bf3ecfcfd799c933fba70729222e273f067b7c60b845dfb183 SHA512 43f1acfb188b9f136f1e7a7301c5356f0ef80bb4f2d62a3672a53dd08e75b1e3323fd6c522de9d295fdd15025daa7ca1ef1c3180f81b2f9aebcf536b7191d1a8 WHIRLPOOL 1383f865d767177487f0ab3ff3d6009d24547b30ac92c18479e0b91ba1ecf5d8351a40b4b7fe3843f97de49fc149e682f810e81c4d5d6d2651b203ae28d5068e
 EBUILD selinux-mpd-9999.ebuild 333 SHA256 e107c050a21c0eb6281df63da063b2b9f0bc96b97cef071a6577dc1f2a267a7c SHA512 161be7159c99f1256df16f142fbc8325032f4a6d3af8c37254413e57f49e31eaafd5eebce6bf35bed5c71d3f56541fd4f558f957552437668b57669b1f0ddfae WHIRLPOOL f1fc8ef302bcf01821dae2073b238ba309075cb9f6358823a7b50ec396eb1ac76f2b9211f960763f6e81c79a52ae7599b83881d3fa797b979c7d1c3acf3e6f59
-MISC ChangeLog 6023 SHA256 3904cf4ef49109dd3ea0a5ccda72b467529368e6576f68488df18849f32de906 SHA512 ccbf3ab7fb303a7c4e9325283284b8f30dd8cc1cbbea58cb3bb9fe93325ad58320a0df63bf6a50303898345e181e81d61a3c93e21fff788e4429efa9386352cd WHIRLPOOL b9e32ab097bc1951dbdc89e789173b5bacce1682fac6dee55b2f019cd1eb189b757a8262cb3d8c2daf9570ab293f68f37b59fbf1e446b35fac541d4179898f83
+MISC ChangeLog 6209 SHA256 031d1a96378a7bb3cea38672bf58e7ef90d92428cab5321c905a00eeb7d9bef9 SHA512 de4a3c9c71a900abc819d88c8119b04321ca6df8aa1493a9a27146d19e41c7f3056ce1a118136cb3cfd52630c98a4906a5ae5c60e11ec5ddbbddab473bada913 WHIRLPOOL 02c9ffc6396b4e060ccacad441af0ad51251153684e24dffd3e6d74f088e3a66134d101ad56acdb3de9cf346e7d53848f39c30d6b4def5a7c4dbbd830633a97c
 MISC metadata.xml 227 SHA256 6078dd96ea611a56dbb1630cb2adb4e462e3cdc74b8d27d76db119aca36063ad SHA512 af7d2cdfee6d28dcf2379efb66fa9bb4933775d569ef46749113e921e183a886a586b2583226bb6e4eaab9b45db56fb8ced3ff14585eb31c4e3968deedb679d5 WHIRLPOOL 6a74600846f9adf709018f7603753046278e01bb2f845d732c9a1c94e79fe1ec1bc368337bf6deefc6e500ef47947c3073ce36bd2a2445c77aced386b4f1e9cb
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0
 
-iQIcBAEBCAAGBQJT5RyBAAoJEC7dUkA7aK9HPOkQAI9c1OsjGcntuWx7AxZBMoMY
-jA+JaBDaX3AJlywyAVTtZWslh+HmXQtipIvE/wfYlx3PpKUr6pxZFs+tcxFu6GQF
-5CEWV1THZkMqsimEc4n2yDw982XMDxrtTYDnAyh8ZzPsb7uiYrUbiroyRZm2eSNH
-wbv2DUKAfINOxNT76UL7XWqSdYSUXdNG3Vwv5NevBQLhwRyMZv0bimthH6Xg4mYL
-/Do9LT0MfpTZ0de/zBL5AHIABFK4ZsuUj4XWNF2L8SEYPXkC6kw22+auuWBGUGR0
-qh12TkBoVD70iWPgmltfZOrL0Y9P9RsMtPkrFPkngDi2HFrkpDB/C+7RHUGMt0Te
-JWDfqMTIAOYKsij9a69nCKY+q6PMKXTw+IBp/8VxANQlmoKBNuc3rBVVwlSNJZf1
-a2imrPKkP4SIytbeNZx+QFiHxj4Nd+Ieou6uLNdlUIfVV1+Y4t4P++/xDpty0XQ1
-+EiPZvF1uJYG4NCGCTrkCNHpSbOo5JXb/u/wL1pQZROQANi2ylPigdWV9PMzIVie
-iruL5W5HJHxbJfXNME0bK6ijqpfEtltn/GI4LYku+sqP3yhCSPqEoCigEzVg3OFe
-6a41TZXrBhshyfeaQ5RCcdRqzQU8sW9YbYm3hsarMkClFWgg1FWg7Lc1amr6yPPT
-JTAczec3aPjn5YnKz7a5
-=JCJO
+iQIcBAEBCAAGBQJT5nhVAAoJEC7dUkA7aK9HBesP/AoXF+QX4icqQHO/lUt+xY4P
+5CI1A+0ObJf0763v5gWBo/6IM1pX1XN2hTrVqC5WsmWc35mQVJ0ySosspNp5H905
+LGP2/FKZlJSWQziG9CywFh2yRpHOGWESurXuViyEfq0GRI+sA8I+tnYhQtTTZkMg
+m4RBBUBiyEm2WMeHg5BdlMnefsrqQoLXm8Z8Y3lWQfHcPI2+ucXT6sfXrkAnckhs
+AcGmTKBlm84TqxZqsz1d9Y3F2ePHhzr+0dkoFFM72kHCfHmiS5pYv3/6TEsUnWEu
+M4jkFNORCC0qaelQmbCouRmlk4SLepUTei+Ey2SFX+fq8cLROOtqliyhGq2+aywP
+J8Nhzui4Vbja+si2m3AmqnSwyKR+14Giha7Ko75d43pGCRGqdbiLAwMwUSQAUkXK
+pj3YdL3piAqIF8puZd8H/aTaNql/c0RURyjG1e4pQBoCy0aW7GqAC48qax1Y8N6g
+riCwGAjMEYqH0AL86VU9b/mFQZRIBQGa6hRdfwq5vTuP+Hdviy2G3KsUseHwpnSC
+dauUyRDdUD7r/D7hz0IaGChsSjjb/x3LMxfF+Fw7gZgHOkAxZ3BwhrlIgbVKn1I1
+DHJjDebO6iVW4JHx+hSMr0P6cWmYfqI8hEwuesY3NmiDV2axVnsmXPYfFo+ULoeJ
+ypeDugyG94K+LiUJW9Y7
+=hE50
 -----END PGP SIGNATURE-----
diff --git a/sec-policy/selinux-mpd/selinux-mpd-2.20140311-r5.ebuild b/sec-policy/selinux-mpd/selinux-mpd-2.20140311-r5.ebuild
new file mode 100644
index 000000000000..a75d5d10a949
--- /dev/null
+++ b/sec-policy/selinux-mpd/selinux-mpd-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-mpd/selinux-mpd-2.20140311-r5.ebuild,v 1.1 2014/08/09 19:34:36 swift Exp $
+EAPI="5"
+
+IUSE=""
+MODS="mpd"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for mpd"
+
+KEYWORDS="~amd64 ~x86"
diff --git a/sec-policy/selinux-mplayer/ChangeLog b/sec-policy/selinux-mplayer/ChangeLog
index c19016178248..90ecfd9fd08a 100644
--- a/sec-policy/selinux-mplayer/ChangeLog
+++ b/sec-policy/selinux-mplayer/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sec-policy/selinux-mplayer
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-mplayer/ChangeLog,v 1.44 2014/08/08 18:49:30 swift Exp $
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-mplayer/ChangeLog,v 1.45 2014/08/09 19:34:08 swift Exp $
+
+*selinux-mplayer-2.20140311-r5 (09 Aug 2014)
+
+  09 Aug 2014; Sven Vermeulen <swift@gentoo.org>
+  +selinux-mplayer-2.20140311-r5.ebuild:
+  Bump towards r5 (fixes duplicate context for hiawatha)
 
   08 Aug 2014; Sven Vermeulen <swift@gentoo.org> selinux-mplayer-9999.ebuild:
   Make 9999 ebuilds EAPI=5 and transform to make master for version bumps
diff --git a/sec-policy/selinux-mplayer/Manifest b/sec-policy/selinux-mplayer/Manifest
index 91ba3334eeb4..7326bb1cf852 100644
--- a/sec-policy/selinux-mplayer/Manifest
+++ b/sec-policy/selinux-mplayer/Manifest
@@ -6,28 +6,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-mplayer-2.20140311-r1.ebuild 391 SHA256 3fad069438d710a3eebaeb712960c8cb3cf99638446d115ee96079324506dae9 SHA512 1c907240d4ebfec61068f68526d477b8d46ea1d2c81d7d35b0f9508861dfe4c6b1e78bfb978b17f069b361e183c852a25320c2f72dd054ac84526cf4584cae08 WHIRLPOOL a8d50d3e8b2a23596da4be755806142406d01087e09edd50745f8daf7f4496df7123d6faf91d7e93164bdcf9f74779c4a5b9642d70e03aaacba6f000680606c5
 EBUILD selinux-mplayer-2.20140311-r2.ebuild 395 SHA256 0dc1a80a808b8b9db9f53fb22cfc360a86fdcc9d7b590e6d9a1d50a0fc3d8395 SHA512 410797596270099c0e595f07af30afdad61a91186591c323a42c645b12519899d45fec0c68bea41fed2fdf2680484a3391249ef41cb676127677bbf0ce7ab58c WHIRLPOOL b39f0c3736faf92c910da4a7001e237d2fd90a6a9b4579a3cb3abcaafa09ca2521804e0b5032325b560118fe9195e7449974f4a17b969b6368405902b2bc4ac8
 EBUILD selinux-mplayer-2.20140311-r3.ebuild 395 SHA256 6e365d16361b87aa367f3355d799e5a0e3fef734e6339d9ce3dadae344117245 SHA512 ab994c9d3e9f84fe2dee71b958c6a48020a66356fc1ad3292238a8d2014b3561f5e692ef901194513f4cb4a373ad130a184963cc71dec731a670eaa8ee3a0cd6 WHIRLPOOL dbea46d2e5057b8d238b62fc4ad0db07e6c7ea08d0a9351be0f1bf7b6f380243eaf2093b1455e896f61ef0e094464ce97b4463c40dd339083eb6ff90dcc339ff
 EBUILD selinux-mplayer-2.20140311-r4.ebuild 397 SHA256 1874bbce114379e84567217b8e3e25364cfb8e09e035d8debfcf0db5ee7b6c70 SHA512 dff09be0b3c5841cedaae6335a4f5759104def21fcbd4fd0e660f52ef73aa14c733a3da5b454e0cecda8b0c8097a8891fe6028e025ee302b26c2235e9cd7dc3b WHIRLPOOL bca700de509dce3123d8d57f7ee74178e4d2495cf4637a9a76b5792dfc88e1deda64a4c84eb3b2221e5c836b609b74d07ab61d087cd11e458217a8a7a2a9035b
+EBUILD selinux-mplayer-2.20140311-r5.ebuild 373 SHA256 9b5e4be4a63c00a0c1117c578c37cac2f6e89f0432aa0ae93dac0f482fa3e937 SHA512 818f56f835cfbf91a989384af9e6faa856454cc6b3cb329b1e5e5c56b0699dd8341d728bcfe5a273ff6050653da2e3faa4a7972dc171254de545d003bd3ba7e9 WHIRLPOOL e2884a0667b38f50a3ca85c8cbac997a49f9d37513ff139dad632da6a31895b3dee0f68411d05e201ab06190dff8f1c77ce2c76edce159bbe96fa2da4c43c747
 EBUILD selinux-mplayer-9999.ebuild 353 SHA256 071a7117650dac8f11bbd9735c75ed42811ad35302324a3af6d4f534b18a2b68 SHA512 8d280cdb6d0733b085d7961773b8a878b07d3400608aa8b7d23826e3a432cc9e94ec8374c297c6af11b46287ea2d50ce91d9773c89c570a4b634a1864159d6c6 WHIRLPOOL 543365085473ede733032d7abe1639787d7884e28ce3e4c16f81e103ea57660892d09117ad72bd063eca110a24c6816da22eaa1031bc5f947f6276796e43232d
-MISC ChangeLog 7046 SHA256 5091908e2a80d97f0d89dab7eeb0d1e92c11aa72302aa60e66cc227228a17944 SHA512 6c695c9d8fea36ca4e5abb4db99b9b2554d305aaa126a817f402cab7fff03f49454d76c863caa3c9087b26f8141d704fffd9142ce829d119a172950e0b5fdcf0 WHIRLPOOL c11b1345b2f6ef7713cedab7d743e45d56c4ddd5027f44eb527a29c54ba34dba4561a523b7c658a70a018d63e21bc62f949dfa7f9ef47e6f3bb67f733fb46e15
+MISC ChangeLog 7240 SHA256 8ac1793181d81417ca3279656fe6c1979a3989f5e15972ddd7a83d51a413d091 SHA512 45ca3d15accbf1021fbb1672256a0886c5ed42a868763cef6659d7dce201db2f5ab85d52258cda971a288ff721f9fc0e08a101c9b3e60140337dc029ca2a1857 WHIRLPOOL ef5a4504c429c54ba317586a5d37f29cf2d246669c844482a716eb518f391596dc4b6a87960c0f192c92c9df467ca740840ce55f4ea8b68eb33cc444f4c29697
 MISC metadata.xml 231 SHA256 be24cc9864578122304949e5d4807a043b21bc214f8f7145a273fec08be1120c SHA512 c9cf83ccc6dded6ff87d02897eca325a363d41c20558fa61eadf0be3de40627ed8b6a67fb6922a903a9725a06c3e0d2a2062a1dc282dfbc6975938d6a5579229 WHIRLPOOL 87866b29d820781f8721833cc3b9d473822dc8295ea06e6cfb55c46650a83d88eb2b22edacfc2a4234bb0967af098814d8cdc5fce5ed16102cb30026b6d649e2
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0
 
-iQIcBAEBCAAGBQJT5RyBAAoJEC7dUkA7aK9HvnUP/3ivCxLdC8zjHdIG+xHKoMF9
-46p7L81PPBL0WISrUTKBI5QcgfbZcrOej3NopuLKK/mYJ+ejcG+l41k6BFO1rV43
-kD/TKk1c3mVzqn36zg8paQQt5upgVPvJ334EeaFQL/6skma3TzrCoywmmyAzWQ++
-mADnZ6Z7/FFWDLCWi3Rs0ocHicibtDhwn8mb4aZz/m+J7Ma9gwrTaHf/RFahEsQH
-K39H2SDD9L62zpGa+Sfx7jKJdVJYTNVo6Dqk/2nZQZiGORxk/9/qFTvCn3jDvMkH
-fbLwWJyn04VjUzcb0O8El+7RNzGVmVV+PTugTKusNFCHdlrp5/TivNoclSGgUush
-MV2zE7yY4wv6PEmbeTcdOGEnskY+iWJebiycnX3cjVqgVUkCb2hhUvwQ58RTRzHA
-9MV39bTj5x4AZL9fIdpFtMIrfXvza4pvn396jw8SUW/UmNdgoNLRWr5D+sbtDJsx
-oliCRLjfvoOf8gYgkXyP8qzvIRvf+9O8J9dp72hnndPxXFBPN6EiR/mo+S1wRnFM
-2GCooGNZBkki6Osqnbs9TB203uFwa2DlpMZGCqDUsQhWC1yw/GVSh1MchCJCHFuH
-iYu9Y+H6a+wrwW2JN3AAhkcasuWvbV4xpJNd6u5QnYtMNsQs57lPh0rSFeCV3trl
-L1rbfQXlH09bcNbITWLT
-=OapP
+iQIcBAEBCAAGBQJT5nhWAAoJEC7dUkA7aK9HdIYP/jeGGU4UlKnquQlRu928RF/n
+tWCBKamMeb2qLfxqfHMPxrzgNDUHV4OvgIKwbGzmylS2AA2Ufu1W2kRfEp1VeMxj
+4BQ3IQNSn4e8XvsuqP/Xw18GsX5V3MyIMgYPdoEoqtd+L05/kIcIX6zOQ6OYI0ML
+1VGAxfmvl+FOQaqogtJcTKsrC0KH6Ruf5MeqChCpQJO2Ami/rjjxwYLfSGq47Ffs
+mdHZcQ50PZ/lYyNGAXo9PyB8tk4oF0fhXvpnPMCaAUgXASqnwm0hQ8xqIwx9QJHN
+TsE+e+ElW21+IsMuCPyBIoyJd4dPu3kKbU/r3MpVu4FyaKijztBAvZ7B8tkSko5T
+2wMh6U9gaaUSuJeLH19qiqdQvwjjY6akE+q4bLX4LGN2nnxAzWRlxQHGvz1eQZKx
+fqiqm5H3jLWH4ulf7CRfxTProoKS2jzGbeXE2BgUFVzeYc9zzxMlmBTDE6SXcmId
+ONm8OmrScRWt41yM/jUR2unm5ppT+MlwgjqJouQzDUvdkS95w8gC9Y7hKikODAGM
+BYIccR2n5XwzpPN9+53CrHFzjudOQHBZWGm3M+klwQAoADnlh/C6ZbRTqXn4Yfv+
+j+EH03cIRFtmx/CZz29fg2RXskTBKsZuAJQ8RzRNbyCyeWs3ohLFZrM+ZBUU0Ojb
+sLvEz245csN9SnQ5ziQ1
+=BTj4
 -----END PGP SIGNATURE-----
diff --git a/sec-policy/selinux-mplayer/selinux-mplayer-2.20140311-r5.ebuild b/sec-policy/selinux-mplayer/selinux-mplayer-2.20140311-r5.ebuild
new file mode 100644
index 000000000000..7533ad1a42d6
--- /dev/null
+++ b/sec-policy/selinux-mplayer/selinux-mplayer-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-mplayer/selinux-mplayer-2.20140311-r5.ebuild,v 1.1 2014/08/09 19:34:08 swift Exp $
+EAPI="5"
+
+IUSE="alsa"
+MODS="mplayer"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for mplayer"
+
+KEYWORDS="~amd64 ~x86"
diff --git a/sec-policy/selinux-mrtg/ChangeLog b/sec-policy/selinux-mrtg/ChangeLog
index 9c63ea53cd83..7dd72b471ec6 100644
--- a/sec-policy/selinux-mrtg/ChangeLog
+++ b/sec-policy/selinux-mrtg/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sec-policy/selinux-mrtg
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-mrtg/ChangeLog,v 1.42 2014/08/08 18:49:55 swift Exp $
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-mrtg/ChangeLog,v 1.43 2014/08/09 19:34:14 swift Exp $
+
+*selinux-mrtg-2.20140311-r5 (09 Aug 2014)
+
+  09 Aug 2014; Sven Vermeulen <swift@gentoo.org>
+  +selinux-mrtg-2.20140311-r5.ebuild:
+  Bump towards r5 (fixes duplicate context for hiawatha)
 
   08 Aug 2014; Sven Vermeulen <swift@gentoo.org> selinux-mrtg-9999.ebuild:
   Make 9999 ebuilds EAPI=5 and transform to make master for version bumps
diff --git a/sec-policy/selinux-mrtg/Manifest b/sec-policy/selinux-mrtg/Manifest
index 114eed0c7ba5..e05d2a57ec05 100644
--- a/sec-policy/selinux-mrtg/Manifest
+++ b/sec-policy/selinux-mrtg/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-mrtg-2.20140311-r1.ebuild 379 SHA256 f1fe6adc88672899a6f96ec1764f222bcde1b8c1453ef01cac07924c3a06d1ae SHA512 2d3340de42f1df60541898b100f07d17391ff158ec8767b69c7bce8fe8298357977b75990bab89c2ab8079285c8eb7a833b498e3f0aeb50fdb5a15f48785de34 WHIRLPOOL 9e69c5d031eb488a22a20fa3f4a44fd304d49c0a29d8e9fc20d5e3bd76ac7de3adcda827e8aac4008922c1773b4addda817f6f4432f5d60c749f2cfd5f28347d
 EBUILD selinux-mrtg-2.20140311-r2.ebuild 379 SHA256 eea96d3f05957ccf4af6489e80249cd433e189c2155efd5f3aca955c0d397e1e SHA512 3f0511c95e4ab4ac176d20fd0edcaf561d620b992428ccb67f9de55acd0cbe9420bf283f387e1333c6c70bbc565e6f9ca16369a52d02a404479c1b7c679eded0 WHIRLPOOL 73724eb942573ee6a9913cd3cfd5d025fb5f9dc674e4fbe4ed7fca8aeb4dcc078df5d276753e740867ac4ae9aca2e27bfaf9a6cc653f941cba884ee6b4d07ba6
 EBUILD selinux-mrtg-2.20140311-r3.ebuild 379 SHA256 3c8f9b54d5276616a0e216e9ae191e40715f3be07b5eac2580a92dcb96eff76d SHA512 06e7d9ff44514d3039ddcaccd70ae6af2a202d2cb8344b7db2fd2fba880b8dd54fb7a67b433f573ff41d81992e2021bc6b84c5fbb7725ed09bc6b72ea948f631 WHIRLPOOL 6100cd2a1357e60ea691240d4cdee1c56b2cbd5f39fc393cc9bd07d4e6ddf8b239c4069e07145e52c79d6d9d8d6debcdce7d28059266df54848ff4183b194244
 EBUILD selinux-mrtg-2.20140311-r4.ebuild 381 SHA256 41fdb75b1b8f387c832091e9854b8281f86cae24ff010e83a5a928530ed0b557 SHA512 95fe192d5b47755e9d26eea2f653289a640fe748d4c59d589f66eb246500b81db6cb30be6a41eec81c8ab3419b860ca0f7057733ec5d6e695606408a43041d18 WHIRLPOOL 369156dff440a1e5721b1e032d4587d13c2d91cbdd84e029a24e28632480f50153425d374e8ac511fb88e940689632ef30a8c867ed5f79d3586bd7209026456c
+EBUILD selinux-mrtg-2.20140311-r5.ebuild 357 SHA256 3d840679ab76479a2b2ba0775a6e87698fdce2dfdf29d30a8ead3ff9bbc87dd3 SHA512 530e6d036297154dfedfa588c3eb43d199680e7ec2366f974fc734d4931732a655aea23e42740fe2dda8ce761b18b0f4ec79253a5580661779e247f71c863ec6 WHIRLPOOL d79e57d3dbe142414580143434ac5b1919ef05a77a773bdfe02001ced5233d0cd02c07b02fc37d5d6970ca51b36f2f06c544d59366a4d1ca6b7d3041015596bf
 EBUILD selinux-mrtg-9999.ebuild 337 SHA256 4aa9123947478af736a60df713080ffb24f289b0026f0ce326679173f7f995b6 SHA512 e2699a1835996ab82f453926143561803ff9798792665e5b0639c81f9c8457fe2479858b30c6a1227d548a07bbcbc86043713d38977dd8dfb69dd7d2d470b416 WHIRLPOOL e3aec46300f157a7339bb9a63bebe46c49dbf0c5772886b441bcc91f0ada63e407102792ca5ff91dc5d7457f3d3b7de9197cfeaeecd8344a1d70dbadb22f290d
-MISC ChangeLog 6362 SHA256 32520d005c4dfc93602238d5a9883a22f1f3d204e859bf17c3eb5377cae333ff SHA512 2ca4fa43b9473627ca48e6592f5eff778470404e02182045352d53d871a77db2845ba60203db15e4dde609188a1e6ccdaa176fea94d2a73bcf093b6f5e48d9f8 WHIRLPOOL ef36d5052cd353baccc7e92cafb78338bcc3e40983f71bce68f44eeab7aa034e67776bcf8b498dc721ecbd4f6b1e0c5309dfeb6cb12683837d7fc45e90a5aba1
+MISC ChangeLog 6550 SHA256 cb67f3d603862092512d578a25fecb221baeb5f8f7145d4ac9422fa3f26b2abe SHA512 83d59249b3b1b6ffb9a5662f8486a9413452543427270e1e52ba065dc1d995223f72ab5a6e028d2db0eb752c16ca1095d16a34984fda587b40199ce575450597 WHIRLPOOL bdfeb57cd83c178e6007dc3e97b14c6cb9d5c612c874bc8957518998286207f0c41a4a3e13099885db4d8d47bbbcb201ccf13c5a4630f89db1a08008d031ce44
 MISC metadata.xml 228 SHA256 85b5998e4a48c5d7d3a4eb04a2fd43a9dd719c7b2e479feb56bed22c3a1b549d SHA512 cca805be7d7d40c9e2478ec1154196c6e40298ae8524a7517bd71e189dc1fbc935cb7436dd97f664b31e2d982f6016dce0dba0b9f69eba302a541a11b22ffeea WHIRLPOOL 86455e5e5da106cfca1bbd879f6a0108d5b51a40d5519e46e7c7e6ad654e716b762576d98c62efdbc1f013de7e756cf86efdeb3288f662e68f07e18578417c45
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0
 
-iQIcBAEBCAAGBQJT5RyCAAoJEC7dUkA7aK9HUYcP/RTJysYK/9pIVLoTbDT0t7NY
-X0oMVQLCr4KV09ECJcduHcUPSZXprwutok1kfI+5rYT4Pv2xbLdxhZGvx6pbOSN7
-gdJI1f2LBkr7Bqy28zhEw7psQl1LOSwyO5i0+aCXpBCbifsHaLqI/V/7XfsReqvn
-5zqLCSLJFkLrwfWs7dAwyqqgLURFDOWgYFloGve703PdJH0UbqsPCAUSpPOQQdbA
-yPSpGhbJVdYimDtThjjEZikdePa51rkuyLGWulRWtsjuxqb8D32CZrSE5iaktP+F
-/vWMAgivZyhykhk9r0siZYsxzjca4IwepU6QMcjOIaFy7q0+KeS02/lDLUiDOkeT
-fAAg1T8v/fY3O3Mlcv/VwCLnjeBJD/UeP5gycJ9Xyu1GAzjocbxbdw9LqG85T98l
-yN4gpICg49h1jQ9+f3B0KTHJ2soRArxYgqMWqJanmo1nD4xuMFnwib98BeD1WUzy
-PvjhIGiwJ6ioztvPjy4b7mpCeu/z1wW1Rl9oyvlcmTt9El8Hg62YB4TfZ1hO0GBK
-QDiHggMCMFrSRkjLpxljJSLb03DkF0K2bx2Mre910ZiVlN0+9ZXdX1eK8ZiWIiJT
-LCrj6tnc7LjyKC7VuxVufXIv5fd/714mdOYgslw2e8xWFCWSsjzyMEHbBuGZR9bF
-LwEHAXnbtGJ+2sn98Gok
-=tFEC
+iQIcBAEBCAAGBQJT5nhWAAoJEC7dUkA7aK9HluEP/1Tr9U67hND+ywiWVA5cO+S/
+aRvozUKQtOjONwTWo1Dnvzzp8biaK8f9dridlrILV2rK0Dd0JqYrMNSNVfvRYU0a
+KR6BIcfiqdIzkHswKdKbf/FN/uLltz14JaTo51h39d0VWrFjr3MF1nTiFmbVO1ol
+xuojRYhwo5YTz4hruLUraRZelcpVr+u0rN6nNiKnxGV4onvdxXWsIxJAKnsf3NJX
+xjq9/1iRk5dgIMVn3ECquQE3gMfMHCFXd+e7ooNSnN063W6SVyJJ5EPb2vsRUOic
+oq5NEBLaL9FBSvgZqPT48XwpdtM1v04ijBPu2fqpv2s9+jibenXs2Mhp41vPC+yH
+8IMeqmzwlOvWv94SGj1X76NLs9u+6b9qTXRz32tzt8Qg+hZ7StLpzqpNndJeFI2X
+2AAFRczL7axM0dhafJQUF1NZTaLO8LnV4/pyVNE+OjzjnCbjCJXida8MlhwUP8Hj
+fGvcBHBM43N4aXljOWOEIChj3ty7VD4Y5s2K+E+SyA1ZppSLhuHOqekilYTdnmkp
+oiipQeJK9xsoixgWsEpi/mWojtHLYJS0c+Q5Zrc3QG8R8T7Kv7setj4CVS8x1ayi
+lXoWpb0ye6RHampdIc9hC2R7ft74uJHCc/mlBFtij0EWwXjPPyAhl5ZGL4bXzBJJ
+RSZZyir7hMIWjRfP2F/E
+=OcMj
 -----END PGP SIGNATURE-----
diff --git a/sec-policy/selinux-mrtg/selinux-mrtg-2.20140311-r5.ebuild b/sec-policy/selinux-mrtg/selinux-mrtg-2.20140311-r5.ebuild
new file mode 100644
index 000000000000..124b2f2706b8
--- /dev/null
+++ b/sec-policy/selinux-mrtg/selinux-mrtg-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-mrtg/selinux-mrtg-2.20140311-r5.ebuild,v 1.1 2014/08/09 19:34:14 swift Exp $
+EAPI="5"
+
+IUSE=""
+MODS="mrtg"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for mrtg"
+
+KEYWORDS="~amd64 ~x86"
diff --git a/sec-policy/selinux-munin/ChangeLog b/sec-policy/selinux-munin/ChangeLog
index 3a4998c26488..914b02fac79b 100644
--- a/sec-policy/selinux-munin/ChangeLog
+++ b/sec-policy/selinux-munin/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sec-policy/selinux-munin
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-munin/ChangeLog,v 1.53 2014/08/08 18:49:54 swift Exp $
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-munin/ChangeLog,v 1.54 2014/08/09 19:34:36 swift Exp $
+
+*selinux-munin-2.20140311-r5 (09 Aug 2014)
+
+  09 Aug 2014; Sven Vermeulen <swift@gentoo.org>
+  +selinux-munin-2.20140311-r5.ebuild:
+  Bump towards r5 (fixes duplicate context for hiawatha)
 
   08 Aug 2014; Sven Vermeulen <swift@gentoo.org> selinux-munin-9999.ebuild:
   Make 9999 ebuilds EAPI=5 and transform to make master for version bumps
diff --git a/sec-policy/selinux-munin/Manifest b/sec-policy/selinux-munin/Manifest
index 622f7bca8341..bfcd6fdc122d 100644
--- a/sec-policy/selinux-munin/Manifest
+++ b/sec-policy/selinux-munin/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-munin-2.20140311-r1.ebuild 450 SHA256 4c6e9dc366e4a2b500499c2ad863e0c8ba55db8a7d678928841e2de562e00af7 SHA512 90771a2b1c3444998b69ed69b26280e93a2072888df22ae07771f0885d9975aec7b301ca5867ff3ffb939e5273c00a39f78f9590b7124e0438b06ebbc3f89656 WHIRLPOOL 283b97330e0eed567203292f66824dcb02be623418eeab6bc46668137a7508b742c7a28495f0110ed66b91bc91b00b25b71b011d42e4c1617077bed04ebea3c6
 EBUILD selinux-munin-2.20140311-r2.ebuild 450 SHA256 aced40d08f89562feaefc798c4c5a2894fb028ef1357225691f3d49d96589808 SHA512 bd63d02ff56ca710debce2876d7bf7c4df1824111e74570dba4a95868437e52cda94cda799f077d2464b4953840ac25041f478db11c349a3cdb75be0a33798bd WHIRLPOOL a70e1dbb9c16916f5ff2e00f589eafeafb3dce8a5527969189dfb72e4f654ad388bcaf7b3155e0444ab926cde7b5bba3a7183acc801d1201048ed6c55b6553a7
 EBUILD selinux-munin-2.20140311-r3.ebuild 450 SHA256 25393f253125e67388daa9d0c18404acafc8d2ad3e948f717e84b82495f4237a SHA512 4d2cae8ddd585d5654ceae8267e2b88edf3c889c87fb00de410a654c04cd7866b7473e1d293ce0b6e445ed396cd02deee508a2bf43de1f7ea71ebe8f359f47f8 WHIRLPOOL 17a5d3b63176be3aea4552138fb3305cfd343d7188c4219d4d0dea1939069214bd7427202507f0fc5bcaa640b7f393d9dae0b54cbe1764c36e0a3ab78471f864
 EBUILD selinux-munin-2.20140311-r4.ebuild 452 SHA256 48dbf03d87a2f1040c47a141633e4e887da9590f9d136215cc961cfa6cc00c78 SHA512 a1d05d2c777a8bce582a306ef955863ce2cd0eeaea1bfd88ece315e8456873ff181fca902da4181272fa3a6714bd1da96b5d0aa0fe48ee90f7459a25e3391ef4 WHIRLPOOL 869c5ee6ef9bb6955f62b38d016e13e3177da28c32aedcc4c4cfd823352d86be9b8077b40a9851dd1b4f4c17b90f7008a89570602d093d45d8812ac700a55710
+EBUILD selinux-munin-2.20140311-r5.ebuild 428 SHA256 a9be51324c523373400a1e786169eeafbe7ce6b2e7537670b666de70dfa4e0e5 SHA512 97fb1582b0713f38565898a030b36466afa327e36901694fc18039ef14346a61bdaf898fd165d9dec09c3f6f05627badff5fcbd3769357a624e02681ce1ee026 WHIRLPOOL a16ca0f798a5ccb99c90155f1219cd30d4f977811669a4d3ca99a1c21ba914a5eaf3af79244a4c46c0ad8b9245640cc149b183d10c4b72e985fbd5950923a90c
 EBUILD selinux-munin-9999.ebuild 408 SHA256 0ffcf3a443617b06d09d4bb4df753f5c0ac1442ba869709605c14be68363f55a SHA512 afe2393caf91e8f1859684cc027d12ead8dba4fc99e4ebb68ac776591266a831e82a02c7dd15f419874f4117838306f35feb9d1af688cdac84386799ac8d108b WHIRLPOOL a2ce17c6c742a06f13a0113ffdb2cc388b86f77805391289236ed95e4de04b7c021f634a5b611a655cc86ac859b64633ad8e4ba7f08b579c6576e726625a3dc6
-MISC ChangeLog 8294 SHA256 be724152fc858d5e641b8c477c98cd28c62e733d8ed4af212cce6476571b7ced SHA512 13acdb663fe8f1c77637930ea378675f3dc9d2051f65fa2f019fcfdf92871c760edd044046b16efacb1bf547feb1484d220055625e04c6b4b77aea490398b022 WHIRLPOOL da3c328d330c72082d1f312f95c8a53a55f775c396c1c3ba5a494b3088070cf46704b98c055c662de963be9bba8a2a50e16520886a0db6542de19bd43c710a48
+MISC ChangeLog 8484 SHA256 9978ddfc7532a114de9403f68025ee255f699a2a26da7184e61bafe04d8d9d00 SHA512 af37cdf7bec1286a56686bd502baa06ef5e7fbd91de508d7fb20baa755b20d7bdedcc01e18bfd3a6ddfce06a5d89c9538c4eb8e3b06fb6b504e5a95d1614ab91 WHIRLPOOL ed28f23f48a66291034e0ca8f4dcd52574b88adffaee1f94c2c4afddb34426c17da5fbd2852069fecc02b35221b2fbdf33db15de059ad12c7a4a2579a3d7bf28
 MISC metadata.xml 229 SHA256 f6160205a4af17d824dc1c6402e7e60143872253277c92fe92f70dd0e57818a4 SHA512 c541194644f9d2a560ebe439a6d29839fbb79e0538390377bd516761eec0619bc3346aff0a1fbc58c9584ac2590a34bdf3c3fac94a2d9070ad17ba368d3dcbeb WHIRLPOOL 894ab263914e9b98453e6eb94b17bd34a6f7b0418e81ccadc31be8a2a923467bf767812b4c3f68bce26008dac6939d8b3fa926e99cac01a0d9b6e017cfd67235
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0
 
-iQIcBAEBCAAGBQJT5RyCAAoJEC7dUkA7aK9Hr8kP/3aH3vF9yQCaZ49ZaAlT9Vtd
-raRc2HD0FIxRjAdyeHaczYKSXk6mxe2lpy6eTCk/0zpPZeeXBwqq2Na2ujJYWQI4
-z/h9fLjx57B38f3e/23kSS9h7FXLAG9vj6JFhUMkKB/iY2yWMQl/YPtEeRFckEeC
-S4CRjHOiXz8vHsyDh5/aSCtideDQu1cxGPFWDSpdLwxR6fBLuci3aLYdiMazEfDM
-05a6Wa+byfIM0u0osozEOd7o3PkAbTHD1hPHZDlUKjGSQaonZKy7b2GRd81z3Mgr
-/UfHsV6WhkUWZ2r/2K/AW0h5n4bcFKBnasQMV94Q/1DETwztEBE/PuN/KyT/5XqM
-f6Gir+D4CEIFp2m08BMu85oA+cEaQCId5FDxbBmyC3PAd+1MiLlEwGSEoK0xzMGP
-rz/iSfzAm823H06qhe2hRWzgtJKg9tI4lcH39Mop/7MEEE8dkvsn+cfH1Nz38vZ/
-MFdpJmeq6May+X3gUu3qw1oWVlCwb6liuFy6wRtSt/lln1W4m3DKqjwRSXjOr1YE
-vI9+wGCRHxSVow03AAZP3W7Y9+f6G/3IpCTw2sSzVBF5XwT5iEeYs8NhOhBStTLp
-7oM2/59dkB3RwLW42ywqnmmE3fQhx+m5kw42RyWtIrFqO34QsFfXnBzFEH6UqVHp
-VaDsms5d+MsuRxBcUqqZ
-=VTkH
+iQIcBAEBCAAGBQJT5nhWAAoJEC7dUkA7aK9H3LcQAJ3cfx5zIKQX26M5/o81PyON
+oJwOp5c3TibPcStvmvxl63Dfhku38nftEZohWQJ1Xgy5BTqJQgidzwktb1hK592F
+9qJ7P2ztPX14iy7bPfM3DBoPt7kM71fwsmMx17dteGbVRW5J5g4pul20EXo86Hpe
+Q90vz+mQoukVKQXq1rsxatjA/quL5EhNwe32QGBCXMPUZb+zDjk/K/3CS5EyETk6
+Eu/dd7FhugvTgylczbPE+8/3TXzKWBrp7lJKdXbcqHl3LB2M0GyBh30TumvKSY5c
+oY44Xz8CHoDwkTZtFuKTy/ExJLYZLf81GncL+BGVKDyChkU9KiHKrqsNX77KPQp8
+I7GY57uy2niGX4Ek/bSteDwXZyZhbX47Ee0kCZgGOHpwjoQ6gTpll7n7+2/ROsHm
+JNNMplWGXw2ahO87FA6h9bMcUWR427MVo3P0vl10748kpfgkQ1Zva2qOSFAZM7zn
+cREL6RU+x4cvpx1PTFSnaQkjh2BeeVg9YdPAoW3fMCTSlPDkU9+zjz0LPn1A3cWU
+e5SZcgRhWY1AA0DJyzT/2s9QaUpuit3Vq96tZLJeHxFrbkJpXRJmXKMDssn6HRsb
+Je3JL7vuYyyhP3HM4xYfPfC9H079XWSWqxQkSW+9f0b5Und3S7HWFycO+zdRD519
+IvrddRlxFEr+3FUkOy3e
+=+V0u
 -----END PGP SIGNATURE-----
diff --git a/sec-policy/selinux-munin/selinux-munin-2.20140311-r5.ebuild b/sec-policy/selinux-munin/selinux-munin-2.20140311-r5.ebuild
new file mode 100644
index 000000000000..10bddc40c6c1
--- /dev/null
+++ b/sec-policy/selinux-munin/selinux-munin-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-munin/selinux-munin-2.20140311-r5.ebuild,v 1.1 2014/08/09 19:34:36 swift Exp $
+EAPI="5"
+
+IUSE=""
+MODS="munin"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for munin"
+
+KEYWORDS="~amd64 ~x86"
+DEPEND="${DEPEND}
+	sec-policy/selinux-apache
+"
+RDEPEND="${DEPEND}"
diff --git a/sec-policy/selinux-mutt/ChangeLog b/sec-policy/selinux-mutt/ChangeLog
index 9e4913a8ca55..5f2cce008256 100644
--- a/sec-policy/selinux-mutt/ChangeLog
+++ b/sec-policy/selinux-mutt/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sec-policy/selinux-mutt
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-mutt/ChangeLog,v 1.48 2014/08/08 18:49:42 swift Exp $
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-mutt/ChangeLog,v 1.49 2014/08/09 19:34:47 swift Exp $
+
+*selinux-mutt-2.20140311-r5 (09 Aug 2014)
+
+  09 Aug 2014; Sven Vermeulen <swift@gentoo.org>
+  +selinux-mutt-2.20140311-r5.ebuild:
+  Bump towards r5 (fixes duplicate context for hiawatha)
 
   08 Aug 2014; Sven Vermeulen <swift@gentoo.org> selinux-mutt-9999.ebuild:
   Make 9999 ebuilds EAPI=5 and transform to make master for version bumps
diff --git a/sec-policy/selinux-mutt/Manifest b/sec-policy/selinux-mutt/Manifest
index daee1cf83136..b82be234208d 100644
--- a/sec-policy/selinux-mutt/Manifest
+++ b/sec-policy/selinux-mutt/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-mutt-2.20140311-r1.ebuild 379 SHA256 7110c35f829fd4737810611219f8e73126f77ed1964583e50af2641cc64f10d7 SHA512 2bf6479c64074df12974d428ce5d430873d1cec4d0a20c855958b14d85647344ba37258d623a4f343a1191311c05931f373e986fdd9726b4795f619b38e5b7e1 WHIRLPOOL 22159ad3ffca123968daf1eb022cb0c886aed5e95ac61198cf62653a9d67ac2f06f16812769aace19f9eed97269d910e52a0ef4657dee444c43a7a6c2444ba36
 EBUILD selinux-mutt-2.20140311-r2.ebuild 379 SHA256 6050b29d84b6f08814370fa7226200d2c0991bc16d190507d8a4180c57a25e76 SHA512 d0b22565b6ed9a604f605bd68b28eb95a983b4cc062eaaa741d32789b3d8ebd5c662c074394855c23cb5a74d14581263f3194d07c3dd9a40c07d352022ee5234 WHIRLPOOL 61a00a16c7d61aed9f0df1130f99b6501d8aad08becfb05c6b7012cbc1f23002963ab158ce71594f02e05b581adf9468d2972b1a4e9b7d05814a075a8ab30497
 EBUILD selinux-mutt-2.20140311-r3.ebuild 379 SHA256 00c89a8065bcce73fed84f1a1a61605387da446f63c15d1784d3cbe466282753 SHA512 c5b3e16c1351d646cebfe6cde2bad675bab7753cecf31a32e8f098685894ac5e590809c268fab8a4d475771ddf26101bb285bd77b4d6b88a8f67b2bb021e4e85 WHIRLPOOL 7d1fe6158d12191144fb56430437132bb45e1bd99099731bdb6b963e064120065ae0230e323e3a4f38b12563d4ef937e71702ffc620c2981e0b9f0b1f015a148
 EBUILD selinux-mutt-2.20140311-r4.ebuild 381 SHA256 b1927eec859b7cfe27373d0033c37892a6b070e8f3fad0896f46678ed057b2a5 SHA512 45efcef2b5fcc07f8ffc5eadccf5c2b7d1f50eee41a8382dfb44484fb0f932fff57ccb20f041a220cb85ea7c62ee5fe68fee5feb77ed5951d908cd27fedc0c29 WHIRLPOOL 46a980f2047dd6c103bb57983c5ecead082552999b4d6f7a6227ee5aca06fea43bc33aec755cd97df12ca30a892e2151010d254885e0594637b0033832f09fa3
+EBUILD selinux-mutt-2.20140311-r5.ebuild 357 SHA256 1c0ee26186a6bcd37a01028c6e45a5109e8938290001b16d041333cecffdb806 SHA512 6a69fd93a8c506800fc845bb9f7f7b7746769e45e3d6179fe069d85c082e4b45ae4d3f2e47f10576c84ac1d898e45c0d0d17b9278982af9bb7e6d9b2fc6220e2 WHIRLPOOL b78cbc6eb5d2ad106372db76fcfaaf2ba40cd9d1fdbf62a053f68066807aa4e33e8ee17d6c05e1a4a4dfda3560a0e0a0f013fe71727ce47a92d863398b2866c8
 EBUILD selinux-mutt-9999.ebuild 337 SHA256 bc0b4e1bdd1e41e23c43468eb63f0f0bc8dc1a09ee7d768a79ae04f0379cc3c8 SHA512 74388edccbeebb7c49308ae154c3fa4f3cd1f713e4a191b4fe827a3534515c618e8d21aadb6281c4ecc8850e237a9e03c3ec0ea3d8c2f2bc109387649fa79ce9 WHIRLPOOL 263a95d4bfaaa84f534baecdb24cdf620055b564cb045aa8a29cf3a2a42763d017a19109de701f66ee96e20c4d24b5f7a8f2b2188490c1298e9928c9115890a2
-MISC ChangeLog 7805 SHA256 b8ff862b03d1989779e626df45d8705759ed7c02588c030eebe446a3b1e51c73 SHA512 42bb04a07125b4f63b46bb70fc63337a7080175a799703d10b8f504efcdd222a251769e16430df44dcc1a467328d4a5aabf129db61d3eebaec8395d87484de9e WHIRLPOOL c3ece595ca423ee2e7c3e848be96a05f6934205eecda0d4a31f7597d7d53633120365b52985a319746ef0b25a8d1f018391e1c02d6da3ba0fef6066642d4dcc1
+MISC ChangeLog 7993 SHA256 44abeec0f7656eed29e8336a2f5cc30f55e5678a1eb64e2f26893eb4ab5a9104 SHA512 7e0df6bf3ead0b529f0362a47a65f02ab3179d1d8cb23fb92685360a3bd7f5183be43d531e6a927c414075d4185a482ab4add44cf7f7251c1268968badd41a8b WHIRLPOOL dbc7b01c56821fc19cade4ec0458d63207bf1a383a2d68b096c271d28c93cf2a343d8a3519fcb919fdf8e532c03601e2e55e6ae7227c5958d93e3471f72508e2
 MISC metadata.xml 228 SHA256 9026d75c32b58c8886945f0f9027479b1c973e6c538a6de2edfc4034ff6d84f8 SHA512 f1e3b7fb79adfe3222038f9cd66352e53d69311e0c17f7c1acf9ad515479c5a2019bc388d279efab3c6a2225a1b11130f540795575293638adeffdb3cfbd97c1 WHIRLPOOL fbb9ba766354a9e61190dba6a9fc1798c006eac0536ddaee82d5bc7d27066547a900f3a7d300aeb532da055ceee31c545997c373f9aae9222e3a76f2fdbbd5d9
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0
 
-iQIcBAEBCAAGBQJT5RyDAAoJEC7dUkA7aK9HVDIP/jzCeJaD89mRD9XXKnxefBOc
-/2mZfOREbS7qwQiflOCcp8gkwdQg8G7m9nZI/WyIpE22X2CgCA6cK22B/5neOO6n
-GsbTzXNfZotb6j8Mc2nK5gxEdzcfxn5Hk7pLL9nqT1Qnv4sIZIKBEcMkhnOOui2G
-2pE6Eq8Uzlkpcc32/rITpgeHBwvVJcIllusjGYbcUUCyqMnNcapWLufYWp6bqFoM
-TgLqic1ipQ1Y4h1W3qDz7E8y3EI3C1J7+xv3DdgdTBvPh6FlnX0gAIrKPXNQsjPS
-tP/GgiZtfj/GbV8QPvQ7paJjw2a/3m0felyNU9jtvANtxjjh4A6vjL8AUopze/cA
-4Spgy16f5bKtU0LjSePVO6K+hhdtssLKZh7je2dwLDvTxoswEV9IJd2VmOeB2ZCj
-cBKY3GALaoAAaxNclBnOuqjBxvyQOx8rFlBk2di+RNVGQv73r8RfPoodcZi9iTZl
-BDGdLslkvPYnUaJ/WzRKU3Jf4U5PUEq4Nm9e950QJsCEnnHgM4AHeAiR2jFwKQCc
-Dm3Ks9CEQd8+s4Ol7mZXwD/1SxelsYhX9/a7GoAa6DZZH45r4Prz+VmDAwzSk3CN
-OW/fcLBXLUFPHqNfi8D20tlf6CxozkZTd7IUxP3EA8wnO3+J1gHFu54G1kV465nv
-GKZVRLRLEby6N8MLYNbH
-=qiMG
+iQIcBAEBCAAGBQJT5nhXAAoJEC7dUkA7aK9H/F8QAIknAl+jzUankB/fxVlrOKJu
+Ls4127U4CjrLjrD9pZSBUAHfXrJwLXS3DFtHC/59T+bOIgBZfIY738SLBmEKDx2h
+Lqipp3MxvbDQTGBx4Tqpll7e6rW+hcdMmtYjUsSOJH5XA9s/0hkeJ+igwiJ08B2+
+Txa38iu0jTr4hFn9TQZcAEcBpvHhHXW64WxCUpvTWOpX86aXxgVhF3HeVLaMXDtR
+0MGPJJDYBzUNBzAurA3Q5fgiSnpTftQEWiZEk3JxZmLddYYCOBk/P9aeFX/FW2fP
+/mOfOvtyrIPmVSz/bh5LqIRx1H9Q+EB3WhQ1pYqFcJ99CzUtmWi8mpXDq/ncGX1T
+npnx++UROaOKkXq+6UT3nrJJ80myew1YXwegedHMTzueEolaNehvMbPl/6Y2WjEd
+J3qsa1in2BrYHcIp9gpQtbqjWUP5nhS2Cm1HSAkvpgSvFUsceQ5HKp/Y38BXhxdE
+nZYrtMAyb5LjX8Nu+AwLkugEXJ22Po960SBm1fGF+tJ1p7reDBsu7yPjfuK2yr3x
+jq6IUv0jwNaO0AiJu7sWUbEZlcpyE6ooc/i7PgSul9lg4y/OWtztSbwj3aaw0sLQ
+zlVJDezuzl7aG3TuiNcUd7r7xn4Q61Qhumw6SQ8WqJ7iv5PRWWki/CpD84INY6t6
+Rn8rFCnbpsKqTe/wQlcE
+=uyMI
 -----END PGP SIGNATURE-----
diff --git a/sec-policy/selinux-mutt/selinux-mutt-2.20140311-r5.ebuild b/sec-policy/selinux-mutt/selinux-mutt-2.20140311-r5.ebuild
new file mode 100644
index 000000000000..b60e1415e171
--- /dev/null
+++ b/sec-policy/selinux-mutt/selinux-mutt-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-mutt/selinux-mutt-2.20140311-r5.ebuild,v 1.1 2014/08/09 19:34:47 swift Exp $
+EAPI="5"
+
+IUSE=""
+MODS="mutt"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for mutt"
+
+KEYWORDS="~amd64 ~x86"
diff --git a/sec-policy/selinux-mysql/ChangeLog b/sec-policy/selinux-mysql/ChangeLog
index 8ab39eaa96db..aa8f857ab8c6 100644
--- a/sec-policy/selinux-mysql/ChangeLog
+++ b/sec-policy/selinux-mysql/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sec-policy/selinux-mysql
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-mysql/ChangeLog,v 1.75 2014/08/08 18:49:35 swift Exp $
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-mysql/ChangeLog,v 1.76 2014/08/09 19:34:35 swift Exp $
+
+*selinux-mysql-2.20140311-r5 (09 Aug 2014)
+
+  09 Aug 2014; Sven Vermeulen <swift@gentoo.org>
+  +selinux-mysql-2.20140311-r5.ebuild:
+  Bump towards r5 (fixes duplicate context for hiawatha)
 
   08 Aug 2014; Sven Vermeulen <swift@gentoo.org> selinux-mysql-9999.ebuild:
   Make 9999 ebuilds EAPI=5 and transform to make master for version bumps
diff --git a/sec-policy/selinux-mysql/Manifest b/sec-policy/selinux-mysql/Manifest
index 76cb3a39e2b6..8b44dc95079d 100644
--- a/sec-policy/selinux-mysql/Manifest
+++ b/sec-policy/selinux-mysql/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-mysql-2.20140311-r1.ebuild 383 SHA256 8290f86e7f0d430598870fcd777a96551f1c6b8f6344de0b38e32d88ad615ee7 SHA512 57bb80053978be6ac88ecaceb97141ca9b59273bf04125413290b5a068091972f82feebdd0af4ee905c34b79dfe2978f54a329a026ae9701538a6bfd42a2e3b3 WHIRLPOOL cfaa5c10b7a933e969edfa088c10d702a71f978eab9f4fdd4be7ba6d1d7c7e3e2a78c8d83755bccef01fae304a2f8757aed9e441d9bbfede8f2cec6ed469dc54
 EBUILD selinux-mysql-2.20140311-r2.ebuild 383 SHA256 4db84538ef80be66189d4b64b8723429785f2b216bf8c12ad6e544cbb9ccbc49 SHA512 c37042e5827fac5c76950ddb42098986f430657e400c7a3cdd46557c0215e36b345649efeabaf99a959ee1789b6e490a69968e4a4b8a7d1fc07b6974aba638f9 WHIRLPOOL e0b88ec921f48cc5ee876b11c81f28d21240ca4cbe8ee8dfb7f6978908b9d7d176dc4fc8cb851a70419ed2f7ab114d0de8d47418bb917f181a6dbcb1e974b2ee
 EBUILD selinux-mysql-2.20140311-r3.ebuild 383 SHA256 5ed53be3fbc62af73b8fb08dc7fb17c7c8f25f97851c5c78dfcee40ab342d5a8 SHA512 ef89ca94632f7dcdf8ced44e49fed114519a6f43157d607afe6fa84d94aad1f479dee96fb75b514f253f8083345c2a84ba6158c94e7fc41b9f69c8e596ee6536 WHIRLPOOL e090e3f83ed576b79283bd925afebb6d4ac9ce0bc2e00fbe5716a8280058cdac3ec83b9b30d0008a5b5320a388f47f6fc3410a071d5470044ddc565422887ce7
 EBUILD selinux-mysql-2.20140311-r4.ebuild 385 SHA256 0dafe68e1e71ee1538d0f8a1331a551dde5dd28448ade2b7c3d9f4f28097e8f8 SHA512 5234b7d0b6010943f60feb5b96a392e360a11e7e3c25f18abe79e1efcc8d3595bb4c92cb2d6925ba7ce203cde459950df8289930c001a2581736f1956d8963a5 WHIRLPOOL 6b76fc8a81ce2ac97c1dc6711288c37b74a2e2d64687f15f9764339e228285d63b363d7e7d5e6c78c9dabde83f8ca5e9f1211c93b7b98c0dcbe86301c0e6dd78
+EBUILD selinux-mysql-2.20140311-r5.ebuild 361 SHA256 86ca4f215bde3bb00e7b989b68d3f8379452209454172247602453c44db4b34e SHA512 b4c2f062f7bf870e9955d062f9585ebd7b46bf8cc432f85b4e79d03df0ff28c712edd800b9aca65d7c20c621954f555aa00835ffc78a48ee6879ec7a42630a55 WHIRLPOOL f85e60afc1d1bc09ddcf47a6cc18aa20c67efdcea25f50921ce4277486b18297ca0311b00eb32d4a4bf87953305094b9df00b3c9f43921b5fa05cef53da8b215
 EBUILD selinux-mysql-9999.ebuild 341 SHA256 424c25911b68cabdc51bc4b43785ce47e5698f988f6bea5818cd880d34f6e0a8 SHA512 dd4b12903ef0f40ad900fb49c88536d8c1309f363b34b506da321722b3dba526c5ff7f532908a00a0f7428b73368018b95451295252a681eba01c8bb72c3ca80 WHIRLPOOL 2d45294b07d29ffd6423d9ae1fec3ae58662ff86606c7a774dab704ff9d0f18f4e7f588954c13f671cd5fd567993c9229d881f6130156145cb2f40417e8cde6c
-MISC ChangeLog 11467 SHA256 3201cc68438896fb3555c9fabcce4a5980f4c5e3e76eb3e244bf747edd9d95ab SHA512 daedef580ce25291ffb9f268876951f0e2991b6320d6b02952251380d3c8d15ed3587d0c08fd5eac465f4f82c13fbfaf39d99922f841dc9a437b02e6e7bda229 WHIRLPOOL a414a4384f38f44c7725a81806758e2f8a1711530c849ebe0f7b78e48173e0c264ea8914e7d24f0192a92a3066dbec269aa95120dfe96b4f29ba101289efb2ff
+MISC ChangeLog 11657 SHA256 574fc256a588d11cee2181e3ed853481ae943ae67fbd4149021c48887a950431 SHA512 f81121bd1e0c724f5e88ca29cb6b9f39cd9d5de1a984e3917a80e3f064a0848c607d08196e18d4d3448007bd8f737f1e46184853e765d62a1f4da597fe0c50bb WHIRLPOOL 6b245e4bf42b479f342b683ee865c38bec5ead0aab4c125324a7bbf15b3b3d613bc885922e31a4c96e90aadd5174dc9bcb46b1916ad1b0ee45d98b8816cd63d0
 MISC metadata.xml 229 SHA256 63c90fb389e4e69c858a4b4a30c8246e571e01e5cd05faa6609e494035abc653 SHA512 1e9d654d12310a85f2921e7a92a8fdef094fd041155c7d6af7139fded7a2373558a17cd78bf7534a778c626b8a10b25cd8bdc76670ef7c90f3ecdd7339e540bb WHIRLPOOL aa50b4a56eb08595d4b6b81951b288ee80c352d52d021303402039706571ab1f5785adac9d564ae10bdc305a5600f4bc0adb0d59718ed03eb47901b951812a78
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0
 
-iQIcBAEBCAAGBQJT5RyDAAoJEC7dUkA7aK9Hx1AP/3dekzCwtGILOVHbvMiGLsJR
-2c1bH7yKVy4yvB48fHG1ct54Twem6LanDEozi9f/s0zjaLj3l94nPrWfgNyUFrLa
-v98QFpBiuXiy9FK77+HI3tCz4aOVHmTECyOOXRQt+rYdBDeCIn0zcvlv3YGPTuIF
-O3WK8kxPxewUJthVfHHKvEYreTzq9lPSWhoF+weCKYSNhf3AxjJ6ZwnQ403pFZ3/
-4uEs0Ad6QQOXaNJUwpXAjblRqVnwyLa99uot74S5+CeK5UlKwUok7wAi8ksO0vvW
-JzyBn6YHKHBLtdlYL3Aai1piFM5n79wtLvNDpTa0MTaYAmPIDaK5vd2UyeKHk4dW
-ky3OLgmya3ismOk3IbvYHu9/XyTgw+rNHVWOh4Q97QsgN+WJ9p3zVnzzC57DiT/r
-jAfV94RS76MVTF5LWYKBw6cq0W1ZiFghMT9IHlO+D4+ETZdIP9m0YQS+e3D10r6u
-BgfpdWdK2nS6t9iZnwBBWSi/uFx6oumIXAdnE7T2fatX84axLOdFs5XNrtrSD8VZ
-BXfFm7ud/qbPTXViIf6v7fNJS94IRXsvBRuKYWXxTn0GZxVEm819XHP1sekSEyzo
-yHiF8RI9e0X9P3qy2/0t5slDWz/UCz4PraQOFjLX8GSYr1tktzYtqrQM513BlSC3
-HdnXFDxVOMlTn0K2an+0
-=4uYI
+iQIcBAEBCAAGBQJT5nhXAAoJEC7dUkA7aK9H6mQP/jAYG2VcXOVJpCKy6OtD4noh
+MgW2uA7OSvWTXARhCHXN15BiWJ0LI6+MwYY1QQjx2CWPAXRenz1I12sEjxHJuqlH
+noBCozDcbLufwBd/Sq6UnaJ8jYLz91jovz6DMDo85dhrdpszY3e3FzFOCV7ZmELk
+OYoD6YgnVX0M06EAgu4yCuf5QeD5wBnXohXnxz1AqDGWiZx31WdaafXBIE9jZeV8
+TN58mj6LPtRl4BP8AfpaWCz/WSLacYsGNONdHlfQ/NHUlymmvUeWY4nBrJGI5BsK
+Fj4P00TtwI8lUmWcVaIIgmsxFcNOkY3NMTC+VM375aANv6NbdgFxeYc5qylCNnF3
+tyeKo/Zb1wnEY83Eq3Ua9bnY5IjizhNHas17aNST1fcENCZfqvbnYGQyjL1gkbmf
+dT9sd2Zby7LEC7xUabQ/6IMcGJqM7wM7pvu5bKkgcnvD7fWRbGpGUzqszxHnivTT
+H8+fg5NJti4gUnD+gh4suHavNm+c5AL6ILNnlPxvGwMwSmYlfLdMQ8ss9STJzSCF
+yo7tWgWTVuBU6PFqmnqB5EUmH0vzeqladMp9a9We4wqkwu8gh9FlkCY+5Hfqrbkq
+zG9LCDMD54nJ95Rwt6pvoW3LsxwcPlsmp7Qr3rhDwk5hH+dN4trm1AGGQIzNmWbH
+76bh/+z842JUiq3LT4ut
+=qYtW
 -----END PGP SIGNATURE-----
diff --git a/sec-policy/selinux-mysql/selinux-mysql-2.20140311-r5.ebuild b/sec-policy/selinux-mysql/selinux-mysql-2.20140311-r5.ebuild
new file mode 100644
index 000000000000..91f945ed9859
--- /dev/null
+++ b/sec-policy/selinux-mysql/selinux-mysql-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-mysql/selinux-mysql-2.20140311-r5.ebuild,v 1.1 2014/08/09 19:34:35 swift Exp $
+EAPI="5"
+
+IUSE=""
+MODS="mysql"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for mysql"
+
+KEYWORDS="~amd64 ~x86"
diff --git a/sec-policy/selinux-nagios/ChangeLog b/sec-policy/selinux-nagios/ChangeLog
index 1f3dbf0b7f07..2a3f1e011e1e 100644
--- a/sec-policy/selinux-nagios/ChangeLog
+++ b/sec-policy/selinux-nagios/ChangeLog
@@ -1,6 +1,12 @@
 # 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.46 2014/08/08 18:49:46 swift Exp $
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-nagios/ChangeLog,v 1.47 2014/08/09 19:34:11 swift Exp $
+
+*selinux-nagios-2.20140311-r5 (09 Aug 2014)
+
+  09 Aug 2014; Sven Vermeulen <swift@gentoo.org>
+  +selinux-nagios-2.20140311-r5.ebuild:
+  Bump towards r5 (fixes duplicate context for hiawatha)
 
   08 Aug 2014; Sven Vermeulen <swift@gentoo.org> selinux-nagios-9999.ebuild:
   Make 9999 ebuilds EAPI=5 and transform to make master for version bumps
diff --git a/sec-policy/selinux-nagios/Manifest b/sec-policy/selinux-nagios/Manifest
index 900da6b82950..931ea7700afd 100644
--- a/sec-policy/selinux-nagios/Manifest
+++ b/sec-policy/selinux-nagios/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-nagios-2.20140311-r1.ebuild 454 SHA256 1068a9ecf8e644b95c0995e6f319fc4bea3ca680ab6b8c05f3cc955fe501e47e SHA512 528bd209b0c90e6ba6431e8d05f2bb4c557f377dc1275e71a2d52724c02e5d5bec0eeeb7428d90407e2c3d4ed0d9842243d245293563d829951432992d269e04 WHIRLPOOL 75e6604b0615764f40dd48a3f89873a5775f2953d807e9314a3e4ef011df7d7d430e16c3bcac36c4972a7c01c4c6292fe2250a6349f97718484e7b488f198ae6
 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-9999.ebuild 412 SHA256 ac701fbe13983e32ba4522faa1f84c147b91b6dbc814c00c01f7bbbe2dc1e3e3 SHA512 3a3bca90ff53c0ff760eeb9c2624e8a9b9237ed6ad7bfca362237159c83e118b530ad39c370cc138bcb9fbebf9fbfd55d7a7ee22bcc1986de2b5535e9d8e8bdf WHIRLPOOL 2b864001695842b609bafbd9260bd0cf2c61b32c476e76bec2a04c5e75e084a361efc6fa18603cf32e8f9cfa6ef7ec2684c46df064e343c4a7a9867429ceee78
-MISC ChangeLog 7151 SHA256 ed15839b5e9abdde45d594fed424996ae0d7520ffd581dcd8606c4b45359f19f SHA512 10a08dd20a23a641de7f52c5939399321396ba0d1f4660a8aa0fb6da2d551370d08286934568c1882c355dba2d02ae008a676661bc9efde82b397c82873e4d73 WHIRLPOOL 498ed5392a8b6f53bed662edc52f60fcaf7a91b9aa3d0d32f04e4a330cf5d52c99e8a89d7178e05a2a5bf9029cdf8df5ea906458d9869a8fd712cb048cf85f77
+MISC ChangeLog 7343 SHA256 b941467833d485b7828ad8bf1a4ab966c64cb2083f2d5b858bef4bb72cd6ef85 SHA512 3ef73ece8903d65af52afa16d19a8e398e751ac9789071dc92cb58d18586492cc15a15e9ba1b6c4c61628b7e56059a7fecf69ef670669626c2c1d80f1c7f694c WHIRLPOOL 7b0eebba8b88015acc215f9e2486ac751abe892267e11b7c7980b8f991face44ff2c96e751e037a1f51b028d438d102837046d064c3af9c70df81801f10cc558
 MISC metadata.xml 230 SHA256 4b2780b5258cf4a9bf47d433f6e923644c503d89d1cc15ea6bea154a9bcd7723 SHA512 9c7a08f69c5f630a8115c4618f9d29b2c7325b8f58543b29bace84443a01ca25b34dcb863d8856fb4571dd79d690dabcdb50a0c08ae5f0511e9895043b300d68 WHIRLPOOL 4ce4fc473a3d12f082713389ecf12cb0106d90201b978f8060a56121ed18d521679b39f45b44c1a708263b27eba01ba86a6808f039a1b81f2f10f1055488e6a6
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0
 
-iQIcBAEBCAAGBQJT5RyDAAoJEC7dUkA7aK9HIGAQAJ9l4A/M+qo66y8Ygnbf2FW/
-uutC5hDM8fMAH8vSFhSjzMrAtFAoGqfpWQGlE6pVbxJNUu4NzqnM86tYvRcJMSI/
-3WiiaTv/F5Z+z/ucHc6W8qxduY0kGRr47DtbYaglPfsM6rhNuMvncwayrDnlgjR1
-TGLMAuWgSfdLSYtXOmVXOrJv1M00tHLyq+YNPe1JyvlSv7RgPiNDOK5DivRUkOLC
-Pe81fpZwEnWWH10AmI/TdVsxPj0w8kzgP6r4+mh6U33w/hjYQ3ywtxrHbviucjDl
-hwg8gU/1sgvjQsRcoFxvquKWrALjoTSv0fvNL3et3xKahVfjsFOm6jHgJtKU85N/
-rs6AwofZ5CyPEKFqhl8yLwjPQ3zPtYb/HdImHoAcQRxe8mlee5jNPcK+T5dcVwn6
-Umgh9OLOJUCT//5v2uVJXZy5xYVXqn6uVjSXnfAFJQY7KFYloHIsumMLhrvehgv2
-GmMlYJDotlymIAomCxkBWuB8H7c3dj5ujkNYLA6ORWTboPVapz/tYYbnjgLTQ2y1
-K4i7EMxp2dfUxYBsicsgk7RQMsAW7W6jel831OCfNTLBta0l6mjunes0D2XNdeaw
-TuoMP3Cja/vCJweJG5abnUEHGQIjF6jMwFcefq5QadCMbrl3GBnIJThGVRiKuh9I
-JNSgb1o97s3xt6FoHCSj
-=HcQl
+iQIcBAEBCAAGBQJT5nhXAAoJEC7dUkA7aK9HlBgP/1AqMS/+uUZZF60BrRrX4hhi
+8O23PvMEVQq0fnS/HYTbOUqJYlDAXOTCS/GN2uqWKHh07r1Ft3zuPH/wZW1oBj++
+wjftJbYUybNMadSlABa6UESskPtbbAbsTc234DCN5qOCZcwZlAvt9L/Zh5ajXoaZ
+I6JtFVJQ4FkPeOp+rABo1eXlQS9yL3Q3dzebT27OJp1H3L5MA8GxXC6xO6C1udE2
+gJGZaStHviyAwE2JWzzDFe7XXBFQP0KfkxjYc+ERq0I2IUJG0L+2LWtOidgwcfAj
+LA8NME19ymGRGoPMULq+45L9w5qMgkNPuI94iZlhzbHUDce9NVIiMOyjGQ4aXMov
+nlkNtVURqGp9Cw6wu053VKNAsyUXJVx7CZCIdOdcbcWXZUTXwj2/KwZF6BISmdyA
+ea4BII+kohBg6Y1okEzElzi43qq3WhgLXp4PCAh2T1dlXWtgrzJySNABevy8G+n+
+7Y3Eh1MAsfHGQf8CMbNJhr2idwc+vjqhGXWNmvi1YUIybvx+LDN17Wquf26zibMl
+gapvlMJYD6cxvKUZSM09J0zk2vpZLGcclcOLffdRYwWszkmDqxGm4isHMYzGpgtX
+z3KBPHvQvu1f0sHJpA6mQYPc2Su58KcGRAc7Po01VOiyFtuGAaOEVbCLvu87sBs7
+sEuV7DGi6I3ZInMHTIiL
+=LBvq
 -----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
new file mode 100644
index 000000000000..63aaf2a5e06e
--- /dev/null
+++ b/sec-policy/selinux-nagios/selinux-nagios-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-nagios/selinux-nagios-2.20140311-r5.ebuild,v 1.1 2014/08/09 19:34:11 swift Exp $
+EAPI="5"
+
+IUSE=""
+MODS="nagios"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for nagios"
+
+KEYWORDS="~amd64 ~x86"
+DEPEND="${DEPEND}
+	sec-policy/selinux-apache
+"
+RDEPEND="${DEPEND}"
diff --git a/sec-policy/selinux-ncftool/ChangeLog b/sec-policy/selinux-ncftool/ChangeLog
index cb71e4a8cd6c..266d1c28ea39 100644
--- a/sec-policy/selinux-ncftool/ChangeLog
+++ b/sec-policy/selinux-ncftool/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sec-policy/selinux-ncftool
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-ncftool/ChangeLog,v 1.40 2014/08/08 18:50:02 swift Exp $
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-ncftool/ChangeLog,v 1.41 2014/08/09 19:34:46 swift Exp $
+
+*selinux-ncftool-2.20140311-r5 (09 Aug 2014)
+
+  09 Aug 2014; Sven Vermeulen <swift@gentoo.org>
+  +selinux-ncftool-2.20140311-r5.ebuild:
+  Bump towards r5 (fixes duplicate context for hiawatha)
 
   08 Aug 2014; Sven Vermeulen <swift@gentoo.org> selinux-ncftool-9999.ebuild:
   Make 9999 ebuilds EAPI=5 and transform to make master for version bumps
diff --git a/sec-policy/selinux-ncftool/Manifest b/sec-policy/selinux-ncftool/Manifest
index 03e93d9a7741..6d7bf0b70379 100644
--- a/sec-policy/selinux-ncftool/Manifest
+++ b/sec-policy/selinux-ncftool/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-ncftool-2.20140311-r1.ebuild 391 SHA256 9457f3d325bc134d6431fb058ebbadfe44f85dad5b5db5ed926f13347e9d3339 SHA512 5b353e665bf6587c8aa5bf4340e996ef72987d1a6ac64a5046e81c60a0587b5f0bd013c384ce411a50624606ebf2f74622e181a63481537aedfbcaa006ffe3ed WHIRLPOOL 3c920278e82adb77389d27f038b5fc768e6303086cdeda8fab8ced25d53747aced76cb9457873169686d1b89ba3daaebd9dcaab83c4c2a82e8e62fb494dd8e8a
 EBUILD selinux-ncftool-2.20140311-r2.ebuild 391 SHA256 37fa2536a4f7a043f2b969686147f20f4f8fea36849ab77de127959f3b7e34e9 SHA512 24f9df86809ed2c8dc2534206f06437df8566644565a0e60c9ad48156f6e55f9f3a045a6a812ef8270d88f59c86200967ac01f2aeffeb2c239bd5a10df54908f WHIRLPOOL 5595dc6ebb9ca6dc0f7c4e289384ec8cc0ed295fb5fdc2207654253183077cb7b3b1bbefec08295fd1fed264d9e9b9287a4ba647fa1354ac0f4b43b91276b65c
 EBUILD selinux-ncftool-2.20140311-r3.ebuild 391 SHA256 57224abbe4cd69e82ee18207128a134f7c21fcee317af5d0e9be1e08fdd159ec SHA512 ea93b3e306f0817d3a18bc967d6600b6a7724538fed0a387d87b953d30dff1852e670671f5b33df66f5384f1cc121401149ffb5cddca58fcdfa6bcadbb1eee24 WHIRLPOOL 7189e469207247505b275388b41682fdb527cf9f5dbe539ea75df30b1de5c213d513b8cd15c2ecd58b1cdd499451e65cee12e2ad227084c6148e7fd09a022138
 EBUILD selinux-ncftool-2.20140311-r4.ebuild 393 SHA256 19094bcb2844083e63445e7bcd2786680aacbacccdc41a9ae5616b3c405a2f59 SHA512 d7f681aa05e378b8744910e3d810ad5f95bf652838210ef864dd465d91d1aa30ea046e9dadab0c8c9dd2d65351527a31e93daa84a3b8a7c3696b2db7aa6d3466 WHIRLPOOL cf3ed045a08f498c47040e67e5700e448e68db5e5c3fc7fa0aee54258a104ffd42ef03f2c4278c1eea2bb63384de49252b8e9224e39423bcbd9d035836c491f4
+EBUILD selinux-ncftool-2.20140311-r5.ebuild 369 SHA256 63af1ae41e4106dbeaff077e281d048947a156fc715e06fcf23c4d24e4c8913f SHA512 6dd435c88d88f31a974b2d3079794c5d899b08c284fb427d0d79424d96e6bece9208d89ffbb340e3f42a13ced223f228692a54916e4ea6aa6a872f4024bc6bab WHIRLPOOL 58c668c6bf9ff12e2d08ceffbaa757624923c763d33dd57763bf9596766af4b6e2a3e8e6c57ac4907947ed64609de45390790169151b2360df7e7f41f7cbcd49
 EBUILD selinux-ncftool-9999.ebuild 349 SHA256 307eb5def930ed7555870266e1406c0b1688307cea392c14ffeae4cfc46a6b1a SHA512 235254cfaff85e9e59a71b72ba3a2040377edae0772c4c53fe520c0d61495434e75d0b52c2aaeb2f62cc726a60e23262d9fe03b7391776a8fed681d5c0acd580 WHIRLPOOL cc286c218d7f9f47df7d1ed89b19bd4e3e01670fd96b42d4038b6223ff6a9ceea507b8b22066313859101f16605f6837dad87b5fad45ed40270cd986bc623d59
-MISC ChangeLog 6321 SHA256 c258510569933fcd31471c36531926a5db3faf8a49795336409455b073bb80f9 SHA512 aea842728ad3e55750d19c9fc9307f3d7c6bb0832263d02d64e84fd6a9fdab14198e2ddc17fecc1387ef2ac816b601960d6456ba05879d0b32b85795bb83c90f WHIRLPOOL 9edf854f0df40e16d9f2cb69378f5afc10d32259d69351632b772d62352759adaedc01ec22a34df6f596042a7915d55de06ce9e1faa9d308cf302de6f671b8db
+MISC ChangeLog 6515 SHA256 5d09f7fcad3168e5af357d5d8e40dfdb58965bded012de14c7528b4afaec51fc SHA512 c6cf9e17c5bad3cc5ef6ade21fd906886fcd7dc6a2d1d72de3b20a91b46895a1c114b91f08400bbca890a47d9bf36945dadbc8086b611f09f52fe80e00920bff WHIRLPOOL 0acbcc5eb598dd1868bcd6ebe555f0ef33820e8d6dcde44f6ee38f79b22e5543604094c6b1a03f259b8c5d8ae4490fec10f74505fa468a13646002eddec2e13c
 MISC metadata.xml 231 SHA256 cfa363d2242946ded4d1cf907871a8e358a0c3917b49536e1cf47eb82fe874dd SHA512 3ad9ba5ec3dc4407d15480dc977f85bcd57af491c73c40f698357feb374ed38f1c9655adc16cb42d38a182a80dc067864755f8bb5806dd9bf71cedb095c8f478 WHIRLPOOL 9c303668087acfa6e9a6c01423dee2b70ac8bf0df0253c1996a7b6ce1ad996f035005aae6c6da218489440af340bc2b727bc9f7d9e4b3e6cadbdf14f2a0390af
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0
 
-iQIcBAEBCAAGBQJT5RyEAAoJEC7dUkA7aK9HmDkQAJQWXr8kAcZZTUT+tgPd3+Fe
-hzDuBPeGlth2sRJ9B0wXvWuoNa8+bEd3vcPRgTjJ5lxXYK6AClBgoZb2YYOEvKQG
-hRrzfHvp8EljGCtaL1uqcISRlR6Cchol8lSTiGaaf92BteRffaMbjWxWuaA5J+4d
-Dw2dAzXwKANb2vlKgjdeoBgl0AtneJF0ULHnWLvLxrlQg7LRmAYZZp0pf6nFxzCf
-2zN9vIpBD8P2dcglBmQqWgobpjDMA0LgxiVndlolluwcEDE7lW7o1QOt9gxkI/+u
-CPwNKXe153OrmJjrrfkn4PaUC7d4nR32SJGTjNDKvbxrc04Pt3QwVN8JCZqPvu/q
-QcpQfX7IKvuNaPIffyLTyNcXvD+5+YblCzaNVh+Foa/v2I7Nw8qFzY6IX3ZByk7V
-Z6yKKfkO9WxuyIVx1DpwblpAil2YTd5cNHcYEIqvqwe9Xm6vBRLJ4YxtTk5PfUcY
-g7GzlA3qRZBebXl/YkpGrf//6HlROOKl+ZZwu+5o6AiFFKZndQGrcYP/pB7OrLq8
-Se61dNHxQvVHDXJZIkp61/hdc0SYgZKywGPT+iFAFwHYoefOY1IQq2MXLHxXBVKE
-z30vJKBhpvz3YlPpX7ikq4tZOCoagmmLUStfpxW0g6QsIMd1aAyTCM+QE25+nezy
-tTTGxYDKZbxdzp2MOQHd
-=a1TU
+iQIcBAEBCAAGBQJT5nhYAAoJEC7dUkA7aK9Hb9gP/0XVwZ//R8akcr2cM320OJi2
+M25c0g2WEmSJTRz8S26YywiATntTO7TQsn++h/T0VYGSmZm7DqK37Lj3rIgdM32j
+zz3uoP3kixUV0TQ4GtOSrn7mHnDI+5oR9T6rkC+GeVjxZGAwjQU47BBhu9ZImRMy
+1KqTXccR58SJjy/zsHPtdtjmqQqTTW2FwPrQOwz0b8YmW7AhzspGmimCDwP7OEKh
+SyUAaZ3k8jXMUg+twE6wb6xe99NLSD0WR37/SGxzBAhys/2kpkRR+2wu1eoI56pU
+XANO0U9V12YR9LUWhEgGcV/SC3WosNMrLTjOXvPzp7E493RlLS/0xhnZLpwBtFHM
+zLQyeR6p2rHWaMcRpKJxn5CBtVi2opGVxUSTe5hSY3e+GU6e8xGFz6MYu6roUVkA
+POQ2bFULNeEQEP4gPS/1bdLVPo4fiLR7rXlRmb/xtv26G/v70Wk4Kp3ZvgzU0Zb+
+pGD0VrnNl0L4sYbDbO6nIDA0RgV377IKl8bCmprM1N3jP25m9XODUhp2lnHVQqi+
+DTqOONc8UXQh1DHIp6Wup9UgjQlQjZAPCOqsq3CTqYeDKZKG4DUynE16a+YqLvH2
+SP6A9LJ1XE9FnoLgqHxAd4SAGN40sVG8ms075TGIbjmXQb23wOCjBPEQxuinNFSy
+jq4bQIF7ql7JJcD0ZOm8
+=eJUn
 -----END PGP SIGNATURE-----
diff --git a/sec-policy/selinux-ncftool/selinux-ncftool-2.20140311-r5.ebuild b/sec-policy/selinux-ncftool/selinux-ncftool-2.20140311-r5.ebuild
new file mode 100644
index 000000000000..9eeb82cce7a1
--- /dev/null
+++ b/sec-policy/selinux-ncftool/selinux-ncftool-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-ncftool/selinux-ncftool-2.20140311-r5.ebuild,v 1.1 2014/08/09 19:34:46 swift Exp $
+EAPI="5"
+
+IUSE=""
+MODS="ncftool"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for ncftool"
+
+KEYWORDS="~amd64 ~x86"
diff --git a/sec-policy/selinux-nessus/ChangeLog b/sec-policy/selinux-nessus/ChangeLog
index baf746d234d8..6965531c4441 100644
--- a/sec-policy/selinux-nessus/ChangeLog
+++ b/sec-policy/selinux-nessus/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sec-policy/selinux-nessus
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-nessus/ChangeLog,v 1.43 2014/08/08 18:49:49 swift Exp $
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-nessus/ChangeLog,v 1.44 2014/08/09 19:34:11 swift Exp $
+
+*selinux-nessus-2.20140311-r5 (09 Aug 2014)
+
+  09 Aug 2014; Sven Vermeulen <swift@gentoo.org>
+  +selinux-nessus-2.20140311-r5.ebuild:
+  Bump towards r5 (fixes duplicate context for hiawatha)
 
   08 Aug 2014; Sven Vermeulen <swift@gentoo.org> selinux-nessus-9999.ebuild:
   Make 9999 ebuilds EAPI=5 and transform to make master for version bumps
diff --git a/sec-policy/selinux-nessus/Manifest b/sec-policy/selinux-nessus/Manifest
index b59845d03d1f..8e262521b4db 100644
--- a/sec-policy/selinux-nessus/Manifest
+++ b/sec-policy/selinux-nessus/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-nessus-2.20140311-r1.ebuild 387 SHA256 e14b244d7b27fb204680ad3f46aab4cb36ea4a8f847f6236a584420c3f7160ab SHA512 1fdc00ea2bc9c1047730aeb836bb0f58563e1c0113649c3369ce3c301b51abe38ae5b40dfb79d6d2f5b8fe10bcf6afb8c552a4b985d226bcb419dce1dc46feca WHIRLPOOL 1910f938154746e302520e87d3b6699626f6a62902af262ca6661c476d200248780034be98b6c857f5edece846d6db9eced7f9be5412531c28cddc4589c779a0
 EBUILD selinux-nessus-2.20140311-r2.ebuild 387 SHA256 d910f7b47526919abd7fd034819954c010f907621320b042ed6c1145485d6772 SHA512 dd7b943d7720fc428549ba5497e1db7e95ab3669d0f692dd0a507e60c74ca3f5e0ea024b0d07c57fc408619d462b9373334262275a63c76a9e604547288ca5db WHIRLPOOL a175ee769ba052a0bcdf9dda4fd88a9551edbe635ececaa37052587a68adc8599d1ed591b67287057de430d16e6d69600fa0ee85070b38c284b03a3e310064ed
 EBUILD selinux-nessus-2.20140311-r3.ebuild 387 SHA256 d82643d6da4732c95bff0968bfbe34c4174f37b858885f12cc6c51d71cfd642d SHA512 3eec71b895304d76db0ecdbd511eb3f87b1e68c289791e710a6acef4f1ccbe75a1554c1628c877ff7fbdeecb27c66a6d9915f0640fa0da92d62e8990709600ab WHIRLPOOL 8229454802384ce802c007664e402b82c3fe25d73056a7b560236d989eeb5d9e41f035981e65c8001b00334350e4d9b1768ac1115e34f04f1e39d0d1c59f92d5
 EBUILD selinux-nessus-2.20140311-r4.ebuild 389 SHA256 5aa10e8516d9d8761e3423a8df99f4f0c900fad2fbe61b27da16c89ab24f5f7f SHA512 73d4e766a2b57ab35b6f5019004a44ea2168e7df3d564bfb72d37efceac26347df8b5704c8129f59cbae46b474b93f7ec8bfd6314163073357112f1493dde442 WHIRLPOOL b8fd22deebd801ed6236cc96b6c8bb177c7c3e559ac8ae40ce28a632d7b58a1599ff8b18d40140a22ba821971c92a0cdd1ee768390c20445690f904e00798882
+EBUILD selinux-nessus-2.20140311-r5.ebuild 365 SHA256 abd0233e5ce41c7edd83f923a18a53c545c00ffb05fe7cfd01c57cf2c3d8a3ea SHA512 6a08ed70f4db98295035ccc5c6c5f2c456964a084aba584126172975de5cb7ca450768bf82cd2ebf842db2c897e16707b650b731aa168e615ceccf91d8aafa16 WHIRLPOOL 067c178956758aa63224971b9d409f3b82f0f949796dc96a69951af670c1c2edf2c4a62a4f502fa77ed85fd13f722ff13b746d5c3ba62c070732d119aa96067f
 EBUILD selinux-nessus-9999.ebuild 345 SHA256 07af4f7646a70bcb7393d8cfa0a5348c21e617484ce8c7d480178e512c997d2c SHA512 f41bb582fb7cdb8e70b539f623d31b327d201fe8016f704ad784f2d968a42b79fd0abb8b35baabd38607a68de95f25508fac1ea0f59627337b167a3b3c7f373f WHIRLPOOL 35e9cf3d055d2ef56819cd8a76ffe72a4542966317c3e3e3ec99cd1d9f7c99d747d7b3fb2d2f9482702ae00e7f1a0ceb92be178f27fd20c178ceb2653fda91d3
-MISC ChangeLog 6702 SHA256 9ff94ecf292bd9bbe48594c694c273f2b7f1809ec28a9f0f422ada45b476a058 SHA512 4b744e23f8c088b8fbd4fd9f33ef5cc0038e01b18091ef48ba23be25f2f6662743d923e479df10a6cd98dcbc40e4e9cc79215a8f95ef70f533aece414a60778a WHIRLPOOL 6bbc20dca4c894461a6c11a33d8188f2759f4da800cc00a50d6d873d7458bbb3d7f9d4185c4433aa0c793027ae2f4ebd0e2aa1caa62f9d2229103d6a4e451eca
+MISC ChangeLog 6894 SHA256 d9d1ad77a119fba9af05262eff4c092ea81a8204cb5d2c2f2181d39a3bcda21d SHA512 ee683e9080e4fe64eaf94022f8d8bc8ca63faf82c583924cc86f30371f6a0f0c3822c8d00f9e4f7651904f697a5991a8b5cba4f03d6b5674483c411cc2c7f4f9 WHIRLPOOL 29dc6d149daac0aa982953aecebc23a8c668b0c53b700e468c8bfc9eebdd6e0e2d3cb28bdb067815acc3c8ff88a4e93ac8cac78d7de4cff8aa06e583d16e255e
 MISC metadata.xml 230 SHA256 d336d14d36d636b37abeb2d17d46d238281b03350f90f93811b14a3d037e4cce SHA512 b23f3ed529e0a97f96001ff14062896cc2f85ad5dec8e24e5b69fa7493c8649de993a62a1ad52a600efc6a6b083e2ceff525104315862bf9517d749e5c752c11 WHIRLPOOL e15bb25d9c6ca9ddd8f63bca19a16251d2a3cb86267d6983e2d049a259b71f40f1e6b743eecadcc6212b8baadd2cf93a9d9e84116c6230cf8cdf8ebbc018d80e
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0
 
-iQIcBAEBCAAGBQJT5RyEAAoJEC7dUkA7aK9HnLYP/2+yr8gk1t3wpSpL2YfYHL5j
-Gvp4nixEs+BGwM2f/ycguIQaWx8YZP7PjS6TccWqeGKuGk2tfyqDq6neAQSLQrDD
-kK4fe1JgsB/bKML4CfW41T+Ii/nPVabPnQoKFNvICq0jkiS9srFnbEiBJSvUjI49
-QZIZKowSgMw5d6CssiomP3QYWyGUAK7WxlocjehgktKAOMbKBsR6hYLj3nk11qTN
-9Gx6MoM/zx83W2XL7aFP6388UnLBsenzY+q8cxPNEQof8lYQwFcmIUe4yG2eB/An
-UzWRkRc98HzVj/nkuluhu+QoEdmgNzvJPNUpdPzLWl2jKHrXIEwtHBFhBJ80GxgS
-gJODdr3DHkTOFFnXfkB11505LkSn2XPQfrOfevvdU7e8Br/1h9Sgac6idfzztjYt
-yh+GL0ArOA+89a3J+rzBcnjXBT+URt/ROI/gg4IqmVqrXTaq88SXQiVUPRRxm+eR
-YFTZ/pluqzV+K/bDZzBh4AK3oCKMNcAyULT/kndF/L+7GvOD3u+VMfo/vsq6hMZq
-NqQ0haztrYF1nHl9r0q+WxCMLhQYpJF1y96riADg0/Sg9hNC9arc7hBhxtXFTg1B
-lJcbvp+TQ4fysT3U4MwjgYgTMBqakJh2eGbmxfBEXE7k1iaax2IWv0IvjTPtqzlO
-a86g5y5EXynTpgpdiObc
-=K3z3
+iQIcBAEBCAAGBQJT5nhYAAoJEC7dUkA7aK9HLfIP/iXc9Wo64N1uPn7c3lid74Fs
+3oVCwB8QMcwMXDdtSLZkxKg6mWvo8OPImmlO5K/4GKzRSeeHsO3xw+75LiHhyLRy
+cZEfnP7UKZTyVWl0TMs19PyfHeMixaYSMSq8Y7DuTJ3XUQRYFWg2rwrvXKjkEcA0
+Bdy3cutoV7wA7xEsE3lrKYWLBwjn6lvLcgUhGo4evnijzEFvoy6lWgXrk3awCCTy
+PX8vtYX5cRFTmoCUaDZoWFUbHvwndqWgclX5VjGASwVniXb0m7EH6Ye8un8ymPOH
+Gs/zwQ+jNDfRbWTFoo5Zd9pxEL0T89De9AqtjaN3VuJBVY+hGo3PNXH2aOmEOjBd
+nKmYwe3hHomP43+cYyH37DoMd5s/BOgXSmBMku6FMD4mz0NV4Q50gjp6VQCjZ8Lk
+jBx0MuEYpKhfQPMhsz68dEXOexWFwJ4D+KBQhmj6+82RkHiLL4wkSrb6Lf8YNh6Z
+7wb3EPWSVs2b/dkKpgHwT3mbezY5mSy/AdyPV0PZiOz6fPb4S6rK+LyKFkW/DMh2
+DG+mosZjY144FUrstpcaW+QULTfv/qadnucmRevVKcIdz18TrFC59YB1Ba8n+7Rp
+HUx8Btdi/dcmVGxF7zxbmkTzIwR5HwtP/DTb4SEi0JrUSCCER/G0ood1/n9Tacsr
+/zsE/rGQnWOo75zNzbSo
+=TwDG
 -----END PGP SIGNATURE-----
diff --git a/sec-policy/selinux-nessus/selinux-nessus-2.20140311-r5.ebuild b/sec-policy/selinux-nessus/selinux-nessus-2.20140311-r5.ebuild
new file mode 100644
index 000000000000..420a4e193c75
--- /dev/null
+++ b/sec-policy/selinux-nessus/selinux-nessus-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-nessus/selinux-nessus-2.20140311-r5.ebuild,v 1.1 2014/08/09 19:34:11 swift Exp $
+EAPI="5"
+
+IUSE=""
+MODS="nessus"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for nessus"
+
+KEYWORDS="~amd64 ~x86"
diff --git a/sec-policy/selinux-networkmanager/ChangeLog b/sec-policy/selinux-networkmanager/ChangeLog
index 5bc5942964ed..2640d53bded5 100644
--- a/sec-policy/selinux-networkmanager/ChangeLog
+++ b/sec-policy/selinux-networkmanager/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sec-policy/selinux-networkmanager
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-networkmanager/ChangeLog,v 1.47 2014/08/08 18:49:26 swift Exp $
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-networkmanager/ChangeLog,v 1.48 2014/08/09 19:34:18 swift Exp $
+
+*selinux-networkmanager-2.20140311-r5 (09 Aug 2014)
+
+  09 Aug 2014; Sven Vermeulen <swift@gentoo.org>
+  +selinux-networkmanager-2.20140311-r5.ebuild:
+  Bump towards r5 (fixes duplicate context for hiawatha)
 
   08 Aug 2014; Sven Vermeulen <swift@gentoo.org>
   selinux-networkmanager-9999.ebuild:
diff --git a/sec-policy/selinux-networkmanager/Manifest b/sec-policy/selinux-networkmanager/Manifest
index 2d61f4a6956f..d739d96239c1 100644
--- a/sec-policy/selinux-networkmanager/Manifest
+++ b/sec-policy/selinux-networkmanager/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-networkmanager-2.20140311-r1.ebuild 419 SHA256 882f930132b45c4b8e90ce75abdacf75915c604d2002fac969c87db82fd9cdde SHA512 593358850b8add114cca8cc36bd9b540f73ac64fe4806b1eb5f1485e5ccd4c81003e3c0f8f34c0c2fbaec573b34fc4260bd2db6b388aa142436197efd8ea93fb WHIRLPOOL a9261d9a9afd75d0b84a747b176769e9c37e9e0d62f8767a44b19356b9fd548304acbd91247bfd7ce49dd5520338c65f5e4ae9a0bb9f904748fce350bcf3c82e
 EBUILD selinux-networkmanager-2.20140311-r2.ebuild 419 SHA256 f0996a2c6a4e65b356ea0abdf0b5db5e0577b8a8a50f5dc50a805dfd76bdc51b SHA512 a784f11b1b2a5105fe45c0b4921bd66334dc8849cb76ac0a7a132bdd28253912c2295a167e2f2588a5742a7b5275b50439abc6744ef0e4550eba53443f7ef795 WHIRLPOOL e7243f5e7cb29033b3d48ede412915b349c27ac093a6a4ec35afb75a7d258d37ce182b6dd0d81fdb5aeefea0a52d69c162c46486d6c2528adc77641bed7ada5e
 EBUILD selinux-networkmanager-2.20140311-r3.ebuild 419 SHA256 704d243cfeebdc4e585dec3bd1a812c3f79cbfdada89274171cf1e82c593d024 SHA512 db64014fb8417ff4c5a3df0307cc58398b9e654e6621f260711e2b6aa92dc0c4c0935f51b005525cdb4cede46593534a41f58e5b25d84842ca375524c24f9576 WHIRLPOOL 9371e9bf88755762441d658faa7ed0877b98ef01b882392f3f560db219176226ce73d2b21a19cced29111725e2c520fd1f4261255d366e06b07b83620550818d
 EBUILD selinux-networkmanager-2.20140311-r4.ebuild 421 SHA256 36189c3f2bbd38b3d33b0ca5577d4032398cdcf16d817a642ae12e0ea574687b SHA512 cf2cd8e180db9dce29d95cbaa973a32d56b6d60c1dced47fb7cf317ddecf2b84707d941b56a0fe2d3546a4e9b7138a862825aa3c8ec1c1b2753913adfaff82ea WHIRLPOOL 1c316db87bee025e8329fd53bd16fb0ec9228dce1431932365cd71b3e5b1607b3421dec680ccf69a8414785bb27f04dee2f48f202b8f14f85a71422092340d00
+EBUILD selinux-networkmanager-2.20140311-r5.ebuild 397 SHA256 478d6b4f528d2a2e329a583d117827336dbe2d4074ae358ed5b0d66d6b0fb389 SHA512 139c7bad19337db849e65f9805d2033d9b6bbcd9c6e6ee26aa31ae91d8c374f13b2d1d3c507d4d2419440d3fc94c51f665f61d9c03e68a02c087d77b964db6c0 WHIRLPOOL 6e47e2d4a4b2e401c7ee571595947d05b5a0b6003e9c86b015182b59fc3d0b7a6d546d287f992debbf700f4b82becfcdc8a3c7ad7dde77c31957beebca1ac641
 EBUILD selinux-networkmanager-9999.ebuild 377 SHA256 83dc8511cfc227231d82d9f0aa5033dc679c9cc77c6d6675fe334d2375c789d7 SHA512 063f9a475b6a1698a82952f8ae29300062576d123ac33f4bccb6459e2511392cca225dd0c1aa6cf161dd211c0a97b41351d36ad68fa9206be6a89dfaedae499c WHIRLPOOL 54edd8fd9820c5b5692f427195d975adf7b339c202a0e946e9b488b375f030c9df057c97155fb510a2ae59dd4bda2156f176806eaf97516b6bc397c7de393a67
-MISC ChangeLog 7918 SHA256 a121b7c202e0165c16d0d85d91cf03131868c7a2fff0fef5744959eee4a390a5 SHA512 9d24b736da6300af024cb0747a9082af699d04a4c47d1883ddc8f2919b9de7793dbdf54db6771d8cd3e3fef24463ffebfc9d1e9f4648c7ef772bd1f71ef74371 WHIRLPOOL 6a2f84f4b060258fd7a8510c416bc26421586e2260a78f1bfbbe32da0787fba2a415bde8d45ee41dda6e03621f681236a74cf8d95d9f2da3bdae0a3a3f201afb
+MISC ChangeLog 8126 SHA256 0688b794cc9cd6a54f2ac580af94145611cb977bad6ac28ab2fbbdd277b10aaf SHA512 f56ef482894e70ddb91ab2425bffab60f67ac98621bef129b6557d5985b901b9aacbaaea6f83a0762e427e39ff4d416a435eeca0e86138301fb95efa0bcd3f82 WHIRLPOOL d0083ee6a2910366013ceca72337dfebf353a2bd67eaf228eb2fab6ee09afb72c32e162d6ba275c09c4283b974afba03bf3f78ca919102f1432dc634ce19d44f
 MISC metadata.xml 238 SHA256 2a89ccb3b7741f156eaed1b25a3826e566a0b7dd2c199408dcaeb054cda6dc0e SHA512 d582df5f825972232acdd57367a84ec29ed57fe488462cd5f178e666bcfbca8cac90b28c5d8cbc0cd98ca4e425d565c68c824ad09d751aed4ae444d4f7dcff7a WHIRLPOOL 795f1b7f2452f242c30a45a1a8d253cb2d1f94ef48d83722c903fabc47ce92271812a07aa0eeb2ccea79fa7555099f531e6fefc20f8ed034a2cdd3a38530dda1
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0
 
-iQIcBAEBCAAGBQJT5RyEAAoJEC7dUkA7aK9HCS8P/iCH5jLF+5qNAn75r91eWsbi
-scXywa1gZMZ8zuMQyrAJYe1YJx91QrBQoIvtrhBGmHOIThtxi8BPP1M0faWdfGse
-ZgzDXHVFR34qP6CXdbjzKbXLmBDdLf2F5Wu8nII0RM9+8aQzi8NE3nYLlB9jQbjB
-I/KjspIKmnXMbmlUlkMDUTl1YiZ3J995sWs4k8VonllBTkFIQ8xipv0HlF4Z832r
-rR4UZMjF1n2cA81Co6EQ8So+E+hz4+msSZ4Jh/bgNL2Mkil+4gWY49T9K/ebhin2
-JRc7UncKWb40fG+kVuNK1N3jO/m6xEBOqEGjU8V6KKpjZu3+LAEnFfZw5BCByGkn
-DOkjVZde6kX/Hsakb8VWJXMOagQwwx1Ifj6SPCeNLQJMYEHNO+uUGLGCGTJD2IfN
-uRwHIBzKlq7cbJAQoLNMg1p/NqXoL3R31NfvgdUDAih97fFiJJbar4CrBTC7YWAH
-4j9EnwxF7TGpsosc1/xqieiQwr6PLwHzhuvGM/xY1nD5zqg9sHyO+NPUiYQOvi2q
-90YjdThAb/2uuRLNYRHJma0L6v7NVLqp1kw9YHTKCaa2WcQzptFnOL2bvkCvm1MI
-hPxnCVdnaFZCNrDI9Q1ps3lv4il8hOPBk+TjyEMOz/GwKr+O8qX2vmi3us3QinmA
-4ZKSGrhQgoqE6eg/EPoT
-=K/WV
+iQIcBAEBCAAGBQJT5nhZAAoJEC7dUkA7aK9HXuoP/Rjsr3UUfUfqpg9xDB1cska6
+nnNFiWXQKpe4sFj65Fpx0ZRoO2JZkAASK4CIhRSaOxT7SDT9r/iIJ7lorA8JH6eT
+kx6u04QEzHKABcdh0c30p048fJI+UzVhZCCVsk6PCqSReyBA57Ske/UUVuRI9Yzu
+00/j1xaQkALjTeB2CSeWKw8010uHazjcKnIfFD4myxL92A2+MKU/OYILlO374u/E
+3G0EP9ObDaQxycvhi6sje5tgVseU72roiDF+N+76ojUB0hFZzcraksmzo6HZebyC
+qxRuKcKk1Y5v4BSBkTn+bvCcq6K8KJD+K4LvCPqYjxz/9XyLEXB0y4tDrXUNPj9j
+z+0DqtAEito0YFcorrM6qvkmkGt6mhXaIz7Fh8Y+dkpb4jLHBwumXzemXms16iNR
+P+g+L1h/EKlSiWSQMcXxru86paQC7QPy7REQ0vgqpbqp+z9GWsKLL8DiVE0VQbZ1
+jxvqePhqb05XriSTmRQ7Pt2iyuj7a0c5POwhqzAgqV/+zLF21CwBJGQDnXy9Cdwt
+DG8T7SMrG+lY2ygC/eVwgCB2FUDBkrpf/M/W6JWFuZYP1k3EnTsooTmPfy+aIlfX
+i/tbdZQjg61yFDXdCRT+WJuJHgaAzkDMjbWas6FnLhdV0qbictLF8nIIlVr8EITw
+8jE1KsVinNGPv5LkBeXu
+=oGC+
 -----END PGP SIGNATURE-----
diff --git a/sec-policy/selinux-networkmanager/selinux-networkmanager-2.20140311-r5.ebuild b/sec-policy/selinux-networkmanager/selinux-networkmanager-2.20140311-r5.ebuild
new file mode 100644
index 000000000000..9d28de0db815
--- /dev/null
+++ b/sec-policy/selinux-networkmanager/selinux-networkmanager-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-networkmanager/selinux-networkmanager-2.20140311-r5.ebuild,v 1.1 2014/08/09 19:34:18 swift Exp $
+EAPI="5"
+
+IUSE=""
+MODS="networkmanager"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for networkmanager"
+
+KEYWORDS="~amd64 ~x86"
diff --git a/sec-policy/selinux-nginx/ChangeLog b/sec-policy/selinux-nginx/ChangeLog
index 73cd9af7de01..59fad807e326 100644
--- a/sec-policy/selinux-nginx/ChangeLog
+++ b/sec-policy/selinux-nginx/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sec-policy/selinux-nginx
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-nginx/ChangeLog,v 1.42 2014/08/08 18:49:40 swift Exp $
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-nginx/ChangeLog,v 1.43 2014/08/09 19:34:41 swift Exp $
+
+*selinux-nginx-2.20140311-r5 (09 Aug 2014)
+
+  09 Aug 2014; Sven Vermeulen <swift@gentoo.org>
+  +selinux-nginx-2.20140311-r5.ebuild:
+  Bump towards r5 (fixes duplicate context for hiawatha)
 
   08 Aug 2014; Sven Vermeulen <swift@gentoo.org> selinux-nginx-9999.ebuild:
   Make 9999 ebuilds EAPI=5 and transform to make master for version bumps
diff --git a/sec-policy/selinux-nginx/Manifest b/sec-policy/selinux-nginx/Manifest
index e65581cca333..638a795eecaf 100644
--- a/sec-policy/selinux-nginx/Manifest
+++ b/sec-policy/selinux-nginx/Manifest
@@ -6,28 +6,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-nginx-2.20140311-r1.ebuild 450 SHA256 d1e13c4e523bd293c210633bab66d75c4a61dbc9bf90f5939f8aef8cf5d8a33b SHA512 d01fbb36e6e29df5e35975e59e73236a350655c3f0bbefe01e00031656a1200cc918c8344dccec873d1e6c9e6bd47c5b6fe88afed7ca7e7269086610123d1978 WHIRLPOOL e7e0f3e368c995bf3bd5738c93eab9003b1da0c78bc92c7d6269f0eb6ca043b3483914ee500db423e049b76d5de47b033867a590d31cad2e7a52fa1592e653ca
 EBUILD selinux-nginx-2.20140311-r2.ebuild 450 SHA256 a412f50793bdd41424b803447e10237e1f2c37fa7a524c3902c685da52669b9c SHA512 3b940b773b24552c7570c2b3219014f69df7b632d651b021924b6954722ece7a41fc993e908f93c7ec2869d0dfd42b4bb642c4269e8ea0caa2e4b6b640813f9c WHIRLPOOL ed264b34c52a46eb801c2a06c6126d96bdd2ee69bbf0c512fc36be387eb5a1f3a820241b09f356da9a8a4afb08a54643bd4364c785ba547c61d252117f5f8391
 EBUILD selinux-nginx-2.20140311-r3.ebuild 450 SHA256 0ebb0629b5b7d444f9a97afb44828838d4111cac13cbca0a88ab155bfac5a1af SHA512 6dddbba89070782bb29460104e96b214e07f0d8e63d7400075d1899b3aba15cba81d02db79be0250bd4c18a0c383a694f654226c0c10072b358e46912f4051f4 WHIRLPOOL b8baa74f59e75781d4cd6944977bbf845b0f631f2c3058c959a3a49d9f39d3e04084835dbd41bb6d427c1e6501eff530869fb80656f395c07f34a8a06c6bd8dd
 EBUILD selinux-nginx-2.20140311-r4.ebuild 452 SHA256 68749d28eb1a68c9dead973e7a10b0f86fe0924b4b7d9eff4c8cb6a994695a36 SHA512 45b439d5c7193846412df3304a67434619297a2b4cb5fd3067815ba0a139e585eff1d4ad97a8f0098dd88c4f61c4f11bc86acf94e3801bf85bffbd3208e84e85 WHIRLPOOL cfba86c96a9c9aa6f20dac633a0948c685e925a9bcff9744a23c506f2a06dc465e5f9b2e79aa5ec6e87d867884e87306f42abaebc4faa5fe29608018222fa6a1
+EBUILD selinux-nginx-2.20140311-r5.ebuild 428 SHA256 060eb813a40dbd1ab2ca0e0c3797842775a7756d08a8f253c477592d9c0be696 SHA512 b93f3d7b5f454af20d54a4bb34130bde87c9287dbdb10e322d0fc050a0f5069768c279dd69348e3ba60dd8b9fd07d31618d06344381032f393773b71ec987fe4 WHIRLPOOL 1d1695a3cd06e2fec3da5b41121422f431a2180e69a0ecdca701ee0399b4d8e50dd26aba079a3b01e152077e84bca3211ee3820a1bdba2c1b1a7b59508f14e26
 EBUILD selinux-nginx-9999.ebuild 408 SHA256 7af1bb82850715ecada93b00f6033c426e92ec18463becfd9385970df228ea58 SHA512 0543233f8cc5110a9f8f5318e3db8fb98ac63fb107f5610cc2edabce3e055b838cc5a1c330ae37a90974aa9ecec98f1ceba83a3b4df9c54d0a2712ef77f874e6 WHIRLPOOL 1795ecea56ee1d23e695cb25fea7db17d05f44ad84750593c5848cc2f0f02b38ef841c3f50b63ae50f9f0a288d0ebd7624942dbb7036bcf34603bf89655556f2
-MISC ChangeLog 7239 SHA256 01b04d065a8613b62399f3f52196097c144cda6ba2c5aa782ea0da8b4a4b6fdd SHA512 e96eb882277ca5916d7c7c16e32bd1f98aeb5adbc0def51a3914168594a95ce4b2553f1bc26fee4ec8c8f2092e4a03825edc586341046b6da0bc03eb10dfb748 WHIRLPOOL 9b8caadf2665c5d7d33f72e896b9b5c4e3a4edcc8f9c2992ecdb54ab01b441d586f049476f74a1bff85ca1f57f4fef835189f2444cd23f3c0b7b2ec665b76408
+MISC ChangeLog 7429 SHA256 1bc69e5236fb8886a440bdc5ffbab60929ce7104eda791557412f9f204ef1a6e SHA512 4a7ce275a2f61ae967715bdad4ba31c743c4205468a1e41cfbdd456d926a1da7b0ddc336bdb592bd5e0100e0d01a30a467091c6a904297f6b6e8d17466ea9e86 WHIRLPOOL 8d2c71eba0bf8c3ee743afe06fd0c0102086ea2c939aca0d1439b5858a5db622dd9af40d69d9547ce3ecb0c9e52b9b88338aaff3ed512422d5a9f06f08769cc5
 MISC metadata.xml 229 SHA256 1e7644340777e25bb60cd52e7aca1e5fdb93ed30c315f78305d783674f11399e SHA512 ef9c989f7917b3e901fd87338890a336131abc95e883c2e212de874e864412df5597c0dd11482d2a9c23765c6a6482a5bcc0380d5313ac111fe9b08347eb869f WHIRLPOOL 52c7d9291b8e8ee5e7f32d479289ec6c3926930238056bf4c0e42f24afeef93d67bf8ff3826488a0afa0794697668fc93425dbbf4bb10ab00e22283d17453b71
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0
 
-iQIcBAEBCAAGBQJT5RyFAAoJEC7dUkA7aK9HM9QP/19VgV1xIJ0IJjEzmIxNunUg
-X/wcNy22ThPO5GzdVrXhnq0rvcPwj2Qf6QfRVmxylAqSU8ouqLxv+fKUVMkBEPaI
-UDkhHwR6Jt10vvXoJW7J/UMknwrnxTRamHW29IjennOK1Ul66nBF1v2FsuLMYk48
-OiybwmB8aoHR4eg0QtSZ7pSPVFMK7DGX4+IbR7hNXJErPKQUXc9SBwbZ5x2WdA8/
-l4JiyRrI/RD3wLFGj5ap/hdBQ5nFbF/Itj8xTbq+F7j0aCPcv4E7qOTCbbFOhUJS
-CeKjkJypKioyLbi6zReEPOFTrj33EXco/JVpqNyVs33YzHzDcfI68iXq3wxQuaX/
-ppx/U17n8zPfU1UHlSlB7rxagn6XMo6yF4CG8ODYnHnLW5Pw74kF724fDf3bAACn
-vWe/mf5JkcVSVtYAKJSb17yNtHETbFZxmOT0CqibCiJnYvwBsE9PdHjHCdb3Ug0i
-bZk12r5DukAsN4fB9R5u1Kpu+cBeRRejn0uiCcOHMOdjpdkviDaFHHWFNIdyUGSI
-7cEDkCvcvU1TYrbRkG8TXzQTXgB9m2N29LLQ6Sz8HqHg2UpYhK1ELUrCdzLZDUp/
-fay7mryk2W+wAuoKJJw1izH8qiB9IC8sxYb/FupLGCkDkxD8B3BwuQE02P81woQK
-nd/iN8ITsqYiTxp6PgaH
-=UunZ
+iQIcBAEBCAAGBQJT5nhZAAoJEC7dUkA7aK9Hc3AQAJ8HUHrYQNRWjTut9SNm5V5D
+PuD+AgCht36IsqxxLutHum8UofS8D3DU1iMJEaPZJFjD2r4kSrQ7fEVMGIcbbvww
+0iyf+PNMT/9mZBwaSmWKoiZywykc25yzOXhSVzLa4d6GJzehfpxL2wAZmGjfleu+
+2ibSRO3KAs4zlPYLouMaZP0l9c+n+WmEr08LqnAcSnXIi009WnWKbhUTLC1A4Gu3
+7srNSfNkRTM9GCRe/GLkQc2DV5AvRb1871K27JuEsFS21x8Ktj8G7WBGrGxXMf2X
+k4+uKHPVwGhR6n81z7HU8EBFQXuJV4h1T1qFjkYBkhwy+TT5nzxUL5nPgYmPzUPz
+9Jar8Jc8Mn0VZHVyHOnLvsB94Ja7rC3K2avLuKBsuxS0n2Gd5e0s9oZ/ThG1WL0c
+53uD4dtU2xeY6bOuD/BLgebkNdQUaAorWoG/7TV0PR2OTTAPk3l8+EYATVhF0baW
+9b/VRJm5d47TotbnG3ZeJulW3iQNl7JNPy09tkPnyc9EOvlRQfW6Ebf10k4Sk/N1
+kc3Co7kpd6z7Rwqz/ApuZR2+BcRh5tGHSZObRQFvyKYdEICxNKpo/XwkbvTuWE1T
+nVXdophP661DuBTlaLnrFmCck9W5UfcbxfEZsZIPH9QQkH53LS0NOpW0Xl044KLk
+TQsAkWhFuJNkJZguZ9yt
+=AfoU
 -----END PGP SIGNATURE-----
diff --git a/sec-policy/selinux-nginx/selinux-nginx-2.20140311-r5.ebuild b/sec-policy/selinux-nginx/selinux-nginx-2.20140311-r5.ebuild
new file mode 100644
index 000000000000..7ceead1e03b7
--- /dev/null
+++ b/sec-policy/selinux-nginx/selinux-nginx-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-nginx/selinux-nginx-2.20140311-r5.ebuild,v 1.1 2014/08/09 19:34:41 swift Exp $
+EAPI="5"
+
+IUSE=""
+MODS="nginx"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for nginx"
+
+KEYWORDS="~amd64 ~x86"
+DEPEND="${DEPEND}
+	sec-policy/selinux-apache
+"
+RDEPEND="${DEPEND}"
diff --git a/sec-policy/selinux-nslcd/ChangeLog b/sec-policy/selinux-nslcd/ChangeLog
index 3b1e53cd6bd8..bba8a2811964 100644
--- a/sec-policy/selinux-nslcd/ChangeLog
+++ b/sec-policy/selinux-nslcd/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sec-policy/selinux-nslcd
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-nslcd/ChangeLog,v 1.31 2014/08/08 18:49:51 swift Exp $
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-nslcd/ChangeLog,v 1.32 2014/08/09 19:34:08 swift Exp $
+
+*selinux-nslcd-2.20140311-r5 (09 Aug 2014)
+
+  09 Aug 2014; Sven Vermeulen <swift@gentoo.org>
+  +selinux-nslcd-2.20140311-r5.ebuild:
+  Bump towards r5 (fixes duplicate context for hiawatha)
 
   08 Aug 2014; Sven Vermeulen <swift@gentoo.org> selinux-nslcd-9999.ebuild:
   Make 9999 ebuilds EAPI=5 and transform to make master for version bumps
diff --git a/sec-policy/selinux-nslcd/Manifest b/sec-policy/selinux-nslcd/Manifest
index cad525495923..764256e6048c 100644
--- a/sec-policy/selinux-nslcd/Manifest
+++ b/sec-policy/selinux-nslcd/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-nslcd-2.20140311-r1.ebuild 383 SHA256 248a337273d320625801234594fde68e1a5ab677ae0ae377dc0b9cb7da5442c7 SHA512 e28f598f2a3e558b483e7f29996d6d299e92f3a879c9f6083ca5b07cf2fc4330c9488949881d9d19998e00a6a006c05c9c4ba715dc413c7a9759e96b7735a9f0 WHIRLPOOL 3389401883fa58cf5b28362e3e0439c4148ef1b60a9dcbae03d9c6279928c37a62f9b6b8f0b6dcf360844881d8857f9cbd79a82ae22f853e71e42799b5f9d3ce
 EBUILD selinux-nslcd-2.20140311-r2.ebuild 383 SHA256 5d866921e0c2fdd4ac54993b1b30ee2b8ff9cc5fe4282a576781a2c18fd8ff67 SHA512 5ffdeff778d6e4d100368c5bbb102212c0121614aba8d0656e726f5b8ffc8eb698066b37245c46c34bc7b873ecddb5c60bdc4b76cf299cff5fff65f95775756c WHIRLPOOL 49dbd8567088eabe69376b1af073102b7e26059f86f4bef3d99549f65f18dde159d0387aea8621d45248abc5c610187aca43ade0cdeef677fbe654bcd6cc8d2b
 EBUILD selinux-nslcd-2.20140311-r3.ebuild 383 SHA256 777ff5769aab5d3ef21914ef8e1a6e41e237286fc0c12e0ab626eaaef421ab09 SHA512 5008586eaeba7e752068be10a5c37a0d7c7e5d5105b31373549cd8b4a66e89444b4564d6b65d5a521f5a30669c7883360c7c81124e5dc868b24d21673c32ec8a WHIRLPOOL 41339ad4f73f69b8ef24e239b34aaaa80f579909555ff00f4dd70826b28c905bf692e6dc29b8103ce3c0a4915e43ef608ff41a9d9ebfc3cb04a6ad2688476cce
 EBUILD selinux-nslcd-2.20140311-r4.ebuild 385 SHA256 b373265cfb96aea1c66490fa5fd0f80448ab61dc702baba57848ce709add1052 SHA512 22e0071b9ac7a47da8d6af08d5b2523a75b2d3e69dfea601ebb2c3a27c4beb6f021ba6028759ae3113fe26c54cdb6c9638ff1012d50c827b87e16ffba47caf1d WHIRLPOOL 0027488b375876d205cee3331126cb52d266670199c48c49699c079c075285ff97a0dba526ea222df4a815596b839b796e990a1dbabfc6ad454ba051b8315ec3
+EBUILD selinux-nslcd-2.20140311-r5.ebuild 361 SHA256 af1a027a7d754889ef5902ad8b0659ef766fc151569b720a483ecba71f39d8e8 SHA512 336442abafa9afa84eae1ab7571e7ad5dced2e20efa112d5f43398059826629363514ebeba3490034a1058d6ad8d2894a7e665569d5a1774f58bc5fe312a3050 WHIRLPOOL 92dc1d24db4928e27194da6f9a41fcb58347f14fe2e98396834d286581a8902eabe85289ff9e4eaf918ea0077438126dd0c1c200418ce4c82708b1e889a4162f
 EBUILD selinux-nslcd-9999.ebuild 341 SHA256 f89f31a438466773e9bfa3b09bd669f7186f0083bfbfec97a77bb1f9302b625f SHA512 b910fc0a544a298f7c0198ebc6462233741be7d02675f0ca7b06f6aa00a813171251cf689289de5fcdeb6fee375bfaffddd946acd03bf6941322a913e44fa740 WHIRLPOOL bacbbac92208cd9e5e8b301d270323b5555055b3bedd9321df86396aef31638e36cd24b938db9f473d719ae62974736bc72cd22276b1269b4241cd9ee035bc1d
-MISC ChangeLog 4919 SHA256 2a64c31a19d6003b8b1795f07eb72834ee8d4f31706702dd464af0a67244964d SHA512 d2e2a6b8ece3744c8425d9974ae78e62ef6df35c970ede5a67156afdda3d8c65e8d4b86fc5810c86d6c493274b168df81615143ae2379af5ff5a5507f35c430e WHIRLPOOL 15f9eab6e49ddc4e05a53f30635f66e00830a21b88392e13c56e42d0405baa36da079e3364f18656985344b767abf3a7baf819cd138f8142ba1edd3f4e2ff5a4
+MISC ChangeLog 5109 SHA256 a37b1c62358b3464038a5bd83c3c5f539947c51c4973c53c27a95948103ab25c SHA512 f4213b2266596f5438dd950d6ce9c7721dd1f9e7baba8723fd1132d8955cf32b91273c7a445da01c94e4a6ca0ec4930c78e563152c1a4d706deb7018d893712f WHIRLPOOL 8a9490c6335eaaf0f0e9e2c90369ffc6ed0c6562788fa2592da192492325cd29af7b25800eb725b6f274ac0139d7cf2de13c6ba9cb640d50f660cd0482a71718
 MISC metadata.xml 228 SHA256 5ac1ca25edd85eae8a0ac837a55a7f56d8ad7b820ab5adcfb50aa6cbbd7df0d5 SHA512 b967784e4a238810cb93efa77b9f21fb2e63f2b458df70e11d111274737ecd0b40d502b95477bfabde23a544db9c64d5011a073c60a5e15c5553a4ba087d5658 WHIRLPOOL 359f616e8433397cb956cb3c79c59d56663b102f6b8e0f1fbac7b70efae967bada12b12e99b48f30483e04be6dc2cc3a5d383fc60a552675fc9624305767507a
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0
 
-iQIcBAEBCAAGBQJT5RyFAAoJEC7dUkA7aK9HF28QAI9RPc+IXqHhEDo7wwptEWb6
-vLbx+9oJcVTxwPdCueEuoYUiZeN+GkQDOi1ERfx7tbxKi/xI+wITHOF/j0JD3K+J
-EXes7DVyNjnPjSGA4KPCt9RJYz2Bb2ayFCO/HPANsljpaDfGgVYpHFGWxuRNPM9m
-K3aJkv/niY65b8gG2v8wkkirHeZqADArnGlPnlqpi2dIR1BpCKuz+uWqzAdB0Q95
-51CHfvOWTPWrngjPPPrL4y7z+HHhE0bzwzAaBij7APHYe+1ExD/vsv+arFybLKZg
-U0KDEwDVTQv+RkyMUddvI6Wvtg0ovrGlanm7FNLT0e/pygdBQCqZz/mN22AR6Lcv
-YsRKRRk17BB8KmdRBNQKcBM2i3JdxmNat81dAgjAxt8JRBtCoabWGY2t6hScIG9F
-szvfWYFrABmWx8RiQAttZbdQp/9a5RdgMKUiETbwZkl69AAfIlvKn15d9HO+I1HR
-JXzkLB+SX2ymcB7OnGQO5NKAX5pPxl8FoovoFQP2cXdYljwhOd3yTx23iNItDzkc
-qSJo7GdVeFcBphc8HxET076RzL0gD6SUAjAibwxSP0Cfw2Ee5o2BGlIis3c+KiP/
-bez7/JOfh8jglh08p9hspZkDUWO0tLlrhXgC+/Yxrrm6jFA71vfWORcnrxz04Kyo
-cc3BQxjV1yNEJVdyCO5x
-=pVBr
+iQIcBAEBCAAGBQJT5nhZAAoJEC7dUkA7aK9HYCcQAJOh93K+32hkrGMBZT1OOAg+
+gZVSNTN7qlIiITQiOmeSMc5PjXuopxS/TlPBfUBzAusMJRnAyg0PtzAG0KyBHcta
+78a2T8QgJtMEK11VERQWtzUiyOHEt9Rh1SOoEfAwss/dr4QVGP8GLjrJe+nnRgsA
+KEYDXJ8m0/qk2AamOqzJdUD3loBg7iDu2oWdDQvCa1S7HLEhh/uCIYNQKyuodNJX
+zSTYKmBcYdQmPNHID4b2WTGJyBGlxRBZZ1vlsuGyZ3UnfDdK7v9495AxclYELgkr
+yzs6yrLaQOOij0Nu9ZRA8Co1Sz87eR1cZQhHBfoLLdJzWccUAlj5kJ6JS9bqymcW
+fgfjPZrUVrZMoGfmEgrqMaxd/APZ0Gpakmbxc+QiQm/plX3jiCtPPZLqGDAcbnTs
+iZVzLlK7R7FPv6lzPVJ9b8VjoRM8oQCq/VYj26t8Q/awKJdjACCHbKXmnfh4kJCI
+OCpC7XvOkv4xJH8s4Ee5DUAHqK8S/OXwSy3M0vEJRefPjUXyW78GQu1aPHFzEPS/
+pST2ilFjfYYw4wv15+GAuFMExwwvgAH8boaS4FRwElUQwJe96rsRUqKsXSR2frMM
+/LgpVLlA4PxOhHq3SrGZSq4GWWeyxJm6XrgG3+HNEMv7z03/PuUj/+ZzQP/fjSHY
+VU3xUtMYxluOfrF93phD
+=HZFg
 -----END PGP SIGNATURE-----
diff --git a/sec-policy/selinux-nslcd/selinux-nslcd-2.20140311-r5.ebuild b/sec-policy/selinux-nslcd/selinux-nslcd-2.20140311-r5.ebuild
new file mode 100644
index 000000000000..cbecc0be06bb
--- /dev/null
+++ b/sec-policy/selinux-nslcd/selinux-nslcd-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-nslcd/selinux-nslcd-2.20140311-r5.ebuild,v 1.1 2014/08/09 19:34:08 swift Exp $
+EAPI="5"
+
+IUSE=""
+MODS="nslcd"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for nslcd"
+
+KEYWORDS="~amd64 ~x86"
diff --git a/sec-policy/selinux-ntop/ChangeLog b/sec-policy/selinux-ntop/ChangeLog
index 21d12177e8d0..340c7b4e7260 100644
--- a/sec-policy/selinux-ntop/ChangeLog
+++ b/sec-policy/selinux-ntop/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sec-policy/selinux-ntop
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-ntop/ChangeLog,v 1.62 2014/08/08 18:49:47 swift Exp $
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-ntop/ChangeLog,v 1.63 2014/08/09 19:34:07 swift Exp $
+
+*selinux-ntop-2.20140311-r5 (09 Aug 2014)
+
+  09 Aug 2014; Sven Vermeulen <swift@gentoo.org>
+  +selinux-ntop-2.20140311-r5.ebuild:
+  Bump towards r5 (fixes duplicate context for hiawatha)
 
   08 Aug 2014; Sven Vermeulen <swift@gentoo.org> selinux-ntop-9999.ebuild:
   Make 9999 ebuilds EAPI=5 and transform to make master for version bumps
diff --git a/sec-policy/selinux-ntop/Manifest b/sec-policy/selinux-ntop/Manifest
index 4c536dbf2c3c..e0e24f44a2e1 100644
--- a/sec-policy/selinux-ntop/Manifest
+++ b/sec-policy/selinux-ntop/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-ntop-2.20140311-r1.ebuild 379 SHA256 5d8074481f397fad67ba802a51ec41d9174e768e2609e4638887563ea88ffed9 SHA512 a6e8a385c03c4614f34099c2d3616dd4938242cb823a4b9322205c29ca062d3c7db7d92b9b9e4872c2bb92c5a717a1ab8f01c8648ac382cd9fa0733f58c46132 WHIRLPOOL 56179affcd94ab6ac6c887e8caa8266f00be9782a18010fca935746ef79f9ded78ba9a302008861c203ce4582b64535af0eb553e25f968e670ca2937389f10a3
 EBUILD selinux-ntop-2.20140311-r2.ebuild 379 SHA256 60947cd29f93915cf3ec92c14d59db073d494cc2e76e9c2a9d9f7826b0187ee6 SHA512 d0aaac429cd733c823a090a045e2769842f72a36d91641419fdea38a2396286dea2f6a5d56a461610cd6d72f6aa4d0085f9f2cbc7c4f3830fce15916e8a02032 WHIRLPOOL 640af33299bfbc6043285f8e0561cd171e31f9c8259ca6fc18be5ee21dc7ed59fbe11278ef36dd68ab08964c20bd9d4e85c8856539ef95b27466079bb15a1e0b
 EBUILD selinux-ntop-2.20140311-r3.ebuild 379 SHA256 2c5f989c6ba02304e1bb591522fd3c918a85c737d153734d48f669b605f2440f SHA512 547a387ccf1a248b4bc74d0d7f53bf8e5e834688ee59cb063a1b96c17b18d2596a6c543bd26fc5092448347ff9f2116e3a94f15c3cd94512bad88ef8a8aa59d2 WHIRLPOOL 8ff0ef75f7e62361c9ff1dec97a41beb89bfdb7fee978b0d5c0bdd9f009fe355f217e30ec7452074668d4ddcd8bdd6ad72c1d6a24af93ac60a04bb107343853d
 EBUILD selinux-ntop-2.20140311-r4.ebuild 381 SHA256 a24f0d298146f804d007744dd7f25ebc331e2a6ee6b66dd38faadd6e6a3cdd3e SHA512 b6c1cd205675def0f9b19c17e327909c31fe01dfedbedcdad1be207868fae3a4135062d77a3d566dc2ad5457ab3b70aaab9f69442fdbd3e80a4030ff7341eb54 WHIRLPOOL e5ccae803c6ae3b9d13da308747ae5d8d9e72600260c4a7d03263d8b33228ae6ab88eda16c4ab742563d345071960e8ae31b32c36078296456ec40f16c2bee6e
+EBUILD selinux-ntop-2.20140311-r5.ebuild 357 SHA256 a663cee298f32128e5b9d1bc37d27aac4c9e4a630ad4a254a6606362d71fcbfe SHA512 68bd815ec1b60a6d2dfc036f125baf41490d2a227182bca9e5c7440ff5c611fb84e81e44bae8171e59f1534b4728ecd568120f84f1449b454bb5806b7722d74b WHIRLPOOL 797401280ec3aa03516b291341f4e5b5f5d5319d62b51c87d1156c12574b48eade4f64de220c376d900a89b2f38d51f76d972157f6dc86f24e7a673736c8f813
 EBUILD selinux-ntop-9999.ebuild 337 SHA256 33811a74db8ced27dd0de6d48a2d5ee6a97480472a6a0e38af6afda8ac99963a SHA512 bc78ae3f63165273d995e956c34fb87da7adcbca0b8bc3de81ca6f0015eec7963294a34a87893fdfb29d9b91473042af51e90d18a6ae8a559ff4cb0d9a6ee61e WHIRLPOOL b3643fe591b58eefceec61ae2554fc0fdbcbe421f27b2537552a36ab70445bc27045061fa22a0a77d11d5c1766c0dd1f08d3e7b7dc3635bbb28b4d96e9d8bd7a
-MISC ChangeLog 8936 SHA256 6e9859cd1bfd55cdd10ccc0f6236fc0a705b7ef024d14496a7d0dd291d870ca3 SHA512 b55faaae6795ebbe127dedecc9c51420462e82c3d4ef1956dc755806629cb23d6b711cc4d06132b336ecd7fe4987212ec761e8914765d49fba9731c6610cc8ed WHIRLPOOL 5f3d46f62f5a56194a3e73412d4fe537fd3dcb11ecbfb377f0228913aeab46fd425b561b860ffaf7f5773a6ba05bf93687436b126c074fb855cbac3e238b96a0
+MISC ChangeLog 9124 SHA256 9e3b626fd052c7ca0725f18529db22302a228d2f2b60b3adc0c151899a5fdf71 SHA512 edabadeb7d76676e5ce87727c2220ff35576a73354cba515d48171cd20db227bd5dfe82813191c2fc6dc5a84c3b7c961d3be047aeaf8ab965a964e6515521790 WHIRLPOOL 46fa11367e1a1ad9422512b07a88e178247cce7008d0cc78ff12fc8eccec5abf663741cb5096eea24b860d66b48df6c67a7b18b3ac5278fc8c35b7d146064847
 MISC metadata.xml 228 SHA256 34f0875e9c3e846451d0ccc9c84c7e60212948a3306d38f57d2fdb9ed53269ad SHA512 d29de05c1853fff5be81fe8ad11a8bed63503e1931f19ad58d1396a694ebb3f11f676a3b27fb148724637db5781f79562fcd2825c4b558b8083aee040ef98d51 WHIRLPOOL b933a4826ce2cea9ca4ad9cf1fb2bba4e255b23994f3b57a24507647b925fab39f6e2f2c4a2518b7d02c2269ceb37ffd121aa0b5b1d5db92cee9d00ddeeff340
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0
 
-iQIcBAEBCAAGBQJT5RyFAAoJEC7dUkA7aK9HV8gP/1kknADl924yf+WzXpg0L8mY
-lse9hstmVkD8GC56Qs0k9hAOMWrS6MhKPoCbx2OkaKYHpikhb1nFJhcLa6u2fEQS
-31DtUs7eB5JQL0xxjpCfq9zBi6Te2vFLuOg2lkvtHKJLZCYdfDk7e3atb4hxqAka
-GEY8HMTcFgp1fED1bga0E+JZR+WzwR6GXB1nyUUD2Jz5eqX7LWKY748f9C9ZHpdj
-fucvZpDsHYdFcFDy7+XKJ+7DGAoMBUThFFZHgO8RB3vBI5aUepB6KjjA+cepgZUJ
-29y1QR0ZSpPkis6G1PbJ4Oq06g2Qcy+thYzGCJeCPNLHOdk50XlMjXexhjYNiZq6
-41bjAO/1WPDyYjD6KnJ5N1oh/Ip3levWhWeBgXLHgJd7MjiUu+jx7IuDOZzQ/J15
-uvWyvM8egyuochUN16uXIXGPgzDKB+4XxbRxr8xQXe6tZgUC7o/QS3WEBpZxTtN5
-pzByliN7FCiBcXUEZl0rjrer51Z8YSrJKP0FVvYgLs+mDmalY2CTixokhF1GjFHb
-IMVldKrx8LTiWnEWUsW5MK5MlmjY4KKfYz3zmf2QfOyzazCfqfVaizWvmLzx9HyY
-nTWgDY6LZSKL0kska9DyHVfvBQAfpOvVNxI33dLrX2hQDlfK6oQd7XEgiaORh683
-m9wzBXo1aX18R5ikUoF+
-=GW9M
+iQIcBAEBCAAGBQJT5nhaAAoJEC7dUkA7aK9H3qEP/0X39UlSEQevVd/q5fRktjLu
+RtnvqHQokOMIPPhiwe8zGuwxEFs0r4AUf0RNJQp90Jx+35QvCIE2g2tfr52bequI
+aWVuY08zV2qEPT4LxF2wP2EBbK51dJxZ4Ycl8LcfvAcfivwY3sGDZqCKUeaXkp/X
+QjyB2ceMDWn6tHHe+uUaJj8W1hn7SEZjfRbqO337TVAC59r6v3Q6y+HKeVrK2zyD
+ttkcu6fBskfcRjkYNAHndhiXY9OZC184kse8C2sdTV3OmzGQ+bGXyoHPARdZVrhT
+rFbqNrdDduuR595dCt2iC3NyoFHhNkxaU6ZD4YtbDVQS+n2l9mE0/S6oeFHWrqEY
+Cg/1q72Ze/enBRgDPexhqzGngsy1d2jjQrK2NzklLGeAhyHa09yEzcQ+0ddzoZHj
+VTV359FemZICVdnqHST+C0cNImm4Lf0RDb8+FCEreVJUyOl//U46WeHy2JXz164D
+9Hc582FkapdtkkVEnVDli+Z/9FEaBAUw332gT4WtJ38MtzB7CvG1Q4dgN1NLhaxu
+a7pWKbNoM05NgLrxFSVoBcHr9A+5y1/MjFsgi7XGdo+VKveO1o0kZPlLO9AYTCRQ
+Vb0icS0YFla5E7VxqwLyhVN6WTGYm+rV3lKJZ6NWKZ1tIETkEJ+StHxnGTki4Cn+
+qbH8oEMSsswNB0YL62YL
+=Jt1u
 -----END PGP SIGNATURE-----
diff --git a/sec-policy/selinux-ntop/selinux-ntop-2.20140311-r5.ebuild b/sec-policy/selinux-ntop/selinux-ntop-2.20140311-r5.ebuild
new file mode 100644
index 000000000000..42d7734534d1
--- /dev/null
+++ b/sec-policy/selinux-ntop/selinux-ntop-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-ntop/selinux-ntop-2.20140311-r5.ebuild,v 1.1 2014/08/09 19:34:07 swift Exp $
+EAPI="5"
+
+IUSE=""
+MODS="ntop"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for ntop"
+
+KEYWORDS="~amd64 ~x86"
diff --git a/sec-policy/selinux-ntp/ChangeLog b/sec-policy/selinux-ntp/ChangeLog
index b6c5b9e0a96f..3da3bf76b9de 100644
--- a/sec-policy/selinux-ntp/ChangeLog
+++ b/sec-policy/selinux-ntp/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sec-policy/selinux-ntp
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-ntp/ChangeLog,v 1.76 2014/08/08 18:49:58 swift Exp $
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-ntp/ChangeLog,v 1.77 2014/08/09 19:34:14 swift Exp $
+
+*selinux-ntp-2.20140311-r5 (09 Aug 2014)
+
+  09 Aug 2014; Sven Vermeulen <swift@gentoo.org>
+  +selinux-ntp-2.20140311-r5.ebuild:
+  Bump towards r5 (fixes duplicate context for hiawatha)
 
   08 Aug 2014; Sven Vermeulen <swift@gentoo.org> selinux-ntp-9999.ebuild:
   Make 9999 ebuilds EAPI=5 and transform to make master for version bumps
diff --git a/sec-policy/selinux-ntp/Manifest b/sec-policy/selinux-ntp/Manifest
index 8bd37b080c50..6355b68c99de 100644
--- a/sec-policy/selinux-ntp/Manifest
+++ b/sec-policy/selinux-ntp/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-ntp-2.20140311-r1.ebuild 375 SHA256 42aa40efd0535ad2b32761057d56941b32cf43d1952afb9b2d3ea8b59179e985 SHA512 49ae18afaf660c7bfa3518c54c436fe2f5a7ba2ac84ff6553c8593739b4a4d230210b306e74e855df7bfedd0c62451ad54c3bc6336a0953354b1bdd94988f5f0 WHIRLPOOL c69a7ad5ab20fe320ab43de68e78253d4257fd9b11c73d7f913ec168a2c79abe529b1809fad412c59cbb10cb8461b805efa956dd3860e6b9140548e5b99cac7d
 EBUILD selinux-ntp-2.20140311-r2.ebuild 375 SHA256 88a78da8997bbe83cb4541b47f168570b051596fbe76b8f4485d433778076c06 SHA512 6969ea1960ea0611fd821074372ced1e9543cf6c11b48205f2f39cb37e131f43e1a0879fc8495d5ecb3699371c093b0c8f3bec9d7d7094f515502e94902b5157 WHIRLPOOL a0b354e62d3ad0c979b6857d5721e515d75754794c57312a4e3fc8bb681aa74ebbde44bfd91def7445947ebfe5e3f647bbd581f09c10c710f99c1151ec9caa8f
 EBUILD selinux-ntp-2.20140311-r3.ebuild 375 SHA256 dc6ef0ccd8883a9f60182b62194c5ef6fca758d5ae43f11b53f0d9d110664569 SHA512 e6cce4c94e175efd569123a279b386b26fce272f4129e22eeb9fee4407247f4b0e3ec7f354dfbcd0e06c465f20ed7b487a2ab13efb257a582a4dcafe383862e4 WHIRLPOOL 659e336412ecb729b68897bb8b7576f684c743b49495d61bc24ed6add393d38bce28baf289633096eb6cae79521edb051b3e5dde0b485e861797ee46d8699f57
 EBUILD selinux-ntp-2.20140311-r4.ebuild 377 SHA256 bdb53e92874248c418653994c9cb047dc06e7cb028e2d2f0724431f18c8d0f7b SHA512 e4182937f26072cc012ca44d531034a8009ca1b66f9d61f2e6659d0f7b17618a1706d5c6049a4947504b21b0f85985e30822694b8e3bf9bf56c5aa9a915e1c3c WHIRLPOOL 735219c27ca57fda114736d3791373c4c2e05d948e08368257b5dd224b3d5da4c6916d44eb524952044dffaa24620d3cdc7aab75e19afe43b4270f134c5df928
+EBUILD selinux-ntp-2.20140311-r5.ebuild 353 SHA256 01d3a24377f1da936775ef0123ef7f1ce9b3960b1bd6034830ca4e924055d1b2 SHA512 14ea2d0e01b9946340344fe85642b84cc95700ed8ad70c658b6d230572cdc90fe2f5449b72619db2856bc2b03be190df7fe6b668fee18333708b21091a3266f8 WHIRLPOOL a199d9465d611e3e118445a0c19c6ac5ba35f014e8f30d448363ec6cb1b6501dbe07d12b439958efa835c5875979527ece0cac7012381c63269e4bc4d7aca3de
 EBUILD selinux-ntp-9999.ebuild 333 SHA256 0366c5566cbb15dfbf2d09ba1721d517fbb525e42cf0ce2bb2c1372a35b96318 SHA512 15866dcb880e8540b64dfe7e50075df173284772baca78e63d0c5ebfc44185c31ee3a2ebbe9ed6e9180292d6f033a929eb60fbccca7fe9158b8a04b3278838d6 WHIRLPOOL 3fda0d8f95c9d37f1783ca289a2f2ee78791a1e6f04d84125e2c26043833d8beaef9b813f8f69488f7b09e6b28f36b00fdcd4199fffc94118e4ddf14cbf88d68
-MISC ChangeLog 10989 SHA256 2b67a75c2c2770e7b80889b51cd2ef55a0fb1d5b1fc76e349dc78ab3d71b5171 SHA512 ffb969614228f862f69c55f0916999ac6e46c3aca2be32a212d630cfc0a85fee126ca220fdc990c63ec783ec41991ab154c6d5d8c271524ad0436f8160c91de1 WHIRLPOOL 0407b78fe084c9e09312b6c0fcdd6bcf64de76d84181530cc919bb7746c1a67adf31b0b68de1a380c9e42f5adf661a787f8df2ef5a3b031a99a833dca773c9cf
+MISC ChangeLog 11175 SHA256 0e8c86a75ca7bd4d88542b539e38bfea2f106b790dde598b9fe1897c1cbc93a2 SHA512 d44781500350d15289e2173d0d44d837d433256c2327de04280b10a401759937718635a402b119b4205c62a5e16dd75d6ba550dc97ed11a60b88c950fb7e9a01 WHIRLPOOL 8bbeaee2cea2446d77815f573e310dcdd385d6bca7eeb0bfeb51a6a300e7ad19b1d000976a460c61940a0373ae04c29d97141c102416b39d6807bf96582f370d
 MISC metadata.xml 227 SHA256 093e90aa8cafe482821e8e59a6f5becab95fd72972d1a219faf31344d39156e8 SHA512 87d415a61c73b154083eb236f353616d969d27e7194da3101f1d0e7f5c6e9040ba13f3b2f4f1c95f234bf29d29ab9bd5ca5cbdd3ce9b8b9ecc6574572bc358a8 WHIRLPOOL 8ef13080142f396610a6e60c7a36b69903bd4dc49ca41d10017ec964091acfa61e88b02291e434006e26e5a8aeeb7bc16f156c7d1b6bea229981b88cc0106b0e
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0
 
-iQIcBAEBCAAGBQJT5RyGAAoJEC7dUkA7aK9Hg1kQAKLiYi1vDYcebczmRKu6fYJL
-BtWCoFJoC/9Om0GbhkY7rXeM3GH0L5mKkLSn1Gy0tME0i0Q0LRDm7iT8675/316K
-kQFyTi45bojcDHs0Trdh+/GriUTFcqlD2J+jNXyvVbp7oF9IwmbQo5H+xk0zS+bq
-p//eerldb/nJosqXjurr7LwSrnJpC9c9yFSQj6EhKlG83SaJAlYDOG0pTZ65Jvby
-2khvaXnf8YU74u020g4lQ+l4U0HOp2iLd/Z6jFbprgbUPBkwY/RCPTClMjLavkIT
-TzCOaL5TGerplaiIzN3bz4ZetneCYX60nL9m0SjSOjUsDnGN8/ZtKimNfFAqnCdo
-jp/AnuWvCmIzy9e59DPul7i7XINDTbbI3wWliNjrjyIa7U3qOOUXe7TGhov+RRv0
-iBCJL32H/DqcjFOrbEp6fJiWz9y1Ab1xUGyoF6e5xGMOYxQdF/6uYAlS0s0cYr69
-WaXAcklQA2c0774qevpq+mO6cO9uxsHyXLkKirJcgL6E46fLi7LFENvvQntDxCk3
-4D8iAtbCPAK1H/JiZ5YdArsw4NTVUDm3kSReRnGWwmcMZib6fFYSdLkEfmeDfb12
-Fd/J55MRNtiqk5yeFn1FSqLFoP89RD4bfeDahJXoBc6cn9dJji4wHF7jSp/xWCeo
-RCNe0yAYwOfwFffEusMo
-=D/sJ
+iQIcBAEBCAAGBQJT5nhaAAoJEC7dUkA7aK9HfQsP/1WpomSPMDoleqI02XbhsQAV
+dbPV1O5B5vPgEafnlGqRJNOxwdu7z6Z9QrPWP15rxnRIdTgGl0U+KRxnLbU5c5hO
+st5FI7jCm4mGBCtLEDG2pPs5LIE/OvTNyn/sDhdpX9+i46KVRrefUbiXVweCMTaA
+hhWxnI5aL4q8+P93eM7rh0VUr1IM5zCgEkSKy5Zch+h9XZEQASF6La1PvbIujXjV
+Grb0b2kJe0QduJX/UmCCUavfnL+5g0m52TNdgE/6bnoLU+Dn+v4dFIgTTiF2Zowu
+qODCpYlXSXhpIwQO8Ik7N/cc02lZo30Ph1EBVby3Lw0TPmTKAwpB7Jwpb3G97Fps
+GnMTOicgaBhcqQyJYk7X6uzlnDnUF5JhiHgyfJbRaAwRiMneb13j+ai41fWH9ykn
+idd0qSdUp5ieRTE7SPZi4Ee1XkmoThY+DB1Pngewh78aHsp3Jq+H0rqrqa1WXtSs
+fit0el+c/QuNMXOYgzXxAeLEBy31wIhA4kTLJQjcjI+7aD1G7gOQQqOw2XEc6e2R
+97D0bpvCLdFH/+w8PxTLRvrXdfbo0882FDV07jJ4Up6VEbybVI18lP6gwE006jAH
+Bh+4LziDxJJsdMg6R9IV/2OYe2IRx9HN9KhL2AKQsSoiid6qxnFKLJskuz8DP6+t
+CZMk9GpL9ieoRlJ+3GV1
+=x4ae
 -----END PGP SIGNATURE-----
diff --git a/sec-policy/selinux-ntp/selinux-ntp-2.20140311-r5.ebuild b/sec-policy/selinux-ntp/selinux-ntp-2.20140311-r5.ebuild
new file mode 100644
index 000000000000..c34ab0a1de98
--- /dev/null
+++ b/sec-policy/selinux-ntp/selinux-ntp-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-ntp/selinux-ntp-2.20140311-r5.ebuild,v 1.1 2014/08/09 19:34:14 swift Exp $
+EAPI="5"
+
+IUSE=""
+MODS="ntp"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for ntp"
+
+KEYWORDS="~amd64 ~x86"
diff --git a/sec-policy/selinux-nut/ChangeLog b/sec-policy/selinux-nut/ChangeLog
index d5faa058b7bb..e26e564dd86c 100644
--- a/sec-policy/selinux-nut/ChangeLog
+++ b/sec-policy/selinux-nut/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sec-policy/selinux-nut
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-nut/ChangeLog,v 1.43 2014/08/08 18:50:06 swift Exp $
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-nut/ChangeLog,v 1.44 2014/08/09 19:34:49 swift Exp $
+
+*selinux-nut-2.20140311-r5 (09 Aug 2014)
+
+  09 Aug 2014; Sven Vermeulen <swift@gentoo.org>
+  +selinux-nut-2.20140311-r5.ebuild:
+  Bump towards r5 (fixes duplicate context for hiawatha)
 
   08 Aug 2014; Sven Vermeulen <swift@gentoo.org> selinux-nut-9999.ebuild:
   Make 9999 ebuilds EAPI=5 and transform to make master for version bumps
diff --git a/sec-policy/selinux-nut/Manifest b/sec-policy/selinux-nut/Manifest
index 41ff9f683e33..df5f0f602c7f 100644
--- a/sec-policy/selinux-nut/Manifest
+++ b/sec-policy/selinux-nut/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-nut-2.20140311-r1.ebuild 442 SHA256 b9299cfcfc3512665b932b5478ce696cbb90e3c10dcfdf891bf2e20dd3950b63 SHA512 6d84e8960ed2b7ffd4c70a9fe6d02545e9bbd76c9802fa4a819f09282f47163109c6f87f567591765661510310670c0f45baab3cf9a6993c480d0290b9dcd816 WHIRLPOOL 088c0cbc458ac234f33b20b845bd44822ee7e21200ebe48e1e870970b2dab09f607c09bb165f12efaeca524dbcf7bd355342b9d84326ae5e80dc4235e48133a3
 EBUILD selinux-nut-2.20140311-r2.ebuild 442 SHA256 908348823c136a177a8b702d4e53ba60bbb68a4d09ea0a11f3e5f29038692335 SHA512 829e6a1085b2793e1a72640dd0dbe73143466ea4539bacaa1f52e9eb934935b53724e7e3025f5d050e8112819d288a23044e7c9526e120ad28078233a3a313d5 WHIRLPOOL deae1df0bf070f1df0d151592c700a842804ce8418ad5e7a7086d4d1e6d1a60699b13a4a70c93dcfa1df6f19e6c7d5c2684902f7145ac5ba50df5ba70127ef98
 EBUILD selinux-nut-2.20140311-r3.ebuild 442 SHA256 98c1b3d5e30a334e0d686abb0c23121cd5f7e626571971f3e2cfb17131e20ef8 SHA512 79dc565ba91b9a3439951c15b3bd6371c5c17af8f0d6ff47f4578dcb579f6884e2eb44a63a929331f3cdf17f26d761357605fdf17c814a86b1ada3b700b23c24 WHIRLPOOL c1ffc73d76f850f3edff6d383fcb22388a495d2def41e39cdacc36f5c867f398e8075630ea4114b43dd5b0032719a9fa536683f686efa62b60fed6e9a8e14566
 EBUILD selinux-nut-2.20140311-r4.ebuild 444 SHA256 727bfd7ad382c256b0faf31fa6d3383041579f86d3e18a4493247ef7f617bede SHA512 653f2fb76c3b0ae0058960fec86322fc1da77fea7a5eac22f83fdc7581decf09edcf4c4e3f86b41c88ae8ea06d8cbc3c0cd1a779e56c3898ce54639b21c8e421 WHIRLPOOL 1666be544c58d91a410d9834c466fb6ec3be8dfb4bdbe1df542999468aacd53b27d77b94a5c86bc6d0f19186ecb45cc1537b522da92270091265750b32035eaf
+EBUILD selinux-nut-2.20140311-r5.ebuild 420 SHA256 92282c176a60c217653bc98d2f2ecc4f69ae80ebd0e6d78c655ea246aa672182 SHA512 3e93469593ac890d55ea3a7534d0849951c8fb3db74ae9abd6570c3254998897f9fc959cec30c03f1867a5f025d138b35d9c2785fe23351f9d84f79d0151f8cf WHIRLPOOL 2b99804dd18f5495c07088765bed8c183f00a1cdf23b4c1587ce10873365ca6dc7e7617c73bc891cc175464a3e3dd9063a789a8f662f8ddd9f431b14d2db75a9
 EBUILD selinux-nut-9999.ebuild 400 SHA256 9cffa5c1940b786b446bffe823bee70d90cd56bfbe7ca58284999b98a7b46767 SHA512 94928b434557a5cfbe8541a85a8eb72f3181385a347ab5275ecf215d01302674f927a304f6f5ffcd599f77591836e551392838d90bbc85ef61825f24b204456a WHIRLPOOL 2dd029d255a50f7424b1626fcdf9c28e542f6fb356a602c66f8490a70dce49cd0fbdb1b6b77408dcb28f1692bed3160b1d9f3297f084fd571a94cdf2e18c7dec
-MISC ChangeLog 6427 SHA256 e3f6e32cb5069eabe5f0a77b64bfe000d7dac202df0959c28c9e5ec3ed4534d6 SHA512 7ba1ed472e05569cd5a087bc0f738eaddacee51ba8a6e5af154594d11a362ca5a8392fb1ee54f04c910f3b288b732e90367b8067809bb1829888c4f95af1d471 WHIRLPOOL b262a3b565a01ef2d86cfc0d48aa6fb804c1a506b42c50f25c07dc4d345e701b1d4f8bc6c06a84c850502b7cb3eee297164c7a6a352bd30f2565f92c4314b7b2
+MISC ChangeLog 6613 SHA256 23706c7581123f75f665aee0fe0d0753a2b4753a7e80f9b5a1e41a3c4339f557 SHA512 6ecaaf8f64ebe9c14212de01321e8540fd41328c5cab385a0f9d8e24e85548a756a01f03e29d59b400933f2371eb1ae9f07f820fa66ee6561daeda5e8709a56d WHIRLPOOL e332edb476cfb2507d78a007db1ca59738a6322fd3bdf091b46ea73e1ebb9176ad00b3a73dd5cdcb81bd05e3b64ec1e9a7e1c92692d20845e0dbd18bc741a400
 MISC metadata.xml 227 SHA256 1f8a05ede2fedc5c38a8ad8da34f7007ea1c685d91298889a5f48e1282efa568 SHA512 95ed2c8ca6353c8588d7e196d5ac7ea3adc938a062ed9405229efea2645176f658d84a8a3ea7393bdfd26b51d7af48374900e5ac5314afec9fb5fb3ea3bc199e WHIRLPOOL 95e16341b30d2000f0a8255af867de9b5a5f3dcb76c38c371b4b6939bd6a78b50d1e67ddcffb3cb686e88deafa3048b023ae59ef9220883d53768a018f92e03b
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0
 
-iQIcBAEBCAAGBQJT5RyGAAoJEC7dUkA7aK9HrwoP/imMd0dZKzDlWswq4Dv/51qe
-ODuP2Mco9xQYFDv44jeQ1fST8NJniZnbLd3McUiRfMIrIvUOZ7osaiBksuRZ0fMu
-yQpO7n29FMgOTjNGxagiyUEieUk6dUaWWSxbhzOZ4jCuVQAybhZGuSkCia3K2P8h
-Pi3DqMeWfQp5OAJhnYyj2IbqvedryRRGX1SMquoMMRPEbgOoYosSozwabnYYOG/V
-+tsglciIQ31b6ejmLs0CRnGKHDOO5DTnpzUuaF2RTNh2W1gte7OuUJ/9JBl/A997
-7Y5YZq6Fkn34kceAziPpanbHU+E0XgHZHM2+OplC1PKHxZgEfptHvcQCN3Pxv7xY
-yHbOwmAxl+1yYbe1f3AEsq60qcC3LK8ntmgzan3rVSVgAG4EVhHdOzEiiZ8kYEGW
-D/n1Nyk+BpOw2UZGzfCwNesFmv2+qG5SegK2ZzC8s9KEpqNw0vVPiKNfYBTYnfj8
-yQzmHL1o/a9n9bmrGQ155ymp2mXLXZjt4oqHHkqPZZSjEDb9NeF3Z/1jG8G9XxKj
-xLH9xb63qVKXXefLZ24s622RKbX6QKwizr0oeMYvZW/G79qar8ojZ+ZSZeoS3Mog
-kiAusHOhOX3Rh+pmwzBnum2BLktmC7vO/WHedkae9V7RlYdIfyGmvocOj3EZJrbt
-k8iAkLtcgfgWad5SrKmm
-=D1cm
+iQIcBAEBCAAGBQJT5nhaAAoJEC7dUkA7aK9H9hIP/3QuPniCmXqIuqZXHEXRkp6Q
+3JwQyazLnDcHbkdfNRHxDY3HTfGYeaYKW4YrsK5tkm0GrcgqvTJ2NvtBXhvFtSN1
+DJzUSjpowPMQrSF6XCujdgga7N9Lr746azDSs5VURMdmqYtO76K4KjIdUNV5iOxM
+coZPccgHJ5lG+UkUnotM6I/b0PLPduWND4Th9ZdJdZRsdfEwnh44ECXmsd4zDAZ/
+PNANru6P5/4RLK6w08MEdc4YuSiH/vdPdh7ojiNaUOuhi3ReTvj28/lIaxTFMnO5
+k1R10QXHX4f8DQwd6Qc2L45c/xHEGzt4r9MbsD3mpF7p76WtcMfe+ox1kFhJZ3oe
+S7gCHJR47EmWvitbqoO+fm52knsstwmsQZOiodZnWs6O80eaPhniIhweYXCpNdCY
+w5vHbdZf5zwfombgnk4YZ0jOSpZZmIHXweXg00Tkz5owjK2QiGN4oON5Bt85hOxU
+KQEsHnSI/43KsFh8YOgeW8NgBhSADG3XQ9VE2iz37iQtgkp0Uo0SyOpriyVGyDC6
+b6ci4/qlTdy7emBcm/O1Ifmzo3a0z/2wZZYXlu2jIIfVUwYegsBP4qSYgmm/gdii
+OoHguKtp0mJNShWUvExk511t32NeZ5oJJo+R6qMKqymBYQw6x4dvoZ3DilfHA1nm
+DLQRf3AOGAZERnAuNAjN
+=FQeD
 -----END PGP SIGNATURE-----
diff --git a/sec-policy/selinux-nut/selinux-nut-2.20140311-r5.ebuild b/sec-policy/selinux-nut/selinux-nut-2.20140311-r5.ebuild
new file mode 100644
index 000000000000..4ba85c7f1706
--- /dev/null
+++ b/sec-policy/selinux-nut/selinux-nut-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-nut/selinux-nut-2.20140311-r5.ebuild,v 1.1 2014/08/09 19:34:49 swift Exp $
+EAPI="5"
+
+IUSE=""
+MODS="nut"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for nut"
+
+KEYWORDS="~amd64 ~x86"
+DEPEND="${DEPEND}
+	sec-policy/selinux-apache
+"
+RDEPEND="${DEPEND}"
diff --git a/sec-policy/selinux-nx/ChangeLog b/sec-policy/selinux-nx/ChangeLog
index 8fce4461bb5f..d2b7e24da802 100644
--- a/sec-policy/selinux-nx/ChangeLog
+++ b/sec-policy/selinux-nx/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sec-policy/selinux-nx
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-nx/ChangeLog,v 1.42 2014/08/08 18:50:03 swift Exp $
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-nx/ChangeLog,v 1.43 2014/08/09 19:34:27 swift Exp $
+
+*selinux-nx-2.20140311-r5 (09 Aug 2014)
+
+  09 Aug 2014; Sven Vermeulen <swift@gentoo.org>
+  +selinux-nx-2.20140311-r5.ebuild:
+  Bump towards r5 (fixes duplicate context for hiawatha)
 
   08 Aug 2014; Sven Vermeulen <swift@gentoo.org> selinux-nx-9999.ebuild:
   Make 9999 ebuilds EAPI=5 and transform to make master for version bumps
diff --git a/sec-policy/selinux-nx/Manifest b/sec-policy/selinux-nx/Manifest
index a1674f36f1ea..98e2daab418d 100644
--- a/sec-policy/selinux-nx/Manifest
+++ b/sec-policy/selinux-nx/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-nx-2.20140311-r1.ebuild 371 SHA256 28ae833d92e2a8278f8eb6419955012fd2fb7edc5a74cb161334ce59ff392131 SHA512 3072c9d5c4ddbe0b1f7a40c69cfabcd1267002d9255db99fb7036fa58b434898f831789feb219f21ef25474e3f5216b3fb5eeb4d44d72469b8737d4d0f804e23 WHIRLPOOL 44d48d28a7f14998af8a79eaee120b72ea599431a65c9ba740a5add0e499452de0154350556501e55ee2aa707c5052a454fb2c04fabc7afa6b698355d98fd9b3
 EBUILD selinux-nx-2.20140311-r2.ebuild 371 SHA256 c80be7c3e00888aff7961464b5ca251f5d83bfc4e99e3bd0e502d5066bcb9968 SHA512 1bf73085567d6fe9826dc5e9d70abf0b222c72ae27c1e68f198e3e8e0828d3918cb7b428d096d95e78dfe75d6e3d62223c6048c1002262f6f35fe166ddf6d001 WHIRLPOOL ec20c2b20337f1aa298ed488b60c5416e8e899b9737d77834408a8fa0161fcd890765e3dd26c4cf95d768e1a20f7f402395f524e0dc61c756811c00196963b05
 EBUILD selinux-nx-2.20140311-r3.ebuild 371 SHA256 39290088ffa703079ff5f0f8a6a5960385ecae65dc3c6afee5378b09712d9f6b SHA512 abd3b6a9d04348a6f3827181ca53c10416fbfee06e09ac62e1c20a0a3fe792009a2806efee7f70552ca13e04cf220b5e33c9a56a79a57b15528f6af40bc026cb WHIRLPOOL 8450e67ff8709f76035581b78139bef1549ecf4358ec58a931ea039f7d234e4b2b7b4728a97839a42c76ddc9fd75a0e801e1a531f31123f14210da5fd8a229aa
 EBUILD selinux-nx-2.20140311-r4.ebuild 373 SHA256 ae079785029233c5f6cb9155956a6dff058dd1c5e3333e19a49208087aeaadef SHA512 cf708ed2bae9f3f986b2645910a2483189fb77dac1cf10df1693e56058d3ff700aa21f4ba02c6c22ef8efc035c715b9bc60d9c516a691ca5b214ae4358a772a6 WHIRLPOOL 60ebc0449058ee65db5b33cb5379162041e5c72c39cd505cc52a0e2fad4b09a56eef9b32769d8ae089f2a571eba620192fa3280e83c4ee763535effee546a2a4
+EBUILD selinux-nx-2.20140311-r5.ebuild 349 SHA256 fdaef1b8b5766280ee973a78ac33ac43f59da15f56600855cafdf396a02064c1 SHA512 739b2bdbf3458cda67efe29104c7fa0105ac5c0e8fdd11d2793378968d873d006f83ce4c5922d93f9155212e398f04207c49b1affcfa6b39f942b025f677f850 WHIRLPOOL 814c93f59df8445e67c5e0b14ce5d4aec3688520d2f0a1f74dbbc5cc0a6a279353bba4161df8ec14ff587909369682f1d3b86c8b4b5ff943af9cabccf4ecd47b
 EBUILD selinux-nx-9999.ebuild 329 SHA256 f1e70efd1a1026d1fa3daaeb1b328c4b7ca986f7f48142e79d2731a4b3ca53d1 SHA512 dd4b1b92885c43901681401ca5c00956abdcd43ed2c2aaa8ff8ce6cb26df1a815c1c3386a967a143d8c1471823ff5b28358d84ae22e0ed6a2d7963563d59dfbd WHIRLPOOL 9f819c61670448debbc96953e0941c04120d9fb5163b0d0be45224ff52e992b8f8ba4278248b4b8dc8c086c58239633ad8224453cd090250bacb60b93f9a40e3
-MISC ChangeLog 6212 SHA256 1564685b1c2f150c17adce869e9d541b4a04266efd03e9e3ef2835273ae8015f SHA512 f6386dd8ead612f9298985ab62204bd6f93e626147d7138601183bdcb2dabb35aa573724a70d1455451896f1e7a6bfbac20fbfa5629736b55988b2d3f8bc97f4 WHIRLPOOL 8c906b90fc874bdb3e75a6d62d23ab3acb5eef919891db3552b0b9a3692ac317eaf7117ea5303e20c81e44243d854cb5f69f4be8fb3460b726cf4c6fdc32b4d7
+MISC ChangeLog 6396 SHA256 2920fee4685f00b2a69ed33254932626335029d6729690a7865c8174d170e632 SHA512 8ba588be136445ae8cb0e9fbfd782c3b4ff4f3f57e0d18bb17927d4d8c6422f5d8ec9adf662beed1f0a2c3beea02109b1bfbe9e791b4f60228a75f4d4ad48e1c WHIRLPOOL 195f2e8107a4521c2614731161a94c5ca22b05b990a0b58e6511f635c813cf5769e9192bf4b029c1aa34b1f2011db3f9cf2ca94c0dc9cfd8f9a9e64df800f938
 MISC metadata.xml 226 SHA256 e6d663dc965e50232838261a2eee1ed197fd8bffc4397eb6b6b868f070a96be4 SHA512 99a3ce441b39576d9c0a88eecb66acc0f3b3f7fe680a91d612aee514eacdfa2ed53d4cfd3812a9cea60a0d7cd18450ea6fffdb00792b80b75df369a4fed566da WHIRLPOOL 9392b1aecf0a55440e0182ea5401feb6ecd5eca67eb7e991862ad3799214fc9babce58f8c27315b352f65882bd83f8a69c77f88354a42bcde5cbf2057ec684be
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0
 
-iQIcBAEBCAAGBQJT5RyGAAoJEC7dUkA7aK9Hn8cQAIDQKx5KELc7kCxyj8Q3jsL0
-Ivv7Gu1J4E4XMYfnfo5sLXu7k4w6wFc0KcpTT2vE+/7xW7lR5b1V25hkSSdHr1lO
-Yp7vIxgCMdAyB4qWtQtzDufLAwZDHO57GSc4yAZYigvzrHNR1teLFeUqajq9P3ye
-ssSkwymwl3XrolLBklJu+fCZ6/EWZuW8ydjXC8rtu9baqEp+JLgBJWD71VjjB3kh
-ZOqzL8CZrEP27Abs+yofyL62o8pQzF/87I5QI8C35Iwx96tggwRMP8KV+MRjRvgk
-JryjdK/YuVxmv7+G3DRCGcvtx+gAaPHKhGFfM7dni0+pMuH0+EUgK1G1cTYZBrdu
-/3LzPJYLgwvE99Scv4tiYWuWAtTY0zQUoHfUIEIc73wWXtiVgCXviwSWXjAXeuof
-fQyx//mBBo69H6T6x18+bGzboUTgaZLZ8wtA/7CcI0t/X8BbR5kcMFvfcJO8EY+g
-6qpAZ2zky1jfuilLDGrgcsL1z+lsUohjyjeWf7Y2r1h0UOE7QPyVsSLV9QZmmt8D
-jG5vryZ71x6Lc6SC1fIOtCeqB1GPpSnGY6IjeyTyUK+mcfKxni1FPgHosUNK63q3
-OC3RNpNCGx2XZRRzq8Sox4ast1+W9NJX3AEYyDZHvcyoCYNbjV2JWqIFCJ2SmxaJ
-0lylWkNtDQN15lJLZxCz
-=cdwN
+iQIcBAEBCAAGBQJT5nhbAAoJEC7dUkA7aK9HaiYQAIc2kA1NVsH9YwYDpM0CHfnt
+l3PwLds3UQGSrK6PsNiIO5Byyj05kCptyljvovOEHFhX65w8cHKEuHHD9oRFw3Yu
+5A3HRr8eLg03WURRkazP+n1VKYJKGEO25AzHeNVOTfI0RFHAjh+8HXZLJcgAMwl7
+hKy9EDF7aR8CTHOAvSd+ZiSbWqwZX6KwALTJMhcFhpxdYxRiuWr8wJvaMFsPXlx4
+x2xX/6mXxCIYpcdJ8GKmrgUrr9l7vJPEYTJ81+oXtnXk5fw49kTHX7zdf3p+jwmf
+ClokzakdqoZtHB+l3TQ4V+4c1QKjaScLavBLWmeUEpmAfwDbgpGljeXIEmVcpTJ+
++0mVgU5xg4mgvtFru5Y3ltJWKCSnj4WECXa1zRiVyI+iBAI2V1Fa8U+McsGWMPNZ
+7eZqZ480vim9SSCuLXmqxrHh91OhvK+Qw5UTKlZ6hRwDxXlIMQcA7adgh1xk1gs6
+2h5bUvjMQ/qN5ZeqsCn4OI8KEmzykEqXo95qcr/WgTl+wdqZbTlHlIHJIaiJgnj8
+hIsSCRSmMujHLttNLki257+WeIIMESh0ZzNPBws5/Ai+7RZI63XBH2xr9nSTiyqc
+x+pz5vgQjVzA8JdJWCq+XBr3N+Egp5uuwUX92aqtT+Vpbft6NqEgIwrgdgNGvYnD
+R3UM453jbAWWC0Qjd0NM
+=SoyB
 -----END PGP SIGNATURE-----
diff --git a/sec-policy/selinux-nx/selinux-nx-2.20140311-r5.ebuild b/sec-policy/selinux-nx/selinux-nx-2.20140311-r5.ebuild
new file mode 100644
index 000000000000..e427bae84c57
--- /dev/null
+++ b/sec-policy/selinux-nx/selinux-nx-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-nx/selinux-nx-2.20140311-r5.ebuild,v 1.1 2014/08/09 19:34:27 swift Exp $
+EAPI="5"
+
+IUSE=""
+MODS="nx"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for nx"
+
+KEYWORDS="~amd64 ~x86"
diff --git a/sec-policy/selinux-oddjob/ChangeLog b/sec-policy/selinux-oddjob/ChangeLog
index 26593c180916..b13f60a391af 100644
--- a/sec-policy/selinux-oddjob/ChangeLog
+++ b/sec-policy/selinux-oddjob/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sec-policy/selinux-oddjob
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-oddjob/ChangeLog,v 1.40 2014/08/08 18:49:43 swift Exp $
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-oddjob/ChangeLog,v 1.41 2014/08/09 19:34:11 swift Exp $
+
+*selinux-oddjob-2.20140311-r5 (09 Aug 2014)
+
+  09 Aug 2014; Sven Vermeulen <swift@gentoo.org>
+  +selinux-oddjob-2.20140311-r5.ebuild:
+  Bump towards r5 (fixes duplicate context for hiawatha)
 
   08 Aug 2014; Sven Vermeulen <swift@gentoo.org> selinux-oddjob-9999.ebuild:
   Make 9999 ebuilds EAPI=5 and transform to make master for version bumps
diff --git a/sec-policy/selinux-oddjob/Manifest b/sec-policy/selinux-oddjob/Manifest
index 85fc02e1c4df..4b902f4c1954 100644
--- a/sec-policy/selinux-oddjob/Manifest
+++ b/sec-policy/selinux-oddjob/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-oddjob-2.20140311-r1.ebuild 387 SHA256 32539bbb8482560977c836e66c4202b1eb0031a8fbaa1ce76397d8563e36b043 SHA512 b4c314a002214cfd3382220613cde21dcf0654b125cb40abb2df3c53a017da4836972b68669c28f153cb367591692d8a5f30718c515498b1fd410ed9788bab1a WHIRLPOOL 1b0d623e97dc9e4d580f5122e3e005616c7e605c3cf6ca297e93c40e95c7776277206c52a13513f5ee9e1dd9c77a559380bbc54eb6306dcae78749c6ec7630e8
 EBUILD selinux-oddjob-2.20140311-r2.ebuild 387 SHA256 64c18a7cc668a1f3e7e34532dc2add5955c6be3498bbbb7cf59843b3eaa854fe SHA512 e11a083899d23705ff0b0f831d86bf9bab315d9052f6cd3d33a1202e138a61814e4c6e430c6cd6231fe885b912eb990909963db73e4bfb287154d7eb150e615a WHIRLPOOL c6eca0c0890cc97a759bb902028515d317fef01f073c5864f743bc08a50a96e2d5c4ff777bcadc7afc4c0ab4445b1acdad2a08fc4d672c238090c5030212698e
 EBUILD selinux-oddjob-2.20140311-r3.ebuild 387 SHA256 ac937d411c24409adfc664d0cca8764dc45e7ec538f824e9732f8cb72670c6d1 SHA512 488e97a7f00073206dc6ff7f585006a659e59f8740898b539decc5b6198c8dc0797f54d0a3defe812772ebb8b850673e66cb02a0343049e04edea050561c690b WHIRLPOOL 569a2e30e5234c1a33b37b8ef60a31cd1191643828ec8aecf5a4f777a3f948bbade92c2cab50f78f70a5d95c83cf262b83b86c0c8f2ecc7a67e6d605c2412fc1
 EBUILD selinux-oddjob-2.20140311-r4.ebuild 389 SHA256 9205f9f696cf7fc227ec9882b546fd11fb8acbd8f256cd716a0d2a80a93ac258 SHA512 c6878420bf9b8cea9944365eb595482764e86109f859e3df6f55e1a93b7d87a6f0cbe48923a0814131539ca22d8938f6eb312cba2bd50a680f643c880cdf14cf WHIRLPOOL b463099713cd86aaebed7deda8cc27260ec6b7ef97673bbd67de5ed292f55c464f4e370949fbd26984ea7e5f73582b42c7345d3481d5a63012c796183a28a867
+EBUILD selinux-oddjob-2.20140311-r5.ebuild 365 SHA256 6b2c5e007a789202fb1d9ae2ec4885634bd26751ea20a8aa9a7cf36daf684f57 SHA512 c9459a356f09f09fb5ab835ef531c370bcb313679f305cf42748cae0383ff05abe5fd8ce6cca844fc544cb62047f6030a38d4219d0fec42c092b36716d25a3d1 WHIRLPOOL 5ff00b3e4eb877caff58b27462c7892e2017ebb748fbad4eccfc16723d2fa11152b349f2a2f1f7b596f298a7d09ebc2315a7c95c9ba09aa7db84f34a176a546f
 EBUILD selinux-oddjob-9999.ebuild 345 SHA256 df657bc562cfa457175bd905054729233911885d0299df6674432a39919ec4ed SHA512 7771b2ee77b037670069f354535a33845a8ba88cb87b850b360f1c6af27845b22058066c3878d01232376a0c1ccb0c07234cb097dbb49020331c4641448d0278 WHIRLPOOL 7a2c5e0f34450bdc54568cf4c0ce083509b91b7861790405a65c948ca0e2ddee2c55faf304d7061b3ca0d56b6b9d209775fe8c27b5bb1c9cf2fa69201dc152c7
-MISC ChangeLog 6378 SHA256 566fb26790aa91bf66af6a496f425aa9675015251876344977ad13452120e298 SHA512 dd0adaebaba986b91a260276a9c155838cd62bcf415e03dc4e659082453add76b54a10a5da7e6de5c967cddd9f3ce96171b6c9fade85968dba60aa34387c5a20 WHIRLPOOL f51b1077171b11cccafb9fe4122e15440d1574b726e8dd192803ce7fc67e0dcf71bfc6bcc10ec5e7053c01edeb27b33cd360758af382114054bb7cfbe67be851
+MISC ChangeLog 6570 SHA256 8ebbbc7d063e98973165dcacee3058afdf15d807ee8d17aea63fc36e30b1844b SHA512 0804b1c890477214eb72c390af5fb2e81707c1e30402e1d7b70a585d8c90b167f681af682f7216f80e0c4a9d50041e7db8d8f0f956825398dc5fc060707e57fd WHIRLPOOL cbbbe3f31fd35d1444bf789cf9af26f4b37ef04edc5ca935a1d6b609c6f43f933c5219dbf2db94fba49b959c6ccdeae78ad307d2be053879fd40ecebf435e4ea
 MISC metadata.xml 248 SHA256 6ce612c0a115ebcdc40c3036ec9e348b759304bbf0203dd7468c9a0ab83376c3 SHA512 1a5e712b70bd22fee614b33463823c097c4743a853c828c76bf07091269f6c9629fd2026886e918be42e1af5b3f2b33bc2de3c54c06e01c3695c2410a9fcd194 WHIRLPOOL 34fc473b5dc051bc4fecfafcd8d2f16737af31b72672b95bef02b91f08a8ad11960bac81819e2e563ac106d6f0a4f8acc8aee8aab5615d0f3a095dec04fef664
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0
 
-iQIcBAEBCAAGBQJT5RyHAAoJEC7dUkA7aK9HhbIP/jEdsVvSGxJunwp5qY0/ENlb
-m3FE9evBX29G+i6E4e9v5qJjnZvADE62sfgpQZTfrbXldHwg8kzrBm3Duz+NBpD4
-gEBPajLwKihCLcnCpIIGrm7RAFYKp3BQ4ft2c0TMzESYoIY+XirTbbkZ1mV1SlMn
-obA+Z2nKO6sKS4a8GYaAC6nSbWdbgLeg1YJvcZyJXe0w19G98lNCMtc42hXehYvz
-obLjtKOOSJ3P7QDEbsf+FEDCKqG9o+nadBLPJsK8Q5X+761/tb2RErVp2LIXxnyl
-koVHWtM+8eEvgBQ3HmUr1ZLijhv/ZODq0BKXkukHGH8ZXrTg6B5rOZG+WzRRw55/
-Jmd1hIph/ttgf1jUHihldFQXJi6+slvr5SpKLUadFtuWPs7i/hqqFxRJcq5ZE5fv
-ug6xVfe43AUEzFpjz69ZfVzM07gbI+v5N94OmtiL6eEa2ZLI4BBYcY5ftNc5vFab
-/pHRNmf1V4pJ0fDXmcsENpJda/n9Gw40pjMxPJ6I80xKQIhlFB9PPAXLlLdOmxBn
-DKkeL1Xz8auNwVjRXW7fjB8zZcGmKbRsHwjNTvcf3FkHC7awk3BXNYB25bnKdj70
-MeYwXb7qUjnxcv6YCULYGaCjJoG1KL8tSmkk4qM+1dH84H6tVfe4+Yg0fNjk7j8z
-VIcZPBA9kiyION7NaAxI
-=7U3w
+iQIcBAEBCAAGBQJT5nhbAAoJEC7dUkA7aK9HUVcQAKW1p7nEzb2GQecht7blH/k0
+DOW7hLOyJ2IWn5l8A5e7u7S+MIWOXBCfOawZBTNM74MVdhUeZQIIlzU7WPaxRRGb
+PMAtK0kOXU70y1Nf8V/0vcQBnnsY5OGXI9tbG5Crrg6/6xtmKLfulHg8c+0GbEpx
+nlMfsj0Z64XyxaToNGZIUqJ38UNLrIZSuUOd5WnCmCjL8bZ7IrUoTiUtNieyfpFw
+YieD1mwNxQG3vRCT+9t0Fg4bv9HHwYKgSVT5wdVuxD9DkE9FoV3ruyqHCPPi+n2Z
+Ojdsau5kXGoWokN4mmMcIja938YBgWLbIRQz0ZnirHvcx+OkBk0j1mjpWa8z8l2f
++iW4mxd+tVYQpFgU3uU6cIAa+vz6q+brEZJKaH4kIGUYdKcGokf1MGiN5YorkkW1
+nVpEm8IZDAnwlZ5loLueKc50CfgmoEbFqro/QZBs2xU2cfFaSCW6nD4ti+bBMPMw
+2SbJaukxXKEUEQ32NYW8ESvydEIBRJNvgm3Tx+ErVkRijHYsCVYB9qbhIer683Gy
+BWPcQcMHuvLpPHm9TrRElgpfqgIFQuYhlvkydf9NjmSanv5liKHODEySy6/zxs7t
+6+knjQS6u2Z0XJ5WBsn+cw2R4VFXIhHTsIDJB0AiL6nv5jC/E7mWV0qzEMStWjfM
+sY62jRvr4qii8x8Xnnoo
+=B16x
 -----END PGP SIGNATURE-----
diff --git a/sec-policy/selinux-oddjob/selinux-oddjob-2.20140311-r5.ebuild b/sec-policy/selinux-oddjob/selinux-oddjob-2.20140311-r5.ebuild
new file mode 100644
index 000000000000..323ee9a5f1b2
--- /dev/null
+++ b/sec-policy/selinux-oddjob/selinux-oddjob-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-oddjob/selinux-oddjob-2.20140311-r5.ebuild,v 1.1 2014/08/09 19:34:11 swift Exp $
+EAPI="5"
+
+IUSE=""
+MODS="oddjob"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for oddjob"
+
+KEYWORDS="~amd64 ~x86"
diff --git a/sec-policy/selinux-oident/ChangeLog b/sec-policy/selinux-oident/ChangeLog
index 7ecac4f47abd..2da3f2438d73 100644
--- a/sec-policy/selinux-oident/ChangeLog
+++ b/sec-policy/selinux-oident/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sec-policy/selinux-oident
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-oident/ChangeLog,v 1.40 2014/08/08 18:49:24 swift Exp $
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-oident/ChangeLog,v 1.41 2014/08/09 19:34:09 swift Exp $
+
+*selinux-oident-2.20140311-r5 (09 Aug 2014)
+
+  09 Aug 2014; Sven Vermeulen <swift@gentoo.org>
+  +selinux-oident-2.20140311-r5.ebuild:
+  Bump towards r5 (fixes duplicate context for hiawatha)
 
   08 Aug 2014; Sven Vermeulen <swift@gentoo.org> selinux-oident-9999.ebuild:
   Make 9999 ebuilds EAPI=5 and transform to make master for version bumps
diff --git a/sec-policy/selinux-oident/Manifest b/sec-policy/selinux-oident/Manifest
index 45331ba6dfb9..37ed78d833fe 100644
--- a/sec-policy/selinux-oident/Manifest
+++ b/sec-policy/selinux-oident/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-oident-2.20140311-r1.ebuild 387 SHA256 63c0e05196ed701e297da8054a8d6a969e06ada923b3f24b9b255beec794a564 SHA512 442a76bde2530252e6cd19994801f45e77d3c7b8f3f9c7e0bcaae381e309af9ec15e3eefbda971845b0629be717c5749f5f1fbd31150e24d20d42d19ae884cc1 WHIRLPOOL 9057a0de61c285344f81c6c8032543c2917ea187a298b6d3ac48f8ce424f557965bec7fc25dae7d22c5429d84ca9af4d898cf91f9793f3a45178ebfd33ba301f
 EBUILD selinux-oident-2.20140311-r2.ebuild 387 SHA256 145c6e88b3e10f9d546457b1967ec6b0eb13af77b5c8e81c7c1182cf4f6e258d SHA512 6c22082b02e2ae9c4b7dcdd46810738971587243269d093cc5d04a919c2025f47e356b9d8d8ed883fe15c0b3c5854b348b0d8712eb7701e9c6ce6e65a6fe3ddc WHIRLPOOL 93050b7b321f8119ff2b3fb749be98290becf8ad8b49081cf56b487809a10384ae4a36e4ae75ca0097691ac1bef0fb35fc9d5920c0220dab5e74e49dc289872f
 EBUILD selinux-oident-2.20140311-r3.ebuild 387 SHA256 69dc5583a61cd3f5a4efaba910eea2f8b9f567832d7888cedfb17c732f4ed4a3 SHA512 b4faef4f492a7964a021017241de010095920d599a126b58048a2135c897745834f43d16b246476f670bcfa75d4543f7b7cda95057fe88e3bae1de220c4c2a20 WHIRLPOOL b5b6d57a2ecaed8b114f1db3ca92cb2028f10f684d541803ef1f35f35edeb770edeb1fe164b31f180b911a78563b6bf59efd2ae9896469fc1d51e5f7f3a9cf8c
 EBUILD selinux-oident-2.20140311-r4.ebuild 389 SHA256 c378a20fb56bffcc90fa8f0f6b1fa09565ac428bae8b8593950075f4820acc2e SHA512 878c5287d4a752672be8d538f8a4d29ad4e6f79f6106be53dd95c74b67e06651950dd48b1e9ce2cb9cb0cd2331b4cafa99a4350a07740e96ba344cccad9e48eb WHIRLPOOL f5f705a9d353050c9e0078c085f02f5511cba1009e07d5290d085efb10ac5302a9900b052abe054b67437bded3b0496d2db2f8547ef414d288e2b5c6566f6882
+EBUILD selinux-oident-2.20140311-r5.ebuild 365 SHA256 bb04f6015f4181771b64d5a185d74a758e3fc18f084281db641e9dc8510796f1 SHA512 118040c5c12dfb8fb9e0bfcda0c6a03bd42c884d4f77617bb8f783e4288ce497488174cbd3b142c500b79fffb567eae5e8aea15a87fb2c6b15d8ad8788c7f651 WHIRLPOOL 88388afe2febfba7f3eb6d9646aabccca9d3f55c37265ae911dfbec5fb8f35314e6a5eca7b4b2cac6b879c0b2a6ad3e138ba1966a0456cee82225584f5580d2a
 EBUILD selinux-oident-9999.ebuild 345 SHA256 6f88833da5018f56fc2085d98904de1edccedce95a9e92f82fbb90e91b8ecd09 SHA512 46efd32828f7866b22731cf6ef173f462fed0eea4dbb6f7e84378e1ae81039f62f126bb4756099921d12d8369ecad34a54c23245365aee4b6c48c27a8439d4a0 WHIRLPOOL 4052bfda8ec626f0f22a55de02654e3d3d88722e9526b3a978da3b7fe6bd3f4e0751e10de1e29920b8cb01afc29b9c206b4fbb92156557c322cd97208c3711a0
-MISC ChangeLog 6238 SHA256 5d4d6c8a771ca15538de2ad2128e5eb2bdb85ea7f69931e349b5ecaa102a8de2 SHA512 3e165fbf8f372dfa97f77880c558e3c76cfd1c13a946b88ef0a618a370077f3c362bd437c9fa9f7e0dbdebc83c235bef59de50625db8bebc5d6c56a61025079e WHIRLPOOL ccfa543930bfaaf4c118a0a04f6e93a3b6445d70cb9de6e295726cccdf84a26e763a903b235a101bf5294e87e3ce18eec0487e72e87eb99f358e7d9b73c404f9
+MISC ChangeLog 6430 SHA256 a836f70f6756f08732313a53cc8926bee2a7fabbd6d87fd378dd511b35ae39bc SHA512 d434b4c2f10de7b834d22a1bdab5123a758187ac4def514a7275a431a4168b8100fabe854bcaab3ef6d51eb230867351140af840ffa61fcfd21bf28e92e90d22 WHIRLPOOL ec3cb9cfeb164d7a8e184a787d1a1a5939e5cdb8eb105cce1714ff23f5fc87ab0e4ff75926770fa04b1337dc4b1fe384569b82ce95f11c5f1e4f53c1a8392821
 MISC metadata.xml 230 SHA256 eb449dc14aa3d08684940fa3b39fe68679557526a573f285242a8c3be1a7a26f SHA512 b4fbb27c33d499ccb308b80f5b0f47a7612ab668c13b35967f38545e3a219625442b247af8fe2c8f47633aa2737f836635093ef2d916e16d02e1f9fe625c612e WHIRLPOOL 4adcac0afd173fa8ed75ec260b702176cd7f6e13fc123d288fa220f1a701d05bcdf12ce5097caefe737af9dc93556b4cfc13b5de88649d1d55ce1036fa4b9453
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0
 
-iQIcBAEBCAAGBQJT5RyHAAoJEC7dUkA7aK9HubUP/1JuW0Ky4SK2CFSaTlpd5iSV
-N+VwQtT4p/P6takq7js8eHvlcQt+Jd0Vz5gxNfKlnDrSJbs1eOgO7eD5XGtFUtwB
-5bQk9t3LyqadhpXNLn/DpZmgflM+9b4NnOcHofY8/xI8bV85RQzGwAVZcbjSsWad
-4CP6VDMV3UbnYrTxMi6taWKZMpJp0yVfIqwR6bL+YuNEYuhaUxM4AaWpAQAZ/eD+
-H/wXcsqrJIdwajthyoXzAt4JS4FN1ixRRg9X01oCuDD6rI5YEvEl2S5lVVeZNAVc
-knp9iwJ+ihPitIhKzTFQ/q4lyJlvj74wk2Wqbo0/y4TJq2L+q9PCJVY0YLgJchKP
-+JjZZkZ/uATMYtDgQJG8bmBkSF3rzJuIJsIh6F8skdo2DmBcNAwXD2GeGyGJokF5
-hBCqsNI0XpsFlAD5k0Ao6tlw1muZZW7mjNhKdYeOv7FQCO0Txv7n/uSr17MyQqRH
-1dI3wlPs4Zoz4DRjiSHDpnYLBcS3LkyvtF9UVAaxCohmtCC5E1ihQKF5Dgd6NJDF
-nE3cnxhW8miXOxdKesxSmDrM3G2Q70HSKf533MMkVwuk9qvq2YnLd9MQHHi52uui
-BYCkHfZzlMP0kuUfCqZGLA2hzmkakHPuJ/iwxbrEvsJCdMS/shlC+Ve3AhnqHvsR
-0eZshqI1bMZ2aTadCNxP
-=o2If
+iQIcBAEBCAAGBQJT5nhbAAoJEC7dUkA7aK9HCFYP/i7u237q2wieoiyIB94QMW8Y
+OJJGZJono7z3Z6FQol5WKpQKE+b988nsfQaqJXvtXZE/PuzQwjr03uT+piNuR8oO
+sdW6U9VRy3JggyLUjVngQBGXEpXTz92ulOHRUgXeoWpAw2AjrLouw8x7WieOHj/h
+CgtkGj8zH11eOuILetSkIDCDXWHACM9vBXkKiBVG4aBK1QBHumcwskMHtDFyWo4t
+gK2wJqaM0pyRttmuxNTyO3psg37jHiSrd7VTFmFbxIawRWGD+Cykn+Xutv2aqkPh
+3QDAyVoQr8bgAHa9J46KgkbyC8tB6YCMzT+ehshK/MWYBYqy2S1EJTQMaEksurB+
+E4nAfgvGuY53MvS4FZ/IhX23vQYaXBD/6dyZrj9UurhgalQFjbW2/OC2rPA8Znyj
+/d6ozaMZwGIhfKAzdsPD+l095X/25vE41o9t+3/n7/vx1cmSmvajWBTRzssRnMxg
+PCbGDnlTTpw9Upye7eF/cCjuQKd6OhyMZr/tlbRKMmz3eTiID6nKGVx83kBK596i
+3BmRtv5blG1bHMAy109Hl4v9TKQfqXE3CST9ErWm82oR0dHVzeeeLRK+ViIZ9eJr
+hbA1Brkgwrgyvkg0Ti0lgASvTt/mF+EvfYsB71LfTS6oiBkUMJCIF0wynnjUJ5AX
+laX3qHbjR0aaMfXGIezl
+=F9xa
 -----END PGP SIGNATURE-----
diff --git a/sec-policy/selinux-oident/selinux-oident-2.20140311-r5.ebuild b/sec-policy/selinux-oident/selinux-oident-2.20140311-r5.ebuild
new file mode 100644
index 000000000000..c84a7ed800da
--- /dev/null
+++ b/sec-policy/selinux-oident/selinux-oident-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-oident/selinux-oident-2.20140311-r5.ebuild,v 1.1 2014/08/09 19:34:09 swift Exp $
+EAPI="5"
+
+IUSE=""
+MODS="oident"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for oident"
+
+KEYWORDS="~amd64 ~x86"
diff --git a/sec-policy/selinux-openct/ChangeLog b/sec-policy/selinux-openct/ChangeLog
index 6b8bf23ebf80..c77c88c27025 100644
--- a/sec-policy/selinux-openct/ChangeLog
+++ b/sec-policy/selinux-openct/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sec-policy/selinux-openct
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-openct/ChangeLog,v 1.42 2014/08/08 18:49:25 swift Exp $
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-openct/ChangeLog,v 1.43 2014/08/09 19:34:43 swift Exp $
+
+*selinux-openct-2.20140311-r5 (09 Aug 2014)
+
+  09 Aug 2014; Sven Vermeulen <swift@gentoo.org>
+  +selinux-openct-2.20140311-r5.ebuild:
+  Bump towards r5 (fixes duplicate context for hiawatha)
 
   08 Aug 2014; Sven Vermeulen <swift@gentoo.org> selinux-openct-9999.ebuild:
   Make 9999 ebuilds EAPI=5 and transform to make master for version bumps
diff --git a/sec-policy/selinux-openct/Manifest b/sec-policy/selinux-openct/Manifest
index f8f66ea718fe..cc8735afe5f3 100644
--- a/sec-policy/selinux-openct/Manifest
+++ b/sec-policy/selinux-openct/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-openct-2.20140311-r1.ebuild 387 SHA256 44d645c01f78b83505872d6cea950669b96bc65cf2d8249edcda081dfbda25a9 SHA512 1081d715ded419bff4b99f4225f42cb3e1478f4000fe40599732470f972659114ca772ecd4a437300ad77c3ddd36a2bb9599289d3146053959bf26e7cd8aac85 WHIRLPOOL a93dd5eebeb6dc49935f75a32a8080d8fd8bdf8b26592af97bd7960b11031409d36a87f93c2e8cabca1617f3d6350c8ec234acb9d368e5faf5737b1217064a69
 EBUILD selinux-openct-2.20140311-r2.ebuild 387 SHA256 84d2ddcd361dcc79e3008dd1a0611acb05dc849453c01d940d570a7a947d09fa SHA512 3f870ae992b28e6bc3fc0dcf9a7aab2b6dd30dfa24d625f086738343bc73c48b42f047ddb9ccc4e102d10cb45398498bc881133f7a2957c77bd2fef3fd2eebb5 WHIRLPOOL d47406127366337ac040ef65f74911806fa82558ed4e137ffc09456052b014cc5c77078bddbfadbbc41225737bf1c1dedc2404c0245ed0fcd69727a0b252b600
 EBUILD selinux-openct-2.20140311-r3.ebuild 387 SHA256 03cc2bc64597854d311d68e04e7e36ef10d343d90340a898d98eb93f2dad0501 SHA512 03ebf9c080fe8e18e6310a86694d26f79a637ad366c6d3840eb055127be4fca7b8ad38f446826a0eb1702bac35f669241b9b306fe30d4edf9c03b337173883c2 WHIRLPOOL ae0fac347bdb70971d0125447a2e1dc9ec8b4e549343592a2583a5d331d3103408e6a8be1c0ae06555b1c56a30c520648c829463bcb276f8681d735980730be0
 EBUILD selinux-openct-2.20140311-r4.ebuild 389 SHA256 81b0ecb3eaff9dde25baa1bebab8cfe173a2ef9179bdc7a37aa6424bd08d7adf SHA512 574eada0710db36e0fe9aeb97bb0d127e58ddd2be58387cd5e6c74923290ab0ab2fd18ddb2f56a71f9581489edafba403d4db45b89562d197bbccd65c9c44cee WHIRLPOOL 00339b5f484c943d6efb180d5ccf39ccb1229f3128fbbae47be9878a1f81719cbed92cd4d1539260004798a79bc236e701732718c0abe773e4bd22448decb5e8
+EBUILD selinux-openct-2.20140311-r5.ebuild 365 SHA256 0ed27b360a5b8abba62c5006721f0fe7e15e27c5f174238b855c1bbce2394050 SHA512 7c477c13b99358677e3c199e208c6b968f6ef6e97642658e8768391ec162dd5b50069a0e18bfdf880550210b3847cc4b6cfbb351df34fa31832d5cd7f059084b WHIRLPOOL 59321d421b5ff386ecb4d837f82b23d02b8193b4c51c8df7395e71e17cc4e226d69545d07639805f5a19642769f0d325d39e81cd9a489ab546777ba78fe5f72f
 EBUILD selinux-openct-9999.ebuild 345 SHA256 b838a6e747e76e7fb2e151c84a69d978d8a00251a73a556e46bf58da0c6b3f97 SHA512 8ce4fc2034292b180fd89931e6df05047ed28e08b874e0411b8cf7387873df6b81e4ff71ac17dff388b43643ce30f194835ce59eb32003aff0bf8071283a3fc7 WHIRLPOOL 7b57117b8fa03e6b442e59a5fc9cece2ee281977164719de83443214cd3cd0271253afc6cb4d74e836140778426619b8ef38d1b60032f70d975d617045665587
-MISC ChangeLog 6512 SHA256 eb55669f6e3a4bdf134c26dead5b7e455ca42a0759ec6215216a9e38ea9f87f6 SHA512 d85b048e4d5b98581853f0e80a5f07223c697462d10d39dab525bfe9cc1a2569585b8f3f72f005266dc326b3894beef4df7665902052d680998943984dd7bd0c WHIRLPOOL 19b237598e360ef9930642cb501f2b3016018048ff393ec636acdfe9ea80887db7b5c2561cad084ea89b0fc552d42894eef673339def30047617f96906591f43
+MISC ChangeLog 6704 SHA256 712feb318b3e8e928ea2f54f2c9a00a0b5573f3401aa28904feab3573a1b21b1 SHA512 34e420cd825d837fdca42e43c0bdcef4109cc6b73347e74258eb08ffa1400985670df474d47d12e64607bae58f090aee40f362455906ecc4f1d4951a34a96f7b WHIRLPOOL 4cdcb22cfcf9c749e44a69bc0dfdb4ee73ec573eb6d11c46a0b7a2252f3ffb4618833325ada9a7fdf68e5bc89d0cbdc59893c89b009ac298bbf1a87a594a0683
 MISC metadata.xml 230 SHA256 8b7f3e710f9b0ec030a8a25440b6e62702553bd6dad0a9d9bb1881f041364414 SHA512 1e3803111eac800b4d1917ad9d9dcd89f21e02ad13b61306c1d331be44ce079ff18b3116f5f064c3470ad717b5a36ed028c1dc17f53bd9a5106cc5b3daafc1fb WHIRLPOOL 8c828ed1a116bd4beb0db58d1f4b1871f25679fd15a7818d81726a130829ef5ab91f8c3eb33c88e31d847dc6d86ab03fdb840c3517df7d96e4e3b0527429b496
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0
 
-iQIcBAEBCAAGBQJT5RyIAAoJEC7dUkA7aK9HvW8P/R7W54WTL94nCrE8mZZP001k
-Q70MUo3UVTh4aPoXEgACqapYNLggaf8D3jbrPIrixO5IVpham/pruaBjHgzRJAeZ
-YDMC/bgNcvzuUUx9TXdaIiauyYcTQB0qIcxfYiUtza8lsgpxKkb6rsRfupL/uvhw
-8aBl9y45TGeIrCmz3CXi76HuYKrookckTNJg6+vVG7cP1538Gn956jsLtpG5aQL/
-SFKX/pDehziad9G4I+8xq6AxbdVYSiPpoyTOplG7/IqsulgiJt3rf2wSen8Iofvx
-hafrZv1lVnmpROZB85f/uvwFlxDkQXN8Jd+7dEKJaLgH5kSAsrxpmEYcN76q7PAF
-NEpJPPj4SWAalLXZ88n0UQZkmliKGKWDoNOzBAawZYJRjPo50eAIkRJQOYpuEw6r
-A9IAECJbMa3PYuBONTnLqqjaqybKRBH6sxyoK8qiJKXjEqjqGScc9UtfET6fKABQ
-ne8p1QLKw7WbenIdi9Bej2ei4OGRgECnzFbVa59kXFErbJsgkLuBREzKCxGX6aa7
-RjxWOYbDXGIYevdJFN2Il+r6S7EXyUzO3/Fedz25WqBqSducr1A2l0AuYDC56+H0
-geRFkc1INsMpRgTYf1esh5FnY3KGJ19BYKUmEJOzn7Db0ulex/1Z4KzJClgTcxOd
-pJpYmit/nHtsy/9j9Znd
-=NBFe
+iQIcBAEBCAAGBQJT5nhcAAoJEC7dUkA7aK9HMO0P/2QCV2Ij+WWc5q+5iPxk5HHN
+W12TzjKm2euZUvpSr6n4AwCDSt8PlGfORX7Ji4jY9iBtpAYZBDRVbIBaDQKpxYqW
+9+8AbV537kV9zKKkSDFaq19lV+1EtiGZyUdAZQer0JMStUNd+5TIBKPvpDMvvijW
+RpEQVFlkxPX+BAbFoxQ/TIT9K/HG3dl32eR5CM/qomsRNLM4pODvJ7xm3W1Ss4k6
+aZ5F6yt3owDrxvNzAbwmcsjdFq8lt23a8NyfltIsam4+OEa2I85t19o1CkKMjmoB
+WXQzs0DpAYXrtwqXnXVYIv6z0HRWmACpXjvW18Al0gyMGQeDfH1eLZhZnCXsfLE7
+CunRBIwUvQsrtLt4TKbjgfGWw2lTfH9dX5fhnntEonI/iwfjrsECyQ3p1QxgA3MT
+mUz5jJM87ze6aKtersl+dfYOWPoYkzuX6M81/dsk/jjDwOflRZiDZEWsFBUjbEWN
+fZHhmZjylYdne8k7UfUwFyP1qGGNmdz/HB4VdfkbVfHeDjW3uSBeekVlfLOtvFpn
+oGYHFGH5rFjJZW1bDewacn7v9vNd/aDQyxu8Cg1KD7TCaOch6XUc3+9fZApq0MQm
+dUFfgbUKMgPTRUL6xnL0dCXndSwurIBbf97JQLnYouA4BwFZ/qpg6e6aQxxbajAb
+5kkU3eFo5JcbwxFk/VRn
+=GIwE
 -----END PGP SIGNATURE-----
diff --git a/sec-policy/selinux-openct/selinux-openct-2.20140311-r5.ebuild b/sec-policy/selinux-openct/selinux-openct-2.20140311-r5.ebuild
new file mode 100644
index 000000000000..62d5c4aa73be
--- /dev/null
+++ b/sec-policy/selinux-openct/selinux-openct-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-openct/selinux-openct-2.20140311-r5.ebuild,v 1.1 2014/08/09 19:34:43 swift Exp $
+EAPI="5"
+
+IUSE=""
+MODS="openct"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for openct"
+
+KEYWORDS="~amd64 ~x86"
diff --git a/sec-policy/selinux-openrc/ChangeLog b/sec-policy/selinux-openrc/ChangeLog
index ac08ba92ae0c..57f83906c970 100644
--- a/sec-policy/selinux-openrc/ChangeLog
+++ b/sec-policy/selinux-openrc/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sec-policy/selinux-openrc
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-openrc/ChangeLog,v 1.24 2014/08/08 18:49:23 swift Exp $
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-openrc/ChangeLog,v 1.25 2014/08/09 19:34:44 swift Exp $
+
+*selinux-openrc-2.20140311-r5 (09 Aug 2014)
+
+  09 Aug 2014; Sven Vermeulen <swift@gentoo.org>
+  +selinux-openrc-2.20140311-r5.ebuild:
+  Bump towards r5 (fixes duplicate context for hiawatha)
 
   08 Aug 2014; Sven Vermeulen <swift@gentoo.org> selinux-openrc-9999.ebuild:
   Make 9999 ebuilds EAPI=5 and transform to make master for version bumps
diff --git a/sec-policy/selinux-openrc/Manifest b/sec-policy/selinux-openrc/Manifest
index 192d1962d029..a30d8ffdf757 100644
--- a/sec-policy/selinux-openrc/Manifest
+++ b/sec-policy/selinux-openrc/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-openrc-2.20140311-r1.ebuild 387 SHA256 1b91544fedeac952cc8d861d1092542f2427f809e29bc7cb5f2bdce810d124b2 SHA512 343ea8a6269ec8d9377b174bd615659771d83eac801353c27c511bbeec77e56436d90e0dc9377e9b668193f311762d073bc213992909086d424db0dcdb527c77 WHIRLPOOL da9b1b3a7f4ea2eaee30644850434775140b0c1487f235210a8a8141e4c6c02aa9eb0f3d3712cf87f8e33f64c2a6e41c2d5c3dc8c7280b527292c7eebd47da67
 EBUILD selinux-openrc-2.20140311-r2.ebuild 387 SHA256 95060ea869f757ddf264a9e98fc46721f1b0b091c45d58cfc87886566f8ac876 SHA512 562e667c05e8aec8f773441e571da7193c36855e289e5625e360a915e72ca80245b7555d8ac9f6a284bb694336fcf17803259982c72e58fed1eb23004f27b332 WHIRLPOOL 275ba761524d9a5493556dc9235a962d01b3426c07da1d6ec3e440d05cb7a19b232c401148bed7d3f5832467cb1b0c2c15d22bf24a5068c9688fd37a36e49ba5
 EBUILD selinux-openrc-2.20140311-r3.ebuild 387 SHA256 9859580a4c0be5d07e96dac837cc5e8a7d7edf426646abe189a2d001878dab99 SHA512 71c04c58cdfb9eee2d58a9aee1e990a64310e70b40d7e7b83e11c27eee3327044f097a887de200716f2636eaaec07f7bab4c42861c7a30c1f1841c32a49852db WHIRLPOOL bdae9725d4fb9bc839ad3faba990df986b2d677a5f2d88c1b9a5221b3983631d2ef6ac727e162ce49b955db0dc40a042bbf05a70937e6a20bd4d3f51cee29cc4
 EBUILD selinux-openrc-2.20140311-r4.ebuild 389 SHA256 1edb9385e9b7bd4e1b8e7b419e8c441dc1a53a0235c9f7e2f57e6a0945d111d9 SHA512 5bdcc5b14631e0d1bd1c35c4cdb5e71d0fd25eed1c1f6043a333b1a703890aa866ce7f3496caf0f4d8dc8171b0390f62897379f06bff853b7f4d4835810067ca WHIRLPOOL 8a50c080d81d691b20a49c0b5059db3af5839ae4d1aa14bcb9050dd86238cec926fa6553420a721a1c387ca47abb2e4d291868fbabbf40c1a053a95c7e099449
+EBUILD selinux-openrc-2.20140311-r5.ebuild 365 SHA256 8b098b9a9715bab638da18e09e8cd995bc6a152bc121983bb1b97396d809ba18 SHA512 61f114ad392cdbc70500c65e90049fc125fac808b8982db6715f38adaa0b55b475ab9fc5c72c74fb5d898cdd27856336c756f837998c0c390361327418e95d9b WHIRLPOOL 10f8f4f4525349929c1730e603acadbac0af3fd0fa1facc365115e4d86c3ff8ccaadbd7ad30660ed039914f87d0b2419db6483b3fce547e26bd7949a9a167330
 EBUILD selinux-openrc-9999.ebuild 345 SHA256 c728bc480ee18a25759f5d04cceb5033a3c2928e2a4d4885197d4cdee0ac6943 SHA512 ec54cec32c32a2447c76f44b05264698f3eb39e1abee3c429df17d0d8f6bcaca2f7cd94594564e9b4672c3f3c1d780d4ed981463028215db1d9d0f52b9ca8562 WHIRLPOOL 08aea9b414edab796794de55093b33ff94d7a3bfda371ae9389864a704323730f715439d056fd22f4107aae83e733f05fbe2b271664785133a9d21edc3e76bae
-MISC ChangeLog 3910 SHA256 4d6120e63d5b762319e6df63c565f97a246ba80d5faa1c2ea7669e803911968b SHA512 7eae5226d2b1022b227465318e830ac976fec7b89e4caa424c0c59bd24aa5e44316013080dcd9e20b635337bf2395f3a45e92268a55b3f8a14fb6658fef8f876 WHIRLPOOL b1381ddb6a96ca779876452b2457d87908c2b1e7539779d643dc85fea303e0e435cb82da02a8998335dcbc2a8a9be75cc280b362ed77820689c4e1abe84f7ce8
+MISC ChangeLog 4102 SHA256 7cf2ee5b1699d83b8bcdb99a8cfeb50358cc9c4265a233432ad289a41b45583b SHA512 ac6f6035f3d0870ec7c1a26bead4a1f5ac242b689d7ea0d4d6a3a8ff7250a869aa7fec642864d32eadae3a4ac59dc74adf8476a642ea7e2afa9c7457648a8b3b WHIRLPOOL 996c9bd35a55f3cb99bea3b07b3256146768a94c3dad5dde9d3394c0fc9a866570e9f30195408ce5565bf97c5fcca52ab4a70bbf680b76244a924f06ecbe6b39
 MISC metadata.xml 230 SHA256 f0e89e28b12cc2d63cbe786a15dc32fe151fddb5649ff2be89ed13883754e0cb SHA512 f9e4bd842114c9007b0b3b29baa934179ee726f11ed49381e96d82fc5e274de9532b7d82a92a18c0d98e76c9c870e64d3bd96037a5a73707329a9fce632e5975 WHIRLPOOL 61dc5c4ab03b26406439b18c04a83f4f5c9cd3adad885827d608648adc706b6968253dba25719e8f5de2f67e238eee12fbb8ac64974d927ebfc9920daeb7c4ea
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0
 
-iQIcBAEBCAAGBQJT5RyIAAoJEC7dUkA7aK9HZu4QAINB/voIe2FwedlQUw/JU7c/
-A0gkiz1Ne6+0XOHvT0mBmo6jLRFdKJwmy75hzC/oIMd+794OzOC7QrLXkvtmQXZw
-ZsDqI5bLAbHZYyx7+cLkaGy3vIjTX0WPgtFtZ3h+4tCKYv+yxNJ02IGJoJ4pRDw8
-A2SRyjxziSW0wMvEqc4JbFZ6uofgdE+qFQnUisaGPoc9tmZbgvYNQ2e/19/nODeD
-yVg4p9+MbNAQAl3j05aDxWs8uUZBtpnM5q9I7gNHfEv6Gvl5Tfk+RcrrV2yC+odY
-A+LFDJDlqyRTq6GIKNFrgU2vn3s293s1c3dG3AOf38HdehxcyN1VQ/kBDYbxF8j+
-ycPfQflqfnfoe08111L2FWZFf0Tf4UgTSPGM3FUgH7qW+rgT/Dl9W2dZ4CQ3xQlQ
-3cczqCbW16akUa5ouYNFLmTHGkGT0bHvURZKS89OCw2QPaVf3Bk81Aj8iwaig6HR
-FhqpQJgL4dCLyIc0JzwzrI46aS5zUrXtC+d6BJXqaxbX85kOSreYX3chHsVViq3J
-iKM16rAbUGR6V/QBInB/M9BncxCE/aFytJGhOdN4JyxvzOg3IwnD9GJe2RHKvM88
-dERnLiFE1PeCrX/5e7SDCkPidRD6jylBQjljD6HEBKrVZMcQvq0LmN1di9uUw3o6
-8zeUIyoJAIgdE9hyFUT7
-=8RWO
+iQIcBAEBCAAGBQJT5nhcAAoJEC7dUkA7aK9Hlc0QAIIY/pwxKDOmaVS4urvMGPbf
+PAbRBvP1rBA10cZu2GExouptBKKVOGlwJuEROLAPn21w3YK1Z7HrBaqzFelj4nfn
+3fzMR2xgYA4RT6INbzy9zcvi6L0lhu2DY7YBGQhNx4jsVnsbwkfyuqQ2uuERCyq8
+TM5UwVQwVy2aj5zkA82JmtE8Rtx4xcVpMX8sJYjQhVxePnhvWifNuHeWXqYOnMKI
+Zdl3G8KnT5oyyjpH6hAc+U9Eh7h2hOy90E8GteFIsIbnLCeT+DIXLk5J1dkeyDcl
+rl/cN3Pa823o5M23FZSs1WkKmszgfmrTPfVBKgeB46YjWO3cV6476HDYvpZ9MU/X
+c0L+Ul83GesTEHvow2m9PELUp4I3FRscwJstQlUopUm+MG24OHxTvBGz4mbOdGq5
+bss5ed6UEmeUYr37p1S3lhp3EJCqcOEhu/2eiXghzNNH7Jca6obG7FNBEL73MoWU
+4hjJpEtTh9wADte502dB299y3tTXxD3vpFiAup8i6PW3oQbcn93kg6dSxt5L5CM2
+3Bj6MDBbs2T1zjW1xxHEF/u2mawrm/wdoOFRmV0aPe3i6kixJPTiHjSUuDrmBYEy
+bHARrxny7qYSx5Y4lHUhBXhh1G4nH/Hdh7Q/YkVjLh7fFicE2NTuUGbOT/tO/3x3
+oVyN+rLsCiNJ92dBBn00
+=VyF5
 -----END PGP SIGNATURE-----
diff --git a/sec-policy/selinux-openrc/selinux-openrc-2.20140311-r5.ebuild b/sec-policy/selinux-openrc/selinux-openrc-2.20140311-r5.ebuild
new file mode 100644
index 000000000000..7dbc26753190
--- /dev/null
+++ b/sec-policy/selinux-openrc/selinux-openrc-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-openrc/selinux-openrc-2.20140311-r5.ebuild,v 1.1 2014/08/09 19:34:44 swift Exp $
+EAPI="5"
+
+IUSE=""
+MODS="openrc"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for openrc"
+
+KEYWORDS="~amd64 ~x86"
diff --git a/sec-policy/selinux-openvpn/ChangeLog b/sec-policy/selinux-openvpn/ChangeLog
index 6d02c4d260b9..922d472fe3a8 100644
--- a/sec-policy/selinux-openvpn/ChangeLog
+++ b/sec-policy/selinux-openvpn/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sec-policy/selinux-openvpn
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-openvpn/ChangeLog,v 1.59 2014/08/08 18:49:28 swift Exp $
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-openvpn/ChangeLog,v 1.60 2014/08/09 19:34:40 swift Exp $
+
+*selinux-openvpn-2.20140311-r5 (09 Aug 2014)
+
+  09 Aug 2014; Sven Vermeulen <swift@gentoo.org>
+  +selinux-openvpn-2.20140311-r5.ebuild:
+  Bump towards r5 (fixes duplicate context for hiawatha)
 
   08 Aug 2014; Sven Vermeulen <swift@gentoo.org> selinux-openvpn-9999.ebuild:
   Make 9999 ebuilds EAPI=5 and transform to make master for version bumps
diff --git a/sec-policy/selinux-openvpn/Manifest b/sec-policy/selinux-openvpn/Manifest
index 96979aa07255..10a3ff3dfe08 100644
--- a/sec-policy/selinux-openvpn/Manifest
+++ b/sec-policy/selinux-openvpn/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-openvpn-2.20140311-r1.ebuild 391 SHA256 e0279ac72d542cbd1038c50a5f56eee37e463b25cabe85173d6cecd140db4eb1 SHA512 c47a1ac40b86c16f5f5e71497da2ec9eed7b2373fe760f1a9455a0bc223a0a76d3fb5878ece6a6ec3ca40f96e52ced2780d038ac3d1d8ef395a48a35b9bb50dd WHIRLPOOL ead2256569594c9c291f5525287cbb918b03a8060a8549d4b9fcd9c423d691f286b627f93b7c7643455874046af356c0f49be7602d9e1f5f996b711060321a36
 EBUILD selinux-openvpn-2.20140311-r2.ebuild 391 SHA256 b84c03ef2181eae3106ae7a98ddca7e56458122b2be5f8bf327be74bebad3b2b SHA512 6e4004299915fae422843a6b9504f8752e4e8aa2776e35f8a1cadf4ad59c1ead0126469921d58e6ba5faad979aae3000c3d411d940c1c1a587ee262ab6f0900a WHIRLPOOL aef2a2729a48bd8006da1801a07df3cb545192c979f85f2d0dd867cc4b6fa2374f4f07c52326c66e2d7875bddad35bca529ebb8e45f975d6f9b7adee67ef908c
 EBUILD selinux-openvpn-2.20140311-r3.ebuild 391 SHA256 25941a2d5b2af5501cb490d110273f2018ad800a05da69ca19db3c9854477bd2 SHA512 bae4721ec027c1bed58e4e33291859746a01282f08ff73c4dfdb928857d2111b2b894453339d6c9e03af415680cdd03decd6f6d09d39e5306619578cd9bcca9e WHIRLPOOL 642f833dba12b41b682c626e9b30a16a170f911259db44bfeb1e2f83c2e82e664b960a6765e9ebef9850d9f6042c305a4d09cee7477d5b8f10de9293b165a778
 EBUILD selinux-openvpn-2.20140311-r4.ebuild 393 SHA256 9864dcc22f01dfa37141ecadb3f48195207271f97e1ec75d25fc4cc5f78698bc SHA512 f777b129c8a6420c3f604dd889686317858273ef2d327b56d51fd6b619047a05c43e0f69667d3eadf26d20ea9c6564a90820b367b0725386c0825c2895133680 WHIRLPOOL a7ddaf9b0a402160165fa992bffef9da2a29b5f701dd420975114a39a8ee64b470e21a1ac1ae3b850baa51b8ae3b66f974018aabaaffa7d7efa9fbcb32a5eceb
+EBUILD selinux-openvpn-2.20140311-r5.ebuild 369 SHA256 314db159d852bc848cc122fb2202f3623f145a8205f9f667d0d0779b3638ee44 SHA512 0ded90b82b3cf42196e7a543a15b684b4da9f370a140a8573f19820067dc8281ed082c5525fde2e55198ec610e776d71569cb6b7ad511471b774f135d1d72a46 WHIRLPOOL 63f6fae47c632a2321013b6765c87c2de5211b4b9f954158475d6471277fe411df7c7862ea0a2688711a475477e2fab5fca2042b30f090cd890e4dfb101a94f4
 EBUILD selinux-openvpn-9999.ebuild 349 SHA256 9b304ba201e04cc5562cee83b18cd3ccdde3e7a5bef99e5154069449217a35ca SHA512 a31c1e6a9a158291eb02259ba192f0e18bce2fd169e0798b6a67b5915f1fd000baaed79a46f9f0d0247b454791f1fa22368a00f222b8368b111a42c17720645f WHIRLPOOL 401a11b215f785bab6bee0349db22d011f37047b366918daf42674f832aa619478de7f5316b3bfde4d938130356b1f3883831d1eb84417ea4e9dd86140685dc5
-MISC ChangeLog 9196 SHA256 aa341222c365101d332a42ae68fb94dec7d17502fac4cfa7f439aadd75c02b86 SHA512 3bcb86730fc1a50a923fe704c117b62cb54b193ecf6593d51675cc38d5acdaf23ee6fa69db9eb7170804102b33892f0fcdcc8cf0aeeba4a8d945b49db34072e1 WHIRLPOOL 18ce6066b87a7c082210ebaaccb4df3b3a60a1ee246e66775842f0e62d5a7d0f75c04324e7457b859edce794fbd79abdde4db9d5a9f3048ea7b7919ce3603f8a
+MISC ChangeLog 9390 SHA256 7165e3353c3c2c48566a3186e69255e1159a6fa07db9a22eaa65f91055e3b9f6 SHA512 0c80217acbd4c1b75f4517ac744cf9a6d67eaca372699943ff8230f8aa45892386d97836f4d01cc50840f3f8cb2b740b457858ecd1874e4b5acca4a978ecb494 WHIRLPOOL 31d374271caf65f7b7f40590f75794a72886f858652c094aef5b6a3b1b82b24fd13e5c73f7362d0c2b1ada111e406263104b0636f829d87fc562766002314aeb
 MISC metadata.xml 231 SHA256 9fc766be817af9a366fa18975769ac6dff8ff47cd48240a9f5a416c4855a178e SHA512 e001559a56e255f98adc5694e0732b19db4080cb48ebaf745e561c48d2a6bf9466d66ec2ae9c969ef94e095cc8b3db00610aef6e029099327ac45e0a92766a38 WHIRLPOOL 9febb37134937c92ef1a5414105a09439ddf83422c118bf6198b969a7e55d9bd63f55bd4eaa0b2c02fa120409e382dfa09b49017f1fe839f735fbc9efe270d23
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0
 
-iQIcBAEBCAAGBQJT5RyIAAoJEC7dUkA7aK9HYpgQAKKoTrBzJcdIC8d+KyX9o2Hx
-zcyyzAe+6FrKOgvpx0/4JiN1OaMJDMjEB8Bfq9ZwERflrC/DJHVW2NYo3WGd/8H6
-HuRsYmPFwVQV3oD6r4i3riee+y9n4/7pwbj9DtQvJ/D6aq3ze5xH2GTztF81OOLO
-4iXwufiQmPMpaE9ndDQ4L2vdPpgsCs+BXfKNhfi+dNZi1jg5n8LR0XIsFoMec9fy
-NpF95XYo2A+MI7rhA/Ko4TAbm7LvHRIGjcG+JC6I//hvCSbOdTp/N0LbzAElbxAP
-F9o6nbkOuHaExboIPafzJJLEVlWGnSzce8lw+TjKHv/Vgxfd2m+pYvt/Zhx/gSWW
-e/k21h+9R/AztQbHzG5hZkb0YkN6IN2qHjKx+6FovSG+rBjOas325f4PDdtOweIB
-JPPoCjHqSQdz9lcekMy2aLm1YBLyeWI87lYBRjHPoLOQyE7WSqyDZFyOiEO4RTAp
-KLplUm2jcaACPy1ogdz3hBBvgxIEpal9x/Vcl8+k/YuSJB34XialH7elhUCuNzCe
-J0br5C3FgRl2hT0s4l8GIX3CWDUvBIBU7ift7vEr3gh7VKAZHeyOEltBMRBGwWS8
-JtOOE9nkKskeqcQ1xKG+dvx89GMNWXTQGugCpjStZPDZpuxDKvyDDNsUYD9oxz75
-MoiPjZy+2M5zjNCWf3fK
-=6o4m
+iQIcBAEBCAAGBQJT5nhdAAoJEC7dUkA7aK9HoxEP/1DCSO3ZxZYfYlYxxum2rTx7
+p+iNRdiH7Lgf29m/iJOm0otr8yA9dO2mmcbZL1iSTH4pLJC9uF8BqTmj00xFM2KO
+a0yOOaS8FwQh//GR239TtHk8zYkTFwxPABQgqeIKySC63Ewk97cyLCgZ+IAARJ15
+CmnXkWTRu2jxHFYbHxcEwmNGTP++O4V/2xxAd2u7U9+w3GLb7zNCrhgBm7g+GQBw
+Uy7C8kFMWx6wXoEWcNxZoxthdSeIgw8Lhj3qMn4wkIXdvLKqLvmBfc508IhaTpWj
+/YxG1hADPBP1jZ/e1M3cXiUS6BZetGzDlt2yADB7mD8GgSETB2wLyjigmu2SSXn9
+xevhhc88ElBGmNisQBVbUEFkeGFwrLjCsvD1RhscciZIcX95uCvMoWnx+EzPzEr3
+0R7GjXdASLXvfi114B3MRV7bxC9JilR8Sg8KTrcdoqeZ06s0ahL1P5RR8t+eOr5J
+0mqIK7q0YMpikKBTORedOY3K7RQ3RdcbVc1RlL93chIoqIqQgGyzckM8waLHMx/v
+jyPDdLrUlQ7LjKfPcGqGIHuv1b14kI7AC3uSHv8qjKxILOwzMA48JRYWshdXEleb
+NGKeFTyvGWBjW7jUM5JK+6rNzxZ5keV771mfiE4kez5YNyNk/0p4E7ssh05vyXzW
+iPYCjXv0JqRnXLpi6qcY
+=uI3V
 -----END PGP SIGNATURE-----
diff --git a/sec-policy/selinux-openvpn/selinux-openvpn-2.20140311-r5.ebuild b/sec-policy/selinux-openvpn/selinux-openvpn-2.20140311-r5.ebuild
new file mode 100644
index 000000000000..5ecbe04aebb0
--- /dev/null
+++ b/sec-policy/selinux-openvpn/selinux-openvpn-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-openvpn/selinux-openvpn-2.20140311-r5.ebuild,v 1.1 2014/08/09 19:34:40 swift Exp $
+EAPI="5"
+
+IUSE=""
+MODS="openvpn"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for openvpn"
+
+KEYWORDS="~amd64 ~x86"
diff --git a/sec-policy/selinux-pan/ChangeLog b/sec-policy/selinux-pan/ChangeLog
index 24aebbdac90f..ddba059a5b95 100644
--- a/sec-policy/selinux-pan/ChangeLog
+++ b/sec-policy/selinux-pan/ChangeLog
@@ -1,4 +1,10 @@
 
+*selinux-pan-2.20140311-r5 (09 Aug 2014)
+
+  09 Aug 2014; Sven Vermeulen <swift@gentoo.org>
+  +selinux-pan-2.20140311-r5.ebuild:
+  Bump towards r5 (fixes duplicate context for hiawatha)
+
   08 Aug 2014; Sven Vermeulen <swift@gentoo.org> selinux-pan-9999.ebuild:
   Make 9999 ebuilds EAPI=5 and transform to make master for version bumps
 
diff --git a/sec-policy/selinux-pan/Manifest b/sec-policy/selinux-pan/Manifest
index 8562a23e448a..451bfd7e9781 100644
--- a/sec-policy/selinux-pan/Manifest
+++ b/sec-policy/selinux-pan/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-pan-2.20140311-r1.ebuild 443 SHA256 95b1c6f645e0cbee1024fdbb545fff9353a3a8f782c8e28d2f37dfa3bc165a39 SHA512 7d0737b351c06495931d2c10926df102f34c8db4c4b7edd71fda72a5209cd4d0bfb4d6592bcd4d36e2a3f672570a93cfc6b4a47e3b82b936ec488ce7b314475d WHIRLPOOL 1ea1a069060b8e4b08546381315d6e6e0d0b0ec8a99b814eb3989ded985a2707589495a696c9e5ac9633f55282b9fdb15fadee2b825c723e8f83fa554dd48e18
 EBUILD selinux-pan-2.20140311-r2.ebuild 443 SHA256 01159cf8e547a320d27657302810d5418196f3f2bfda5085bfe6e086a8c22d54 SHA512 f91c43a41fa9294a89d5edf47f87f6c56e8ecf620a5f699eb6e69e92356a492b4c4d830ff029f508de57aeaa3e9087a8283314dc5ab50c7876e4becad38de3c4 WHIRLPOOL 40ee87891e18ed7a292ed66d54950bf0562c2cb30f037cc7892286c1c9f85e811a24b132ef1169edadad384ff276e2fb8fa4e2cfe28d06ac7fcd9c59d7dc8560
 EBUILD selinux-pan-2.20140311-r3.ebuild 443 SHA256 ffe88f688d53559b324437c1fd377c3714254a6cde97aa454ad32e7278a48dbf SHA512 a430c2935cf24831393032a8d9e4b7719bea87734615e62aa064dfb28e967f5593f31ebad70c5abeb6b8ba44fbdd715eb82759ddb1c20101f13c9094b24c5972 WHIRLPOOL 35c68e02ce7d3c5be7609fc4ca70b5442adc0690234c8432294a53b71939d222e30571056a9141061ea04664fdba8310d043ea52cc423a7dccfca6f5c79b093d
 EBUILD selinux-pan-2.20140311-r4.ebuild 445 SHA256 6f88fcd96d2b5a2483a16b30870fc8cacc4bbd257f8f9e321b455ebde9dd7c7e SHA512 df72a46e41d4ae03b14fe2f9582bc35682372f8e427d8dea3a7d7a2f0087191fb19ae427578c8e106a32e91d3b46af0b32b6ce1ef925eb5fd1119547ab40a0b7 WHIRLPOOL a78051091885b2b2c2ac69e7364979be013e327b67bc144ea619925bed8a180a28bf87f15e68fbbab2056d0f8d8422d21a95e1a5e88539447e13b4ad0119d513
+EBUILD selinux-pan-2.20140311-r5.ebuild 421 SHA256 98019cdb64938fdb9e7a1606c1e197cbe1755543cde044d8ad146ef4aa2cd225 SHA512 bc57b755f2d7a5ca8897fd6894871e53236f888307e8cc579f702306799b2067298740791d7673bd60298b3a9f50f8c96fe75aaf7fa35670803e507a2e7bfe52 WHIRLPOOL 346e546fe4c5ea9d5d849c97ba08e17b912d0990824f04f1f60e2d698ee6dc8e58ea28fe3e126247e4c93f7d2ae818f654fadb00badbfa1e7daf5b5e47b38014
 EBUILD selinux-pan-9999.ebuild 401 SHA256 dc63061b3f3a7fd04984e20625a967525d44a09e9ca207d54c6590a7ce9d8775 SHA512 59205888e6e19c8854c82ae83ca9a7cf98614ef825f5f7c88eaf4e6fcc77ca9cf0f9bd76caeef5e410005863a3812edac83c56a7e01dd3def3d0a5dd6b12b174 WHIRLPOOL df8729fa8178d3768a34be50a1928da084c51b0eec4ae593597a1e05b23d8da9430c78dd4247e9b9a4985eca1637a2521a04fb7fae5511359b439d1f16244c60
-MISC ChangeLog 6558 SHA256 9ff8c1f392ed4eee31f1e670e98e60e41a8c3796b4881731c2c64e36fa2ba29e SHA512 aaeaab2eb94ca96e5e23afffa69158c6df4386c499f49569b81f7d82d2e29643e241f43f0c543abde13450532494dbcd770db4c14ed14f6fdf6fe0218cfd98bd WHIRLPOOL 43375cac572d2ff04e76cb9769384422174e8255c60839213a8f878d3fe7bbc66a4be16d7b768bce9a9fec7141419503a6ffb6ffc5740e7796e53aad84b426b6
+MISC ChangeLog 6744 SHA256 27bca83ae14c70ba631a81c72e4690d7251a2934e7064ba45107ef1d9b9ed087 SHA512 968ece67e3aafe3e658c9d88d1ddd2da4e336cd01ddceed1836d31eb33a5dc687c6ff0d1b9c516932a148d10ea5f627fac536a25fba9706bd7d6467113a8c4b2 WHIRLPOOL 1ef95c924ad4cc532260a191d1edea4a415f5d6730223b831f56d31d8ee10167b092b0ac3f2569178584342fa36749306292ade37e503f55f3c0154f53e4983f
 MISC metadata.xml 227 SHA256 24d09726e8840a5efb14aa385f75362c2d7718adeade551ba56bf23e77fdf7bc SHA512 8c585d891a44d64ddbca30d66a08621246129a8b9847f592065c50b9ac62d87fab14a9467ffe4734548f110b675a3f88998428c9e842f5a52d993d0406b5ef0c WHIRLPOOL 4bf64f8e756225d7cb06bc14a58e294fde8aa977472fdfe7c1d10a9a85e74e7df6264cb105b29c3a5aa3da6b809f5d1ea62e0d54d7a9c72d98dac9e9e7255338
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0
 
-iQIcBAEBCAAGBQJT5RyJAAoJEC7dUkA7aK9HKO0QAJu8oVEmHo9tvEbrXCGmfbH2
-75qu4KATSTyS5j/V53qEhiOE8y40BHg/6J4xxlWhXvwpWyv+0jj/mm7IKps7ZqtT
-rbs/W1oNraJNJFDL59WFEcVPHkE5aRbQReiyFw5iYvdbHZBl9uNJmgYn9u4pVCu9
-Xh/F+aebvxN6w9ZDRI3/jCquS30YVg7XvvJCC3uCmiZsuityEK5gbnlXZFn4TA8R
-kWIGXcY62SB9gqFXWlzwf7q8fZpZ2/xwE+GsHrs5q5hAu4bMNEC9FA7nBdX+7C0d
-aa5qDDnOZWF+W76XxiFZZ3rTPkaiIQ5MYdeDOI5OUNbp1AjD+JUIrXsK37SA1mz2
-80lIoR7E+HoLzl/wPb5Go6Z6xhLaJYxNmpIwJ+xgPmvOcMRjcbR3zA4FLI+bfsL8
-hBDk/I/zsT2c5pZC6wACR5f9mdxkAOvqQdjTtvlrcx3W8YvHAeG562NDkuKkHUjh
-EhX8B+EXubjm4U9+QfGAqv4yy1Zn51sOelCJF3Qgjv6emF9HFZhIwgyZVmlb2OOZ
-BVwUUiDKuhwqMBPbcgmiQyMAFa15Xc6P1MdRQKp2x34rwUcQej2om9SZjYCE1ZVq
-RK8Zu+We2nsyxPb6yIP3Hbmqdl3S+htbwLkNd0Cuwzd82eVpcvwcLFbpuqgQ+5YY
-hJLT2FKw3ydymrky6AWH
-=joKI
+iQIcBAEBCAAGBQJT5nhdAAoJEC7dUkA7aK9HUCgQAKYsCdN3kJuIeqByILjBUogk
+Bwck+SgUAXZWgVRFGihgqBuRwpkegOROg2CeEE7je3Tb0i1NOHRNIg45jFc1nlFN
+Zr31FsR4HIk5aNkBHJ5ONsDYeD0yiKMxRdrVMGYNSSL3/czBmNRqqjz6EX5FaOBU
+yYSEQHYUvXbCXPIzPYTyTXysm5LPkfhsvZOJwxzRFJucRNBD0zd2jVqP4iAMHuxz
+zuPjeDEq8gLcH6xfWU9XBCrxJb/yRa/A1jBg0lDGP4m2Kwo5GBLAO+HHJ3l35pNU
+UsAyCwuWuIki/pMmcu/t1NnJoWBl0hyOXkAceXgcCbtJ1aE1/mNdEvLbRZOU2Jbm
+tvHSouXzuTApI85NzsiUyDpPOtYnfN3wIgTUNTkhIZkpmYajUaedY2m/gijb+IxV
+ey2HS9LO/cV9YBIWp3p8txCOGZy7GsZ+HSy8fo2C+XRwUkA/t7znt92DKS9QpUcZ
+vghHKnnH6B81C63xdieJpX4uJo8U0cSbo8rlYf3cYaUkLYZ2Pa0fESTHNGswDJEw
+FeQBJG7v2shps4j4KYGCrBQyTsF1/Z4DfRCYy8BBGWl59Z/CbviFYlaZCVMjbAUA
+xJtZL4lbY8Hn05l9da81DqlrXWt0wP4dyy0BPok3GkkiFZyPebharnpDltMsSeoh
+tbUESQLX+KRYYH9FrABF
+=mrHW
 -----END PGP SIGNATURE-----
diff --git a/sec-policy/selinux-pan/selinux-pan-2.20140311-r5.ebuild b/sec-policy/selinux-pan/selinux-pan-2.20140311-r5.ebuild
new file mode 100644
index 000000000000..48cc36e95f29
--- /dev/null
+++ b/sec-policy/selinux-pan/selinux-pan-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-pan/selinux-pan-2.20140311-r5.ebuild,v 1.1 2014/08/09 19:34:15 swift Exp $
+EAPI="5"
+
+IUSE=""
+MODS="pan"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for pan"
+
+KEYWORDS="~amd64 ~x86"
+DEPEND="${DEPEND}
+	sec-policy/selinux-xserver
+"
+RDEPEND="${DEPEND}"
diff --git a/sec-policy/selinux-pcmcia/ChangeLog b/sec-policy/selinux-pcmcia/ChangeLog
index 95a120cd6580..8a294ef7cd3a 100644
--- a/sec-policy/selinux-pcmcia/ChangeLog
+++ b/sec-policy/selinux-pcmcia/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sec-policy/selinux-pcmcia
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-pcmcia/ChangeLog,v 1.54 2014/08/08 18:49:37 swift Exp $
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-pcmcia/ChangeLog,v 1.55 2014/08/09 19:34:29 swift Exp $
+
+*selinux-pcmcia-2.20140311-r5 (09 Aug 2014)
+
+  09 Aug 2014; Sven Vermeulen <swift@gentoo.org>
+  +selinux-pcmcia-2.20140311-r5.ebuild:
+  Bump towards r5 (fixes duplicate context for hiawatha)
 
   08 Aug 2014; Sven Vermeulen <swift@gentoo.org> selinux-pcmcia-9999.ebuild:
   Make 9999 ebuilds EAPI=5 and transform to make master for version bumps
diff --git a/sec-policy/selinux-pcmcia/Manifest b/sec-policy/selinux-pcmcia/Manifest
index e697083d68d0..8646625f5ee1 100644
--- a/sec-policy/selinux-pcmcia/Manifest
+++ b/sec-policy/selinux-pcmcia/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-pcmcia-2.20140311-r1.ebuild 387 SHA256 aac60bfeeb591de4d103d889706a516e9cead6c7f0866f81f0e2bde734a1c993 SHA512 ea4c961564f33465f3672bca1e07499d66cf5008ac18fe9489511301f953f19addf89a5e54102e2e5724dd5efc7f5bd2ccad07d674efa02a9b6c3a50fb08fc03 WHIRLPOOL 84fb3f0d980f83451df6d64fccd1c229b883c23ea2947dd9f6441fa5d2f94cf42b2ee1c80d719fb1e8148d3704249d060a4d5a9217b7bed0be92e2c3f70d2554
 EBUILD selinux-pcmcia-2.20140311-r2.ebuild 387 SHA256 2686fc2da7ce41b45c643499db2a55850d36527c96772d918fc81213535c7a27 SHA512 250d3b7abd125b2e8de73939c10f4fba56fea064690581f518f8f8b78bfbce42b004327105761c2d5c2685dc2aa3eddc1a0b98ddc75750ade74dc25bf2e63f48 WHIRLPOOL 08ed48a9662a06a994766b61fec85c55d09e57057101222873f46f679fda287de8a5c23749750cab976e6770ea60f09163a21addcf7b870371741d834c26498f
 EBUILD selinux-pcmcia-2.20140311-r3.ebuild 387 SHA256 5c82f1939d7dbbafe635ae74c34cf1e552e542e7f1e8acea94a69ae86dfab024 SHA512 b9b052ae28528a501ddfa9f2da9c89cf6c455a6a46b8fb4fdb31f9201afd8a46cd4d23e2bfdec35458add6df5e7372f69399ebbafa6db0814d4f24e7c9a83cb7 WHIRLPOOL 9131048438c92684774f5da40645cf468b72d6084f862ab2eac184b28acff894acef72fa193e5b54852b7f86530c2bf4c3507389d520c324ab1040d3d9b556ad
 EBUILD selinux-pcmcia-2.20140311-r4.ebuild 389 SHA256 686adaddd5e7c92e71f5c55d414cebbf1aa3218f4c26c675410c9daaaee6f2e7 SHA512 24157e0e0098658ec2b9a76a87bc6fa0cc92f45dcaf87ecfbf4fd11ff8827d72d59dfdd04e328331c89748ee326cfd626cb8abb9ffb71d3d2a4e5063e612a7ab WHIRLPOOL 7e36faa0b53f723982917a44bd9bea68525ad5854e6cbc9e76f9bd69b4ee6a197ec4f0155343f87479c511e3f8e10a94a3c1613e01d9c32475acfc9ba786074b
+EBUILD selinux-pcmcia-2.20140311-r5.ebuild 365 SHA256 ffe090db8477c4a05070356072d95c873381b3648f8333c75461560ef39a9ec1 SHA512 8fe2d5dd054cb5542eecaf7d9c6a431e34f7b179d678374ca8205327bb53d2ecd1408f2d53e73fc1b6e6d900eb4c6a4766ce8b07a5a8a43cf3ce591595c232cd WHIRLPOOL 0d455f1cbe1841e9af6bcfc900bdee90129665c05a79b43d628eeda2d443567b5ee91abd18e2df5d715621840ab4823be24c06c9fb1efa550b9ec01f274c4fee
 EBUILD selinux-pcmcia-9999.ebuild 345 SHA256 30a19e3ca7755fb354135c70b84d37b8604537fd5dec11ccb18535b52dd0fd5d SHA512 56cd8a5dccdf6714bbff563f8fa560baadd42a4a8b32dbe26dca11e5567e9af10d06e1a58e457e8e760e498768a37295f92c0dd12b4c42a7363137d19882042c WHIRLPOOL 7433b31e92742751b54250a0f20555aa9e3789636fb7cd65189dc3a3ac7772b70107fcaf2f9cbbfa0534a87ebd37a0672e3dd99be2a741474af20c83f4d742e1
-MISC ChangeLog 8397 SHA256 41cbca3154f73dcebf9538c16f8b504ec50f658ee485aed48dd70df61e4d9cd5 SHA512 1594e3d4ee5e202e49891abd4b2d403a5ebaaa2866905ab892ded3b6f2703159b5f8dca4a0b6d5a5311a905a830138bde4ce1f1d4bec97995b30668cb4f755b8 WHIRLPOOL ab611efb4ecf68c633aac9fe4e596d51b24b2d3cd29eb1f9b0330453be9d684e69a41aea909d0b457affcd553c9031eca720d9688c177f4cfa5c35903e4ce48e
+MISC ChangeLog 8589 SHA256 b017fa87254f435468b1239d8a229723383ca7375dd3ea74aaf2042d6761bd35 SHA512 066ad549df14087dcb7dd3369acd062a16e1ef05451b66d616b5e6f164fb4d396f4fd0247947410e85a50a90402019a48a6759a2bc32f3b09b08ec72c6c7c1cc WHIRLPOOL d78dc6585e00cd50349e4433bf75ba11665c2ed40ba517aba8089dee77e818602af68bbfe0e8595a392620afee89e268a22c9b83a232d662eeead6a41e55e12d
 MISC metadata.xml 230 SHA256 fe042d20b04a0c260cf789869a9570b1caeaf063e159c5f66875f6cc64af76f6 SHA512 fdcb44f5b04a4f53e3222d32c1cb696173d1a5d8e50e8c737b0f3443896fef1ca13baac00edd7c4bbd24db25782bf4f217990defa5ac2ee8f038f12721453f4f WHIRLPOOL cfaf7b9f394a64c405d72598c222b1da29463b885886ebd5ec828b77b21b7ad618a2b38f04336b12418dd6cf1f51798127b92944cea0931bd5f0d9a54819a7f8
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0
 
-iQIcBAEBCAAGBQJT5RyJAAoJEC7dUkA7aK9HVcwQAJwTyQYL0jRJ3F1SxuzyDKh3
-cJrRuvZhgCGRB0jzfGxrqHmTnkHKqzEerxdu8l4NaPbvmj0TNW8boOlfhHkAG9Eo
-MIqO/N/V0SGJhPJhiWCMc8vnXtRb4aM/s2WFqyG3MmwpHnLtIJEWVAux5qloa8NH
-rS/W7xTD8ew7Kd2j1zlxta6r1aunSh5cak6nFsbPB3afUrTTnzcyQwFrsFj7bM6P
-cj5OporqrPMoqjeeSLOTand4op0LWmYteMFSj4cJTK6hEAyUImIQrOq5ncIXpA3w
-FKIqcv5n9YmV4fQMlMrEVo1F7mMPEguBuwKXoxzH3xGpwQnlEo5dSe2t+ldpBUD2
-+2csdx5/qIj4brlntExOlMG2tiUYbRIzA/Nz0Et+IwKjvffeZuWZZ96evLVbq5vt
-Hh6M4eJ1L7S/vJpeH0TsFfPiY0dJYGewjDjTBBRYrJlKiQdKMRd6ybu1EcQLDiST
-7zZuDwSwV6DFS+JFcUzf4jfep2FE7Lx1W7zanYnvl7UfTsY2EdX671FEZIITuP76
-Fnu++/0Pvmzpn0LYlHgFdoeHJ94eAm7va63WM8urDkFUC7ZHs5HSVrKUZ9zlrOpl
-UpDitibdv63/ESf5L7ZmNVTvnu0ZC712V17FKQ8wB/8Fm2mwrXPOlBTTMldK6Rey
-+SBmMfXofsPnlx6g7PBv
-=sZYL
+iQIcBAEBCAAGBQJT5nheAAoJEC7dUkA7aK9HjhwP/0YjHiGf7rJ2RxN0uZsjJ5M8
+7pocES0tGTZ+Fodzr7Z+AfDyPPQpJO+LQpGdUHZLptNEfwo9wZS8s0p9/P2mGOp8
+5/fCrBNz0l1FLRUfY6e/70afuvD3GgYD29RpF+g+JYJ1NOg2Bbd8F0uzf3hU0W1z
+wjaFU6u6FGk4LW6TorcjafMFX9CJ8qDq63gsWAQa7TGqfezeJqnMxxjytb1/Mgu9
+B+SkWKa8dyGchhgf8jWrqNUIxezqDP+PiPg9SIAqMViRxWLzd9Gq7Mg/usOmcTak
+ftNj+fhfhI1WliYeCisQ2xzhOZlhwUzeWGRzbFkf0baztjfzCnMFozbH7rDDNkZ+
+Q9LFG58AXkZ/DUUDRsVMe6G8g2UZ8NyviADSQzbOCc9H7ruxlNZbc4k16XXr5ee3
+DUchB7RcETnXeL0velQCGrsX8KX08H20uEre4blU+3kdwn24B2Qo6I0Dq3aYe0Tr
+LwkqKZINr3sx3tIIS7pXb42DF/yenjQm/nGRyxr4s2CQ13q/CROtMBhDaW1dhKvq
+j7FTvNmeAWVBC2GV0hOCV/nlsAzN6Z1CnC1YUko2+k6DZygH0r8qS0ZzMtY4qcQV
+yJ/+oxPaoJkDuoUMDQNuD/vt5KUbWsHCe+RX3Fpw+BQTrG/w4C+7UYmcKhUk3R6B
+J2hLnYBTjw0LFBjpCEHY
+=U3PF
 -----END PGP SIGNATURE-----
diff --git a/sec-policy/selinux-pcmcia/selinux-pcmcia-2.20140311-r5.ebuild b/sec-policy/selinux-pcmcia/selinux-pcmcia-2.20140311-r5.ebuild
new file mode 100644
index 000000000000..908a2dfac90a
--- /dev/null
+++ b/sec-policy/selinux-pcmcia/selinux-pcmcia-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-pcmcia/selinux-pcmcia-2.20140311-r5.ebuild,v 1.1 2014/08/09 19:34:29 swift Exp $
+EAPI="5"
+
+IUSE=""
+MODS="pcmcia"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for pcmcia"
+
+KEYWORDS="~amd64 ~x86"
diff --git a/sec-policy/selinux-pcscd/ChangeLog b/sec-policy/selinux-pcscd/ChangeLog
index 9f58913924ae..9ec3db02672b 100644
--- a/sec-policy/selinux-pcscd/ChangeLog
+++ b/sec-policy/selinux-pcscd/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sec-policy/selinux-pcscd
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-pcscd/ChangeLog,v 1.11 2014/08/08 18:49:36 swift Exp $
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-pcscd/ChangeLog,v 1.12 2014/08/09 19:34:17 swift Exp $
+
+*selinux-pcscd-2.20140311-r5 (09 Aug 2014)
+
+  09 Aug 2014; Sven Vermeulen <swift@gentoo.org>
+  +selinux-pcscd-2.20140311-r5.ebuild:
+  Bump towards r5 (fixes duplicate context for hiawatha)
 
   08 Aug 2014; Sven Vermeulen <swift@gentoo.org> selinux-pcscd-9999.ebuild:
   Make 9999 ebuilds EAPI=5 and transform to make master for version bumps
diff --git a/sec-policy/selinux-pcscd/Manifest b/sec-policy/selinux-pcscd/Manifest
index 85299920c262..a62299ecf602 100644
--- a/sec-policy/selinux-pcscd/Manifest
+++ b/sec-policy/selinux-pcscd/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-pcscd-2.20140311-r1.ebuild 383 SHA256 dc86ea7f4f14d7db5fa9de4b2fb72906cf29de2139cda4fee14e8ccff211616b SHA512 282da515744876cdff3234060f72e8b88e396a1540e1f27e68eff53cc61af2357b14081d45708b76780c976774224799065d912d83b323937ea5ae70ffc93706 WHIRLPOOL 0150730185aaa8d8d21351a381a81eac357051364647cfbb46acea56d66d60eac1bbf456205e2b1da7cf64de266080cf8c76515372d832414957a11179ad574b
 EBUILD selinux-pcscd-2.20140311-r2.ebuild 383 SHA256 016081fa9f4d0bc9dafb9f1a9c01b7b75158bcb146036cc9ed9318fb432ec950 SHA512 d35f52c5b65efd3d0490bf75176d7e63833d6fc53751b6aca285e6fa36975fee2f44a37d8c8e609d7f99feeb78c4978aab4bf4268c2c54f6b3d7c04db49307b3 WHIRLPOOL bfc70e9b63f222bfc798b6ae33175b56dfa0af7073b2e7bf7d6d39f2f2ac7225397bfe8cae322bbc5cfd551506781fced709ace6d53c9b246daab0e9e8c0e564
 EBUILD selinux-pcscd-2.20140311-r3.ebuild 383 SHA256 875f140ea0d67d46bafe04739438200591b4417112cab064df6afe18c9e71727 SHA512 12e5a6f51ba3674871145b4ac6763754ad444a784280289de358aec8d39e0fba20d135a706ee15866004bb5ac3a1436b64bd803da25206b0f74c2328ebb5ebba WHIRLPOOL a6dcd293a74e13998dd67c57ccdbb69694cbdb3d044fc123c5356c3f9c564cf2fa43505e3371bc74f50f8a0ea7ea1205ce840ac88435c7ad4cfb70a0b043c9ae
 EBUILD selinux-pcscd-2.20140311-r4.ebuild 385 SHA256 ed7b457bc51d50bf06b3be5aa8c90e64946a7bc2a8f5ba781ce865cb306f3456 SHA512 9b950dbf4e4daf359483c842e5091b74d883ab811491d6d1ae91a82661104d4a6a274a96b3514c6e35acb8f963b1df718c8ad18f7dc51e46865fc413ed9738cf WHIRLPOOL 387ea613f6585f30bff51f5b549415c620dc19e23d186825d6c87b2bc76e0856e3f7fd20cd5a77e2fa140c09879ec8a1a1af93ecfb4c21be7478ff97908949c0
+EBUILD selinux-pcscd-2.20140311-r5.ebuild 361 SHA256 a0772bb65f0c9551dafd3a0017aa91d7dcfedc1f6c10833e03effc98cb31a45a SHA512 afc3d2a8031b1cf538108da23d6f009aedc890a64225c84ce93bd19e2f9844017aecb3e2aeb4fe3dde7f006f5644352fdedaab638a3922b0ddfd7f413b8a1312 WHIRLPOOL 5518faf26cbdb265a597a44df53730940ac1a8c942e5dfb4df36cafd46c4a7b9ff9cdbb25b62322939439fe8be7b38324c2416ab9ce5daa16580c3a24ca7f2f9
 EBUILD selinux-pcscd-9999.ebuild 341 SHA256 8176437ddaceb8cf6083e003a8cf3500085a3a6d7b2d55d5f4a7f9d26f6e3d48 SHA512 0aa04600c2bedac7d17d5300e9b058fc46662429481c3cca6aaf2488e4335deb15c8f4a8a4a430c765cf795863655af235d43adbadba306f74977b384b97c4fe WHIRLPOOL e05ada9ff8f00e355c0f86a1ad04952e59e4db45c5947400b98f587a878ca811433f41aa2b06e35955d4b6481b9cf8db49b5b6b3d400ab94d85fec82ae4b71f1
-MISC ChangeLog 1770 SHA256 e8f61a8bdc94a6be4d3dab90c66cf23017538afe5b06486c087a00a024b135d4 SHA512 385825e91631be46b6189b8230d80a9151e98176937e53531b05c8f086b7cad08f8a6253fa41bfe8e589b5ec75d89f0eb72dcc837742c5887365ed6783a88d8e WHIRLPOOL 25cb5c2e29ccda9689128b485befffea31afbf03090ab57528c2dfb04cfc42054a896010a1ec75e57e903a8de0c12dc46726c3cb4c417a4e2748772b7b7c15f6
+MISC ChangeLog 1960 SHA256 32287e3a7d17ce041b9dcf6befc2664000830e86736be3be31a1c80da3f62daa SHA512 149e2fe46c35b3e07421ec7e51b6f746b449f68d62d1b73aa0c192e4ab8d028ac0d72b9ee8631858be51baa0ba0ef0af436d66831c0cca09351c8a83d4a6033e WHIRLPOOL 42e219a7b521295c3abc2aa305d81e2a2b430208fea7e9d49b1bcf62d7002b19b7dcd64b4d928bd0b51e08b33dcd37d2b8a1b20bea48edd76a1c8fd654a56e56
 MISC metadata.xml 229 SHA256 6398c875a778cea523cbb5f0520a0b4f3b98814cfb9dfcccdd255c8c9388f416 SHA512 93c1fea0f0dbfd2143d44d2e727dee7fabffc06d02f9a4a0b44b16f446ed7acd036f77c8f1eb0946eb478c9f7c43834e8f9e8c12361491e174b56df230dc0d5c WHIRLPOOL 6eb9bffed7cb1fd2afd36260921f0cfe1c37d1ab4002061b4c8dc94f3976e321673efa9682d61ed218329191a31a5f8873a58e161e97ef5170768af783390c7e
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0
 
-iQIcBAEBCAAGBQJT5RyJAAoJEC7dUkA7aK9HghUP/3lqRUU5LbUwdOHmKPMAlBQu
-2FmKDIt3OkoOgjiFUx1W46y48GCfB1PJMZh8BcpBCOrsPVgDrKY91HJhxLzyZVtr
-pjTBA4meZFWx9yDFMNt0WrLAzTTcSiWJtrbYGYyKo/yNy5w6BkdXeBjR+y+CK9Vl
-uA3+T/O2VB32qlaFLiL2tCg/dyxy/qTiGBQ3zKxgkJZRICDObQ0pcoBSHrgewibg
-Cr2UC8j1n9gzXHc6eWq9ndhMjQ+qgTGR/7OQl1pzUE17mw9fVXYhQXpsnH0xTvbw
-Y20Aztpz4iqVBMcgCDwYYtlN0RHlRUKomzaBEfpBtqJiDEzTkUuor/Pfsv5i7dNc
-BAf4AEzvJ7pTKuot66xnGyNMTbqg5i7+KVobryRxKZHTSStUA7RbX77W2Nbikxkq
-OSr8pKoVBg/n/JamoB7uo5uzuDAQfdeqYwXC6VHTJRZ846u4N0vzO6lV6w2MLNs3
-yWV9P7sQA2TiKYMP5I5U9EDsr0IZ0u2DrpGhzUvjUtiHXcFCLwxQy59QMAiICh/6
-OdTdBRUZ212rn9o5r28LA70FPrk+d6wH22pnjjyXXV2Op7BctsL4zLwBx8+KHYIW
-cKbrKpsB6CM2+DIJj0Fqp5q9QGzu97reKT95gv6Clt9JcTjQMF0A/ayOxxVurZy0
-6h+LhtnlPfYi4wlELI6Q
-=31at
+iQIcBAEBCAAGBQJT5nheAAoJEC7dUkA7aK9HYJoQAI/p0fz8mKJvZbiQ/OPm8j2y
+UIZhFffdrTgV/S2hPSNjTjkNPFhoi8TIWdz0g8xxgUaNyQrRQG2+lxS8RdTkGAa6
+4H7m459i/OYf+wm5rdwQKs2MfEHo/95GaKXFgE2zT+yQk7GXnQE7OTkbWOE6rNpI
+fymhg5om5A9oiQn0Jz+MjZG6rZm0uQrb15s4c1UK8PZl/GTpa2t3UmihEgTWAemB
+m+r4Vj9DCeWhsZKodZiVOd02ERMrgIlxOaN2Fl8FTjtAeNKnhcfBb3xEJOHmy+H1
+bnK1KHcV9fCMmK4B37tRfBGpEr5vG4PkBolPsLuvmt4JRp5KaIYTZbBT/mDS1VKQ
+DbpZhFhE7y27Nl9oLWcTYjcXDEI3Q+rrUhSYhyfmwATYb6Imr/k2hirfvQsXJo7C
+xAnPZBVRrlOM8XJIuuk/L21nZ9aYF8Ob0JPcnk9PTpLBCEn5KYAecpC2IAuk0/JA
+DwRaySIGmR/6KVogXoc4fCheENcl58kLU8WIMyorehUDMxlusMt9RnsRXNvJZ5eL
+8rGtBOJOgUl2n0gHXmLRuHpOeuE0LnedxNS6OgNDNJhYE73ytvcBVkYmldfXJU23
+iCnHOXJT90wvvhWb9+HhlGVk+1IpvmmeT55nVOC6UBl/KecEN+daL99T5XTQn4o+
+9tEZasPBdJ4GWesKGE8U
+=ec95
 -----END PGP SIGNATURE-----
diff --git a/sec-policy/selinux-pcscd/selinux-pcscd-2.20140311-r5.ebuild b/sec-policy/selinux-pcscd/selinux-pcscd-2.20140311-r5.ebuild
new file mode 100644
index 000000000000..8e4174f1c188
--- /dev/null
+++ b/sec-policy/selinux-pcscd/selinux-pcscd-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-pcscd/selinux-pcscd-2.20140311-r5.ebuild,v 1.1 2014/08/09 19:34:17 swift Exp $
+EAPI="5"
+
+IUSE=""
+MODS="pcscd"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for pcscd"
+
+KEYWORDS="~amd64 ~x86"
diff --git a/sec-policy/selinux-perdition/ChangeLog b/sec-policy/selinux-perdition/ChangeLog
index 391f993b1b5f..9bacad99b620 100644
--- a/sec-policy/selinux-perdition/ChangeLog
+++ b/sec-policy/selinux-perdition/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sec-policy/selinux-perdition
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-perdition/ChangeLog,v 1.42 2014/08/08 18:49:56 swift Exp $
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-perdition/ChangeLog,v 1.43 2014/08/09 19:34:04 swift Exp $
+
+*selinux-perdition-2.20140311-r5 (09 Aug 2014)
+
+  09 Aug 2014; Sven Vermeulen <swift@gentoo.org>
+  +selinux-perdition-2.20140311-r5.ebuild:
+  Bump towards r5 (fixes duplicate context for hiawatha)
 
   08 Aug 2014; Sven Vermeulen <swift@gentoo.org> selinux-perdition-9999.ebuild:
   Make 9999 ebuilds EAPI=5 and transform to make master for version bumps
diff --git a/sec-policy/selinux-perdition/Manifest b/sec-policy/selinux-perdition/Manifest
index 57ea1473a22b..395dfe7e0128 100644
--- a/sec-policy/selinux-perdition/Manifest
+++ b/sec-policy/selinux-perdition/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-perdition-2.20140311-r1.ebuild 399 SHA256 d16bf6c790d66cac5aee54d88e09321139cb34eb73256b6e0985c2b495ac5e0e SHA512 dd82b03aa12934d556aee05c35544fa38c5e03a509458832e0c6c78578a02de7b48dd0ff72e4144123ff52ce98bbef65940d5afced44af1a870b49d3e34d237f WHIRLPOOL 794e093651e16654d38430293c12e57c0f5fcb4a3a0074b7be5e93a59ffd1d4962b376b760713d97e767f668cde17ea1f50840820642e260673b206ef5e9c46c
 EBUILD selinux-perdition-2.20140311-r2.ebuild 399 SHA256 721870eb40eb68f2ec5c2f4c2ea866a5023050373dac2a039c1df061d15d6380 SHA512 c6b346ac659908e0c82bc7b1ac10166138af322535b0741f3658ef49fa275786124500c1d96569d377c2ccb6f09aa1db50a10c9af749768786345a294c427407 WHIRLPOOL 9a61de1b2a86ea8002c54b01dad72af30f385fcee44fb56f327cb66938639362ea4e704a3e536503d4a7f761e25295537871db9ccbe1f439dc4a2689360ae68c
 EBUILD selinux-perdition-2.20140311-r3.ebuild 399 SHA256 b4a71aaf6b7b234e2b34145f18182cae4add3e90fd631931a2159f68ecd9c471 SHA512 3813a057844d39c568d730c95ae5740bbea9c02f26f8136817a023b61b82e5074f3c9c206563782d0d0e7f49bed226371d6815f635061de6c574605143695945 WHIRLPOOL 5624faa11b95c45e5db4d880962307f57c3a5d365619db5d50787532438413a9d4a55c1cf7812289d95d29156b7d2c264e76f70c16e7b4010f6aae022651a3a7
 EBUILD selinux-perdition-2.20140311-r4.ebuild 401 SHA256 cbcad5cde7a348d79dae475d941bccbdfb071c21a73789564c5b2199b0bdf66b SHA512 0ddb3b39c2303c8f8366d7decb72e5f60d799bbb5c3fadf51e028b47ad858426be67ee4e5507ec7632b5c2ee8bbe1b38a1716173b0ec56de03ded1cf2e937d83 WHIRLPOOL 4bc5a4fb8cb57d3f1600c8d053b31cced3ed26d0acf65b74d16982087077207addd8d910c2702910e761a43ddbbc6422019d6198ea9ed411d80e29ef535df8e6
+EBUILD selinux-perdition-2.20140311-r5.ebuild 377 SHA256 7eeddf34651af5091cedfc73478c7e64b8f5ab2b0047baab778b1f697f94ae79 SHA512 b0011ca0bcac14fd9f3b218dad101243ca07a3d83d09191ab960ddd980294109eedbfb15d9ae9183cedecabc46a8db4783e79ae0aee0d1d0ce982cf92148b6b0 WHIRLPOOL ae4918132ee1a35c0002478f27354df7317251721c69f3dbbd693b64e01600ec001475cc4be094554438a904830b6dc8ea30828fb535a72d65801d6f69f8f7a0
 EBUILD selinux-perdition-9999.ebuild 357 SHA256 062ccc5ecddb221bd56de58e871ededa43e9d484e3fd2b3ca3a3eb46111efb19 SHA512 c230d84c08641a64c797f4e6c38423ebd91e826bdf0c77f67f062e9123c760d3f035e565f1fd60804582f860c13e8dd942f2cadf80a43976e0f0d200628f44f4 WHIRLPOOL d8f6f0de9ce4a2c38bb6a59f0b3f2943ff24707b90158c83f4e7549680a95a3a6a85e12d95e21dd95744f01a3e11aefa0b597cf27b91b1fd71f84b9ae6f83eaa
-MISC ChangeLog 6751 SHA256 62fa3344597dbd28eba49da8b9391aaabe20f0f85c928f343b2f3b3a06a8cf2d SHA512 787ebcad8174e3ecb23889d3de88ca98b3e6f89a6fe597cb5f69b4cd22ff1774ca626903926dbdf05ee2c8a53f84fb3a299e9a92d52770b9d01c6b74b217f24f WHIRLPOOL 018472f4898c0b08f65dbc4e6ef050f2996a6018a04758ef72fe8639e72f4bfd2f6a2dab05d75994610ee11c0481e3fd6a6c363d7020c00eb44b830dbd0a570b
+MISC ChangeLog 6949 SHA256 2fc5cdc19df4cfa539ea6311e2bca33733eb45c06cdefc0555dfcb9762f73d84 SHA512 26b7f9a1fb52b92389a3728bda7ba5676ec01f131cf9fb691b3ed5d8ae0cdfedb5a2f42f4830feefdd5c9a92e46a229be23bd0eb9c8cf5e656756a84a2c22fce WHIRLPOOL 8cc9d46a4a3d1ce796f6a128de142bc2e16f48d191113171ba36e0a66a45166ae33c49ee3aa286f32f75071bf35e36164fc6f35044b50c77458cf0ef8a3ecf4c
 MISC metadata.xml 233 SHA256 b0c9a6de868ab822c2da0f23c33776676f19fc1149ac39f3fb85b985b59a47a7 SHA512 4f3a1c7da3cb899613fdad93c6b8045386bb1ef27e7a6af2588ddfcb0fbef7e944b3756d45173c112cfc3c2288c005814d8db1965fcaefc0a3dace53b7df2d80 WHIRLPOOL 94754d56ededffb1b49f22c98a81ec901f6b9291c8c0a73b6ee5073c2b7b6a22230dbfcb7c5880872bbc811148065aa091c6ed038c797093774fa6eabd223777
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0
 
-iQIcBAEBCAAGBQJT5RyKAAoJEC7dUkA7aK9H6T0P/A/qczkYPBKW928bqIE/rtZW
-bMgFh0nv8KpuZ1NuA8s3RcXH0Un9vKBwlwThJNoZ8Us9PmvdZhKsOxvSyBS4KyLE
-G+ZeXyfdIZzQlPchG4tED0Sfh1ov5+/I+jV1nlU9k4Y1owQLNOXcsAbBuoVzHdcE
-BW7rPBo2oZ4saN3bFvVLjlfDetoV4VyhpAH+J0mPBbdTHTDfHQADqCrKrA6j1DXd
-MKoPQMRKcopiqA3B0i01MoNG5BKRKgcGNpwZkkszrVTg5ci8a13MorgykD7nbwtK
-kYbWerwCEES2My60IWDme6xhuVuNnQNZNzkMWM01rHkdpAb5azJ7DGbCxO6RPOpi
-Sl6xE34hK+7hAtt50XxwTmoFQHqHMOTeH5pjEtJnU2AZO/RsQsjKwq92JMfKvfcr
-uV5lyhPtD7XqtcwSayRJedkL68SMetLZiQo/4JXeOxLsM+PL6ynQp2e7hmhPz+95
-ggjHN8BToOLFedpuGU17O60s0BIT9go3FY9fjiIdKNoN45UIsqIqWHM1BxpozwH6
-4LanNQR0XHgh7Vh3348XIHa3n31dd7xydr+Elh1FUqPXWRqRlavB76MHfQuJ6dUY
-LeUq2fd2WkhPG2+aEfh8LI3hp6seI03UrsAI6N0tLePg1AD0Cjye7uS99K/orzkF
-knmBGRgPQuRcLrE2/rWp
-=37K1
+iQIcBAEBCAAGBQJT5nhfAAoJEC7dUkA7aK9H3PMP/1dm3+Helfftj6PSsTsdOKDS
+hLjZu8RU8wejfCLrrS4oIXNMgfKehGDuG2+daYWxLdjqQ1Q4TwGE1OqocKxnGr2+
+X70LtgjMaUNtI7/Uw+3SIL3REt81MgHeMuDC4sDi9pcm/nKG6AK2Sl0EJB6vdQ32
+Ng0eIbEBXYK/i7+X14ks0Gtw1p63z3hOV6ulBiQKtUVtIXLegZ0Zcy36TqWGs976
+5NDNTwK/Sr8u31BIxGzkIk/pOLsbvs0bpfq77x55uhCTRa1/LRApwegTr/fx48G6
+mpibGoU04bxrlJK+Kn63APuWTOUsXpYicf4Y1w/X3OXeRT7xaCaKWUEsPtsPwcGT
+fnVZ/CrjSVdS8Dzw2lX/47FcljoJd4ESC8ahHm6afzvnApStJGFC+VbHhX4L891n
+SbJRvx2El4BUWdTK/KS/ufr/lucUwNpfHjzIklszOY/uTGGmU59NGtNG/c7cRwAB
+g3/ocdq3Rsxx2WKGDVvssHADmAnxcm5h466K+PGbRRgmp8t08PnG1OQ1M+gnpHnI
+dNNoAWwYJ9wFMuffjkV1QAs0B+KwDTIg1peyDZ1DnGLDy3i9RuNTSzK3b0u6RLAA
+eEhYjLgbYfiDdzaFmf0LWuVwD4JQmpgDf8Jsc9YsFugQ88eLWUpOHaForGnkTs4V
+48EB9EITV0qjjSDYy9bq
+=oWdA
 -----END PGP SIGNATURE-----
diff --git a/sec-policy/selinux-perdition/selinux-perdition-2.20140311-r5.ebuild b/sec-policy/selinux-perdition/selinux-perdition-2.20140311-r5.ebuild
new file mode 100644
index 000000000000..bc97219df11b
--- /dev/null
+++ b/sec-policy/selinux-perdition/selinux-perdition-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-perdition/selinux-perdition-2.20140311-r5.ebuild,v 1.1 2014/08/09 19:34:04 swift Exp $
+EAPI="5"
+
+IUSE=""
+MODS="perdition"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for perdition"
+
+KEYWORDS="~amd64 ~x86"
diff --git a/sec-policy/selinux-phpfpm/ChangeLog b/sec-policy/selinux-phpfpm/ChangeLog
index 89d720059257..1caab4a58aa4 100644
--- a/sec-policy/selinux-phpfpm/ChangeLog
+++ b/sec-policy/selinux-phpfpm/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sec-policy/selinux-phpfpm
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-phpfpm/ChangeLog,v 1.33 2014/08/08 18:49:33 swift Exp $
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-phpfpm/ChangeLog,v 1.34 2014/08/09 19:34:43 swift Exp $
+
+*selinux-phpfpm-2.20140311-r5 (09 Aug 2014)
+
+  09 Aug 2014; Sven Vermeulen <swift@gentoo.org>
+  +selinux-phpfpm-2.20140311-r5.ebuild:
+  Bump towards r5 (fixes duplicate context for hiawatha)
 
   08 Aug 2014; Sven Vermeulen <swift@gentoo.org> selinux-phpfpm-9999.ebuild:
   Make 9999 ebuilds EAPI=5 and transform to make master for version bumps
diff --git a/sec-policy/selinux-phpfpm/Manifest b/sec-policy/selinux-phpfpm/Manifest
index 784050b11ec0..86c4f2c81099 100644
--- a/sec-policy/selinux-phpfpm/Manifest
+++ b/sec-policy/selinux-phpfpm/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-phpfpm-2.20140311-r1.ebuild 454 SHA256 26b44bb3f05d5e80304923f943decae4725cc14180aa0099f8b9893abd9df8b3 SHA512 cd7bacb4dc0c8215f6f4903a989a56554155a898d8b83948da8cecbed5ec0ab9e91bdacbb8472a250696d2df49d78ea3344242bb6c44635873480a60c3f977d8 WHIRLPOOL a66f1b9d1fdf398c3a21ac3600b3c6acc253fffbc3d593cc07033e18cee25e5f510ea6bf0c58416b98e1e40818c83f9cb320cd827260acff0ad6bc1796c33dc7
 EBUILD selinux-phpfpm-2.20140311-r2.ebuild 454 SHA256 0d48bce95c9007208297630d5fab91251a6e3e1f4aba4570590237326a89a2b8 SHA512 90306ccfe9075150a997dcaacc23eedd0481ec76153f43f2ea827fc0d64603ea11f2af8b25a2bbbfa82142e179c4b8db5972c9b3132ae844328774d45c5112e8 WHIRLPOOL b5585cba3a76034fc3be827b3bc8acc013ed3e5b1b8dab58187da0d417a05e556223fcbefce38f2ea6831e95733d6ca82b376288265301998e2723bf5c20603e
 EBUILD selinux-phpfpm-2.20140311-r3.ebuild 454 SHA256 25f2f7ef09f384531dab9ed7073c46cac4b3221c2e38d48f156ac782e1c656a4 SHA512 61a9c49d9c7412173fea9ba4eea320716635a31146f2e4a9567471c3248787d168d8a670c4987d6d419977f05fe43a41115a83c7be8adda85c1df433c3250e3e WHIRLPOOL 056e04867c71e80c58ec7354186d9cf44719d137b766637c78f245ab0e0e2c5c6b5e6a7863f692535530d8c5d19992dac7074fd167365f269f4537f945b9a541
 EBUILD selinux-phpfpm-2.20140311-r4.ebuild 456 SHA256 1e94ad89fbb63dc06c28311718a9647c7da155e45208fe4da9072c92d07052a8 SHA512 d20e1dc63ddb74659b9bb9442524d47bc86f71d6dd8476a5efc5a43ab1afda4b9d38447385045a75048cb474a6fe0cf39065265bd33e6ed3f4d8abcf75c4ca90 WHIRLPOOL e6df00b1e29cbe392fef7d2b5802534b396792407e6337fd91332785e18018cf66738b086c21b2c704fab51c7bea688c46bb9eec12e575e7dea6159120b2fef6
+EBUILD selinux-phpfpm-2.20140311-r5.ebuild 432 SHA256 52b3c1d6292435a9272393d8d560bbaf2ad4645c0dee54a8f4d2bda762f12303 SHA512 9e81a9069ca8e5e95fd6bca6e494cae8cdc6ae9f6e0fb63a4ce5b25a57d4935540dcef404c149abd07867d84c37ea19bfdbb55c6685fc212a418840445a7c194 WHIRLPOOL d06b97c8bce151ada2952152c3672d6fe4a07a4c6649959605be31a84a5e9e000e11a3436b9b7ca31f9bd1e5e3b5b7a1cf74f11c4e603a6df371e085dfd72483
 EBUILD selinux-phpfpm-9999.ebuild 412 SHA256 7b4f1d3b46274e3f88c6a0cd2e68a77a6990f36c6e3fd4b02edf7584acaf1ca9 SHA512 14b2241450a75963c96f94d9ab59fccee65fb2e06b056b0a2025dfae4b5844ab842b9749214b3df835c964f944828aaecb23db0bf5198bdc3fe8377bf09d8b0e WHIRLPOOL 437af6fd6cfde2f174c2220ffd9753504bb192e487e6a9949c53be0da2c796525fedb2dee8baf9f1c5305055cef9ef4dafa6762c7991774a35c30c9a47ac8d04
-MISC ChangeLog 5485 SHA256 7ab89715d2328ecbf2316756c51baea0c1cb944caf07aeb0e6986ba23ae54146 SHA512 32d1984a4bfbb557bd392844210b6e1f47e9149eab718e40fac52a0444e3d804a6053596f9c56bb806fd6a4f801c19fe8599c5cb4bd08c21abfefe823ed179e7 WHIRLPOOL 4060059b5bc51729338485ab970ff370ecbe3b33581c38e36feddf9941e090b36d96e162db29d5d0978975a4bfe3e3204467f3b40bb74f26196284a70542f14a
+MISC ChangeLog 5677 SHA256 65329fa52c04f62cf4ddaff80a816717548ee184ce41ead0061812eb5baf578d SHA512 4bdc034121b9af69207594216b50865b90baae4ecc837b1e0024cc509d9d7f430fcca502f020ec8ac3c3653e614db20e56b076a243cce55d558feb2ba4d71384 WHIRLPOOL 747ff78e621dbf6f752fba2b6bd7cb761230f5a1f7495bb7d344f86f34289361cec5dbd5bd9a869937e490afb2f21843d67bd1f47e28671f35b6c85f396dfdf3
 MISC metadata.xml 230 SHA256 c5763daa5fde303eb913cadcbd6981e93fda02f3143972cb041b7503ae2e8588 SHA512 4092bf23225d185bd87010bde59b5710072b71f6c1762457397a66af4f1f8a4c22c0bdcab3b5ca09dc1f257249931dba918625efc2ae7a026d21ad9df03c2df0 WHIRLPOOL c5be363d8bcee9a9361ab300b8a54cd3c0c4557342ec00408181e4d36fa3ce07b3f9041da7da719698efbeb896955c5ed149ae79e22acae23e9c3a4fa3539a53
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0
 
-iQIcBAEBCAAGBQJT5RyKAAoJEC7dUkA7aK9HxxYQAI6qo/3YpgyQtSuYiOoMvKyg
-AzqL8/g6dFXdCesHx1I78Jvb9HoqlIxxDdg4JkrclezthEU/mDQSGez4eU/qCgS3
-ltJMYvM1Oa/Ap3IxZ9fYeVoDOrBT3ZZ04vLheI7VmxDlZTqnI6lmJaTdm/io00EJ
-sC99eWoe2XVgTBlKL5WmRGIDEo8KrKLpDnchq8UeVpAnm7yA9cvs6hYzXyS/lahZ
-tXsNjJCmuIxTInAgoli7cEU54ToFU8gW5VwTrIt0Swa0OsYSrQzxHE1xiIcjHPMC
-KpeWj7svaHiSh/RKOhV5c9eyT3V3MhZgIa0NrEH9kImeDUUMf0Y3LvIgyBSWLaCB
-p4b16iduwyqMjamhFpAoFVzbadB6WfkcZhqSiaxig57fM3IN0EtfQxexLbNq51Iu
-gf5M+j1PLu5XXblCRf9YpD+jPPRgHD9jnkNBODQT8u61Gp2R7WnCzHcBGDjxV76H
-p1IbMBbToCP/XcZzP+AHL0Bxtjiw+Zxm2Ft+K/wYOZCZHdkrxfJnvXlJUNUT7ya8
-9NNNF7L4b/XgloUh09qVQAJjX56r8z1w7psdlsWAWYfF/NFVJeJSSZCGLquYJLFq
-RzqBzHwDrvsvI01yRw1pFNJlJLTJJXN4oLoXYfaY6ZgyRQsIEPQ2Uz5J1lPeFcgO
-qhF2rbMqN5SucKlTskwn
-=ZMBM
+iQIcBAEBCAAGBQJT5nhfAAoJEC7dUkA7aK9HbqUP+gORI/kjyR7+CL524+p/C/W3
+ANPOoB+m1eA+cXVdBrOdWK1IBGQ7Y/Zf2CyJh6uSGSHaJ77pPX7fmkNZYhMapmB9
+O7sxnKjQttNz0U7weR9mcjAm6Kl8k6okY3g4je2m9t/Uwg7e8QWKUNeXHdLPTYO6
+Xbz5DfLzvIXkAHOZV4CD5IheidkYD6Z3jle5FbyEip55yuVlVK7ZNLXoWSHpeCoi
+iB321OHcGp6l6PdDefqK7xXeSwaUXsd488LgJYyslMSfgmOqd8xN/4KB9eB4jzHn
+bww6NZm/GZd9PEU89yBWTLqBQnOSBC/dyWFQWhSX/W93pSAAUDmOpBBBXGf83VIS
+g1Na8FsMzMZBqjBwJRy4GE78vZvZ4tyYxYvYyn/jhLl21mqmR30Q1NW7JR75wHDt
+H9561GzgQ/aD/jjtdCeYFT0x8gCkTNeUaBu86zQOqMtM/nSIP4jZV/1stfD3Mz4c
+2Rwe00Om4PFskuYdEEyCp6YP3jZ6YMOe7DpACJvfONr37ey/+8xsCOyXtwS673PT
+yHPa9ocb8qn9l0nYvXkLqoLNnk89p3tqpq2KrEnXHMflElX8nM3VkR9TQ5JXFUuy
+88cCQQOWwRwHCo0UbZAhhinHU0+CpF0372bZohB4TOru5Q4bIT1DnqCXB7XJ1JJb
+Q5RBUhPQwjk9zpODboLg
+=UIkI
 -----END PGP SIGNATURE-----
diff --git a/sec-policy/selinux-phpfpm/selinux-phpfpm-2.20140311-r5.ebuild b/sec-policy/selinux-phpfpm/selinux-phpfpm-2.20140311-r5.ebuild
new file mode 100644
index 000000000000..a2138c1dc16c
--- /dev/null
+++ b/sec-policy/selinux-phpfpm/selinux-phpfpm-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-phpfpm/selinux-phpfpm-2.20140311-r5.ebuild,v 1.1 2014/08/09 19:34:43 swift Exp $
+EAPI="5"
+
+IUSE=""
+MODS="phpfpm"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for phpfpm"
+
+KEYWORDS="~amd64 ~x86"
+DEPEND="${DEPEND}
+	sec-policy/selinux-apache
+"
+RDEPEND="${DEPEND}"
diff --git a/sec-policy/selinux-plymouthd/ChangeLog b/sec-policy/selinux-plymouthd/ChangeLog
index 7904ba3622ac..e6a8b318880d 100644
--- a/sec-policy/selinux-plymouthd/ChangeLog
+++ b/sec-policy/selinux-plymouthd/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sec-policy/selinux-plymouthd
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-plymouthd/ChangeLog,v 1.40 2014/08/08 18:49:56 swift Exp $
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-plymouthd/ChangeLog,v 1.41 2014/08/09 19:34:05 swift Exp $
+
+*selinux-plymouthd-2.20140311-r5 (09 Aug 2014)
+
+  09 Aug 2014; Sven Vermeulen <swift@gentoo.org>
+  +selinux-plymouthd-2.20140311-r5.ebuild:
+  Bump towards r5 (fixes duplicate context for hiawatha)
 
   08 Aug 2014; Sven Vermeulen <swift@gentoo.org> selinux-plymouthd-9999.ebuild:
   Make 9999 ebuilds EAPI=5 and transform to make master for version bumps
diff --git a/sec-policy/selinux-plymouthd/Manifest b/sec-policy/selinux-plymouthd/Manifest
index 7d759bfba5ed..10e3da89545d 100644
--- a/sec-policy/selinux-plymouthd/Manifest
+++ b/sec-policy/selinux-plymouthd/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-plymouthd-2.20140311-r1.ebuild 399 SHA256 ebd3fe5a5e5e3c5a75f203266a2393933f2ae13e0af2b40729dd28619ad725f1 SHA512 667ad28839c6eba016844c6f9554d3374a11591ed02952182c4ba75866578779da3c62518e92483547d74c58e93807cfe7bd53a6a037e31e6342927ab3ad1946 WHIRLPOOL b3be87ad415af3fa5a228ae3875758ec17a639fb0084e55a098a1c26facbeda864d42fe9e905f1d08e6dab2209309d8a8e68062002753d504f2d4647bc6a4e26
 EBUILD selinux-plymouthd-2.20140311-r2.ebuild 399 SHA256 543d39bfb9fe36530d23b3eeaa1ba8db7281cfeb246853e91885dff275ad0d0a SHA512 85bc9d9d67773c0603e19295fd5a262e8bae3c2a2d402ffac7dd64bfc66acf1a98ce86e1418badd86a8d254c40abe3d3ef8574e90482975f7e66334b6a8200cb WHIRLPOOL b002fd8bdd1a4333f4e663c653c2fb628bc4334cfae7f2e65b2a3ecff473d4502ffab6c05337b6e29650fd83ad2c5d05ba3d4e9242f9386770e99f538466f940
 EBUILD selinux-plymouthd-2.20140311-r3.ebuild 399 SHA256 5578cf064951e650767b7c44a91a18545582b0be3dae408c5b0346ef74e3b8d7 SHA512 7e573538e6dc28d8c0db7c95405f28ed5e2de7deef4ce9669894f91a093a7ac6359c816cd4546bf06acc9d1b3ee71029d47a98402ed16bbc1ffa8a33caef2b18 WHIRLPOOL c250ec285917e83b37db389fbfca56e8323c75476fd124e5e317902babca433a28cdb39d7468af8932338b24b0289c952fb43032bb4ae0a48edd0731e3b572de
 EBUILD selinux-plymouthd-2.20140311-r4.ebuild 401 SHA256 d3a4c6c66179da54aa9e676bd0a89d29305fe68fe605e060bc92ebc11cc63a08 SHA512 055be1cb9d6dad0cbb7921c6367f1d324c4ec4743f576fcb878aa042b6a0cc8e53ce8bfabd64dd669977703e46a316904e29a2d7b08a81d8a2b9ee673dafd3fa WHIRLPOOL 589eca24085c3928f5baa51dc0c09fc1cf865f6447bb301faba9c8d1c590de4537bf08726ec32d838ab4e39b662131b796ab9bd65c35c6913244ceb04aeabf25
+EBUILD selinux-plymouthd-2.20140311-r5.ebuild 377 SHA256 ab708c6c340e1209d1b65211dbaa8bdbc510154bfacd093a975cf929aa93d54a SHA512 00795353f53b6d903cd67ad7862227816a7aa599234f851bcfd2002df91b93951fcec302d2a009b900214eacab65d218f483a198fe11ff01a1d4df2d2943510b WHIRLPOOL a98b1a5e2abf422e97f8a68e9dbe29b761b1d6138a49f5c397c0b033da1678391c61383513296e09e9393441adea1f4e7b5ca42f77714e2a208bff6aa175dc39
 EBUILD selinux-plymouthd-9999.ebuild 357 SHA256 ed587697736641a7fdc62578e0237f493b580da52dbdd3c5837c0395ddbbd28a SHA512 6b6cb572de252227e8faa7ce6a6900a74297232bad763f6dbacd1b188987c1e949b34f4f8219f56ac36e759f91f2f85b26d1daba27f03ad459d24dbd77a2097a WHIRLPOOL 2a950cd4e798f45cbd22df13ad9e7f66e6087ce47c20c17e250269e6643464b21687e949b38267b06bc7e5960aef70462c6549c66b6a98833d2d2f9e4f8ddab1
-MISC ChangeLog 6481 SHA256 b7e8f8e30d1eb32d41aefd66ab19e105c74208368d16ad13b26ffa02135f1d0e SHA512 de5cf784312f48f5cf6911124eaf1cc3870651fdeeeb97a9925017efc970c889d12e7499a562e9a40a7a3d4af835cdd8dc13c4ae19f9c18cc7c8f2feadd5a857 WHIRLPOOL 695080eb36cd5cc410703725d8a286bfb8d4a0c2a1fd01d3204c2beceaa88292bd6e5ac53859186cffb3d093e2f3cf1faa634f43e11e03d2ae39f887c35bdadb
+MISC ChangeLog 6679 SHA256 a57d4537a49b3e6e14c3acca861714ad7764ab7a38064218ddeeb59af4aee24e SHA512 078e68c5aa8db659000bdef887ca02d7cb8c0209105857d018b4cb6ec461772cbd77fe5d1507167f02addb536b579c05231c657bea70ac2cbe348e4fe8d8ba0e WHIRLPOOL 6631190d4f2ebbb5df1549b8fc7baf9ff5d8f91fe07f458f3ea4178ad586a4bf856dd72abd834e71e76ad7dd23015c0e0e5d527aa77e78796baa248605abadb8
 MISC metadata.xml 233 SHA256 0f924e80a954e74eb3f83880b981c7d01a8f0cf2982f7713c4d5b2a7752f2f7c SHA512 842b3fcf11f972e9032026a754f054a8913e93e71b7e54dc053bd578fd6632fd36632b63fb6905bbc46853623f04ed107b1aab29f262c2503e84f259428f899d WHIRLPOOL 55bf51ac28dacc5944173673b017a5ad29fb4ebe886b7f1b363753aa821acd684a92fc44cdb8dc106021a86562231e5dfbbebddf27172046422e882f148227b9
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0
 
-iQIcBAEBCAAGBQJT5RyKAAoJEC7dUkA7aK9HJBgP/0fZXM+iOCp+Aj31odKrFTHL
-xZOiUwnSzoiF/CwTnuECUwl9XZDZrsVZjdranD/wYkFqwI+V+sX1oJ8Sykma2KEP
-8kl32EUFQtv4n+e+EdbIW+pVMyAT329IR8dN31l3yinJgxomS6x+fEzqrFERYhyf
-TO8ADj8Xh7uHETdum6TEMUrrnDx8utaA96w1eew/G3hJIT+UbbMCIt/ijvF3Ix6S
-o8Cc0m7tpYEgaRC86J2gIk/VEfQyjfzSEYZ6gup88soYMUg2EzXzwLCOQV0Rm/gs
-0UaLEzaEdTiHFf8TQgjSAwNvKGPbrE3uarSkfuoDW3LCLiA6ItWSjAFDgAObYu6h
-1ptntQgCz9cqQuZH/O9Xg12gv3nu9FJPjrU9SESXRQjlbBSwXd+ab5OON+GJ6T7A
-GIcZc37OwG07tsxm+c7XRrI31jYNBhvGTqn9FHWW1l/qEOmnikU3sxpxPduX3WAH
-IM3evetPmT98gY8LEX/uZqyEBs4YXlos6kLIKvFgzhLnLUQ459M+0JjH0MC9Kv4k
-6r7OJZaidQ4p0kemAidejiq/JSvg7nwk/WfReY3V428U9dnCbxBYFAsi9hlxTubM
-XvaDsGsJAw2JfB07wIOiihJOLfVdQgbh46pou3acbGECw6VASPrrgme1magYNyoC
-v3xWxeFuQPBAlykd+z40
-=74Wm
+iQIcBAEBCAAGBQJT5nhfAAoJEC7dUkA7aK9HbGsP+gMkGMiKqodcbHepGiBeuG74
+OtQYjmCS5ujsJ2erzMyoje2IWmhYzeMm/Wd5quM/sCs6HaGg30bZyOdiDb9FIV29
+ulZ38AqqHZ/dokp2xHGnE9g5vysPQAHrzLm1Atz1Kv1eQhvPYYwbXde9Pbd6JHVX
+gbmaZzey1broQPw9tra6mJONcYfQtvTTvCIz0yblG398QtsOYIl3jUKs4MegLvNm
+HcWfButd25dhqEUjW0hb60+Tf1KeoZAswICvLkOWRY1Xs1eqmL+IyXk5Q6teVZA6
+wfGlSdCa6Y6LpIX2sGTucX0M6UceoJC/+9u5ZaQ+qZrT1C5/bNBxdOS39QPlJt/U
+YlvStxa4tVlHY199UewtK0H4T6mHMRLUa08sd6xkVF+idJ72sSs0Ms1/52oe7I07
+gjbBzrUaIew3mQJ7BUoWaCyFcElVZQ0jXECZm80awMkh81xkHAaYfodpHpvoG+yX
+o+nykPaBtEBisa30rMpQasMMkiiiR9uKGY7DwVptSWi0xwETtsVCxCS37aIJ042B
+rSgdNDRIl2HI9tfbFUIkkuaiFFsmrJe4v6hcvYLD8yG7mW1l2kyNitiizTloFz08
+VEtR8rH1FVa3j0vpw4cl/hDDEQSCqFA6vCaq2t8RTkikEVACJHrhCv0zpVX5ezXT
+Y/l9GVx0j1IUwCudBftM
+=yYMa
 -----END PGP SIGNATURE-----
diff --git a/sec-policy/selinux-plymouthd/selinux-plymouthd-2.20140311-r5.ebuild b/sec-policy/selinux-plymouthd/selinux-plymouthd-2.20140311-r5.ebuild
new file mode 100644
index 000000000000..adcad37ff4c6
--- /dev/null
+++ b/sec-policy/selinux-plymouthd/selinux-plymouthd-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-plymouthd/selinux-plymouthd-2.20140311-r5.ebuild,v 1.1 2014/08/09 19:34:05 swift Exp $
+EAPI="5"
+
+IUSE=""
+MODS="plymouthd"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for plymouthd"
+
+KEYWORDS="~amd64 ~x86"
diff --git a/sec-policy/selinux-podsleuth/ChangeLog b/sec-policy/selinux-podsleuth/ChangeLog
index 93b0592fce67..c2f72d9a0d62 100644
--- a/sec-policy/selinux-podsleuth/ChangeLog
+++ b/sec-policy/selinux-podsleuth/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sec-policy/selinux-podsleuth
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-podsleuth/ChangeLog,v 1.42 2014/08/08 18:49:18 swift Exp $
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-podsleuth/ChangeLog,v 1.43 2014/08/09 19:34:10 swift Exp $
+
+*selinux-podsleuth-2.20140311-r5 (09 Aug 2014)
+
+  09 Aug 2014; Sven Vermeulen <swift@gentoo.org>
+  +selinux-podsleuth-2.20140311-r5.ebuild:
+  Bump towards r5 (fixes duplicate context for hiawatha)
 
   08 Aug 2014; Sven Vermeulen <swift@gentoo.org> selinux-podsleuth-9999.ebuild:
   Make 9999 ebuilds EAPI=5 and transform to make master for version bumps
diff --git a/sec-policy/selinux-podsleuth/Manifest b/sec-policy/selinux-podsleuth/Manifest
index ac6f7e1a1bb4..ed4e76a5b498 100644
--- a/sec-policy/selinux-podsleuth/Manifest
+++ b/sec-policy/selinux-podsleuth/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-podsleuth-2.20140311-r1.ebuild 399 SHA256 e862634cb4d61a29f63f965cb2a820218150bfc60c526cc36c4933f1e6047391 SHA512 b29c956569c6c0c58c3f7faefa62eb349b3c68a23eb920eccda0b35b7d6fece13fc56112fb68d3f08a750cdd14f872a65be2c5d8c61a3c1c5b4573c94bd50937 WHIRLPOOL 25d218f86d8c892d045f2ff11c81f8fe8008d231f5e8f051f8500a45f3ed240640b5362076360c9cef1475fd8f8ebc20e010aa5d46f558f50a32beaf29a04e5d
 EBUILD selinux-podsleuth-2.20140311-r2.ebuild 399 SHA256 554185db909473f988141cc70ff86a51ef20f2875da8e559ea407e13b364df02 SHA512 b313ce3d083db844e48179433c7316de133eb5a79409747243579956353e199fd977a837e8dbd98a0cda75ec839dbfb40776c3499fc75ca38184ace0d72ae324 WHIRLPOOL 966a5759a0c7c1e7fea79c1807c1a31ba2c641e2ad6de50cff3375a4ca9f99d9924f587e55de450c0324001b4a605a79b52f1d02544e83494df263be1baf0427
 EBUILD selinux-podsleuth-2.20140311-r3.ebuild 399 SHA256 df91d752f41b7a8c2577cdab86ea12d03bf86314267cddcfa025459638dcd6ce SHA512 2b492bd1dcda107ee8ff839ad8e617b653358c0aed2c2edf84fffceb90d426aa75005dbb17cebcb039001c7684e6607b1f0c911f527c67733754b086ce287822 WHIRLPOOL d397bf29dc26a6976a5b43bf683a20606cc5b6cff23072c431abcae6f9679a46d542f0e69d21d3c946da9fd8b180822677ece8214517920c8dfe43c1d496bb46
 EBUILD selinux-podsleuth-2.20140311-r4.ebuild 401 SHA256 9b934df460126c937238c8f81c2bfe0a2a84f262f9a922aaafcf7b3992dc7494 SHA512 35c22cd723514fe383934bf66fcc013120186e152fd89876a43db22c1c31d9dfb3a507c935a67ec856ecc45596fc558648a2d8568776e5fe12ffc4bcf13c6b65 WHIRLPOOL a1d17092bb584cbbfd96ef94688264aea67a1e87bd62267675e61fea45033910d89769b6b56c2d432776ec03a22d76539ab01e919ae550c431587cb5edab78e6
+EBUILD selinux-podsleuth-2.20140311-r5.ebuild 377 SHA256 73e0d15f5815f9c74e31c213b0e7c795eaee6520b0713c1dda00db5abb1bec2b SHA512 aec551db8b958c6b659e471db374b05a31c8a2945d0cf8f3e03a392e0e42ec3e34ce97f54be0cb63f96be93a5c569094a6314e2796aae3de666860d395cb9b20 WHIRLPOOL 453838fcf310415f27f52cf5fa70587cf1d1b572070e926b50f7b4df17967b649e996c70f4fc5723c909fdbdbbc7aba649f8abf0a27a163c2dc3896544469380
 EBUILD selinux-podsleuth-9999.ebuild 357 SHA256 68245b6f301f4d77b919ca9a84a9c5a7b4dd36968dde0cbdbd4a73615ac11362 SHA512 4246e9fc8a0f9507d9bd692ac1032b734bc99a7cef646dd5723f4e6038133d5fa9435af674e6f1c90e9a7422bbf062071457bf7173572e3feb35cb71f4eed05f WHIRLPOOL 9e2acd03cabaf8b2c14d231b41bd701e113457b34586ff5579ffa6c202ef9671e4c4c21959d0583a17a14e3e9a73153e21951d9629e1c551b6da38a4916728ab
-MISC ChangeLog 6751 SHA256 0024a6f4d2019990c03b5c5c235f43817c2db152811b24892dbc7f9d149688e9 SHA512 872295d62e29bed61c2dc96506b71c315bac976b675dfca1393f9f5a3adcec0fe3c05ce9514a785a461afd8bc03c8627a72e8278446de28a17ec45f8372c6be2 WHIRLPOOL 645ec82d779356657a6e75387b6cc1039182bba0580d7d885c4fde5263a55c91c10850351c815b38a76099412e6682b90408865a9b92488ab2f0061bb9a1e632
+MISC ChangeLog 6949 SHA256 ce1c0aef32400fe0399dff4af81e5953112313810bc9a8f5c743795c31b13126 SHA512 49f25f4b70f6eb2c3f23bc8585c02ef1790663cd9cb96ccd8d1dc6b5bd2da65b913a8b136ee4458f0d5a1d8ef8daeef9212c78cc7e92173ddb770e2788d4ee20 WHIRLPOOL 8632a63c39357e7d04d442a74c318b191030f70596725dca81c427a4973daf1105c5bb5bd94e69ac2ac9b8883e7178f891f2ea7822ec52fd22f2239c7213727c
 MISC metadata.xml 233 SHA256 cb5d1534f71cfdc1b4d6c722e58bf835a3e9d6c04feecaaf73414b743917adb3 SHA512 55677db0519662f77fcf16a00ad064e5bd5105306e50c682f66efb084a3c0c2f015b603a16099c417750402c32feba951916e1e0acd9344f87370a733e774a95 WHIRLPOOL ea8ca1948ea40bdc240b118a5581a0a6a2252adcd6f025c112eab32f9e05090758a8ad4c132b3a30b1840ac8a8941658260167f583c8e6ae4eb9d835d1312dd4
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0
 
-iQIcBAEBCAAGBQJT5RyLAAoJEC7dUkA7aK9HnTMP/jiqhmIwH4KmFUqsvjd7dIU3
-kgY9Hnn6Kv4f84zBSZIQ8N1V9/rtBks656s/pazUfB49l+ynBhIj40Dp3Xbk5AE3
-oXzaqzbgiVy8T1w6IO0jWs4+XHvXjzpBGoB7mFSZdVY3vzDaLl5P0OV0QXeLN8p7
-/dJ4/LqqUAu5DqDPa3xxUSI2fOZCa6WxZbT+2mIp6fDWgYVDSptcRNPfVAUKMxO1
-XWS476amG3P9IUWnN0h9SEpblZiTvONdej0Zz2RRbLTDxtH60trRiJGCLzo1hO7N
-OVlZSbC8RRXy8IJR/vGx7hKcF2O9XvskH1M5EITW20qjYSF9xVybMo2nM1FryW/e
-rXtHoZSlg3j4WLaJjpEB22nN3/7RzTGgPGGFWK0Vmqx2vXC9Q0u+hGXhA7BqKd9W
-DIXR3z6mvfUf+Y58dtcn10vEz5lrdw/V/C40w/CkN84qaPD8Uea6x7C5aiF+l7vu
-D91Xy1hRnV4xtLktSohKNreV85Jv0+7pExq5/SFgzOBog/cXu4jfES4pntr+RKxU
-SNdklFNGPk+P8aBzia2OyDmItO+lcnCrrP0UYElRKTXV5AQ2UGt3n3a1lpwANV1t
-65bVe6ATDBuH3ehdP8ixzYYSAn2GxpU6y7cLTuYTWIHt+UGrVzG0nBywP7Qm4pFT
-CW1kYiTZ4vZs9y3Qxsx0
-=nAzC
+iQIcBAEBCAAGBQJT5nhgAAoJEC7dUkA7aK9HZSoP/1ON5GF3K0CmlkF5bzmTPKrc
+wTroE+mb7II1vS3IGd6yYzQ/xo4ITeByM4Ab9TV8xb1bnC8LD/eOoa3oQXn8a8eQ
+iWOupBhivurngNEnWOyjxzCUR/eBRyHFiu2/7VtOBefhixpz0VlJFso95m65ME66
+tURs6QOyuKPWSyjJylh3+J1sQMMTKb0N2FZeZzpIlQaJwjjrxQwN5Atqu0F7nz+E
+lnb1Xy9U0brs6e8XjnAx/xiFyy72MsZVjp1S5hvavXcV7kE9U4W67X8fkKx40RF8
+XctzGupZyHfqU9AoCsG9Q6B2W4nYFHFT+Q0gEEOZ7YOXPuLDUtiDcd7+4Saj9FkO
+K6LCDMBm5Ea98ukDiTtdeZUVHGDGvi8Z3e/Yi+WU+5zVUSEqOXPIlo8zcFRDdAJg
+SGqKR+2dQ4/WIHynlTsMgPqVoABv++JfHBjPE/czjDCsmIExbryhj8OHrGz/2pcR
+HtpfdFZcyMVFh8l8ihyml6ia6WVLfkw7HjbNFTsqGwhnOTyPDf+I9cgjgq4oBu7m
+89kjInGlHzk1rK6+hxt00y0Iy8VscxCgJaVOe37vGR5xcohrUZBUQ34r+yrrkPx0
+lIqRsQ4RQrfZTlIs+S9aDrb/VwSvN9nNl9JvRD5UXfhja2rRpEcuNVsHPi7/FLYB
+u7VzD/NiIOvmN5278rUL
+=2gjT
 -----END PGP SIGNATURE-----
diff --git a/sec-policy/selinux-podsleuth/selinux-podsleuth-2.20140311-r5.ebuild b/sec-policy/selinux-podsleuth/selinux-podsleuth-2.20140311-r5.ebuild
new file mode 100644
index 000000000000..953d17510ef4
--- /dev/null
+++ b/sec-policy/selinux-podsleuth/selinux-podsleuth-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-podsleuth/selinux-podsleuth-2.20140311-r5.ebuild,v 1.1 2014/08/09 19:34:10 swift Exp $
+EAPI="5"
+
+IUSE=""
+MODS="podsleuth"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for podsleuth"
+
+KEYWORDS="~amd64 ~x86"
diff --git a/sec-policy/selinux-policykit/ChangeLog b/sec-policy/selinux-policykit/ChangeLog
index ed52fd2c602e..c18f0b5f6b4d 100644
--- a/sec-policy/selinux-policykit/ChangeLog
+++ b/sec-policy/selinux-policykit/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sec-policy/selinux-policykit
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-policykit/ChangeLog,v 1.42 2014/08/08 18:49:37 swift Exp $
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-policykit/ChangeLog,v 1.43 2014/08/09 19:34:45 swift Exp $
+
+*selinux-policykit-2.20140311-r5 (09 Aug 2014)
+
+  09 Aug 2014; Sven Vermeulen <swift@gentoo.org>
+  +selinux-policykit-2.20140311-r5.ebuild:
+  Bump towards r5 (fixes duplicate context for hiawatha)
 
   08 Aug 2014; Sven Vermeulen <swift@gentoo.org> selinux-policykit-9999.ebuild:
   Make 9999 ebuilds EAPI=5 and transform to make master for version bumps
diff --git a/sec-policy/selinux-policykit/Manifest b/sec-policy/selinux-policykit/Manifest
index 3e21e2286036..68afa8b3172e 100644
--- a/sec-policy/selinux-policykit/Manifest
+++ b/sec-policy/selinux-policykit/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-policykit-2.20140311-r1.ebuild 399 SHA256 70dbcd2f85a6c89afd50867253f8ac90c2b94057664beeb05092ac979b5be4f1 SHA512 a963af2dc9ae588497b2cc1c3f0572c2576daa20972cec1c973a3a0e168578755c139727fc28e17040d07706410a54676d9256c43c08fc1bfaa2a22e60bd6faa WHIRLPOOL 4a8a000a82af0be349183b602b08d52d0a1565cd47086a7448298ca24df242936c15aeb000e888cd0732d6723c02e2f5c9c74a32135b334c6365e06709e6bb60
 EBUILD selinux-policykit-2.20140311-r2.ebuild 399 SHA256 98a38ba926c487382032418b08114fc96a43a25b92d57ccc9c5bd16876315562 SHA512 1248270c10ccdebaa207e847268ec0126a6a234dc446531d5305084dd17b755b3c78106370a75216d6e7babf038aec0d7f5f5406c9bfc08ecf9e301792441659 WHIRLPOOL 2ac7788cfebd81c3c9b8711a875ba90d6132ce12ac61e1991d372c516494d222028cdcfa621360b35fb6765ba199488829621a1de329fb8144cd3afc3516bb47
 EBUILD selinux-policykit-2.20140311-r3.ebuild 399 SHA256 94c0e57d38265b26f9ec8e9855d152773141345e9bc895d12806c780d7266e8f SHA512 8bd1802f864c26d46eb0bb6863ace552292dd185bf84093d4d2609d190563fb5b6e72f98455ab0f2fa702e31917475428fdbb877281b35b4cbbd718438252a3a WHIRLPOOL 2cfa1c32540e7cbad20e80d0219d57c483c792d5d8390e58a67aa06171d0ff2a4ff23da0830d780e0c27235eb68072bd46d51c8b8c40e6a3bae66d35965d8646
 EBUILD selinux-policykit-2.20140311-r4.ebuild 401 SHA256 8468f2064105d22f12e9b9641adebfd2c4e76890b29cfcef864bb087f2cc3872 SHA512 b3e8aa574c8d9f9c9b3e9c93943016bc63ba97e12c07157fba477d683f7479c1ec5d595f905da9eb96932c0acfe355902165dd5e8eb6ee0f5135e8c331cd3ee9 WHIRLPOOL c23153c7f0145e3e9a686282f7c2d8a4a5a598525ba3d243005125c9aead30bae8a53bf3293347158b9dc68fc3a836bbe61d256097644183e75e030e26a78bed
+EBUILD selinux-policykit-2.20140311-r5.ebuild 377 SHA256 b73b5814c7a200e1c3dae68026ded5b98ae3ee11d7e131064747b33f7b366e9a SHA512 6b06bdfb4f0078310fab468753ae28d557275ce9238dd4d8496d3be22460ae8ac39f1a601853adcd2b96a1f691e8eeb0adc8f87a053139284316dd28d5b96df6 WHIRLPOOL daeed9c10f60ab4126f4585f16188269959d3794c4e066e3b22be19294f9f9028fa1daf96a75274c5eb8ce2cc78b38758034beab13b96663896f4152c43f5d37
 EBUILD selinux-policykit-9999.ebuild 357 SHA256 75d0bfd00e4e60a646c2cbac7581226eb2fdb8c7cc3c63ffaa1b840d574d6a4f SHA512 73034ec428d317293e7355458fd8ada50559b65993039aee4e60dd8266479a829d33db334d691a289fdd108cd67377487beff23ee6cb33bde75d9556ff19ad58 WHIRLPOOL 6c20b93359c5d5e7efbddffb654e18e4b3c941563709a9f630ee1455ec7ef6599e54f8f3d0dd0f3103c92c492494d4dd677fbf0b536d59155b64b7e16f84455d
-MISC ChangeLog 6751 SHA256 7922a891a24cd38562b792afbbe2d23bb53f0ef15419cf9c4272bf0a00405d7c SHA512 74d85a1218bc621657c6da6781d37d1a77f5557f3b9c73bb3d2084cb575662651c707d06eaeec916f48f91f0b5d0c7930740cc6f2888d85fbbdccf9eb9d37c35 WHIRLPOOL 8aed883c3a4e6bcc2680b02a1f1c00f7604dba6c6bd72128f7c6067fe374f7c2f306742b0b2f93df83a8d88a2641e86458f5e0fc2e0f2d62e23275046472a0d7
+MISC ChangeLog 6949 SHA256 fb8d17effba54b2b8e6d61fc0065ceb5d06ed8ad36ef2a598cdcbdc59924020d SHA512 8b3cfca956a345bf0b418a0d66872f3fb4b48a99acf17a225c9458a1cfcb54c77ca3417768b9308dace3149a34d19e4b6f365069bd1fc4f685c850430e10258d WHIRLPOOL d647d1f5ed026d8fb6e7e379108e0d8577a357e2bdd1e2d8424f72734301b066b4f11b24e3fdee2463fe83d422cb2bf4c872b8b16db31b6155f483397d637ac7
 MISC metadata.xml 233 SHA256 a2198c4a87709a54f0448531db5ad7093ae39a22c81aee096f432c4c94c4ee14 SHA512 3b3a23d3993630298df83511662a630fb7119620581fe623523d9e2194c9871ed2a21e0d77eaadbbde86b18c0e381d15ade3f6f19588022e5299b04ca54cd2bf WHIRLPOOL c7f516de655363aaf7b2aaf3f9bfea8c9d318dcdebd14501e1edb170f5abac789240d4eeaf85bdf9bcb8a30eb34a1f1458a24ee5e4f22c954248723f54da9324
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0
 
-iQIcBAEBCAAGBQJT5RyLAAoJEC7dUkA7aK9H+XwP/jIutV0Ms0DiZmHxa/4OjCXR
-TY4lNN6oc8XqdP0OeOas0gPUyXNrJJsIZlEXIkd9O/UDtRYoTD1HyebItG64QwGU
-XZU9ibRgIz+AEQefgiNJsQ50E0M/8oTJ1OSGCn2nugvFwZHUz6nyYWOX0J/MU/D4
-Ho1ptKDrpolQ3o+Qlzbuc1rKTQP3nYkYnOUbJarVrBYsaJBedlrz5IBI+gukdHjp
-UbzMTgyh/25qoqjB+Ic8CBp6PRnSAI6w8WDEy3WAeX07Ntq3x5cqEPkSEMkyi4rM
-q+DdMPhBEWtGRt4y6XD1IkX98sRinqR/PUdNogTt7/ahDHlhBJlF8KntniakQ05z
-BXokU1StoyfFBm/o4ODWunx+apFA2S9eilywFfLPiPXdgXZOFJd3+iihN4sL4g2w
-ov5Wxjb4dXFg4qyXw1pLfYqAjXr+x5SdeaaTa8ZTwXf/pZ1yl7VOGLIz1CTAXAlr
-ilMBUx7rfmrbqf2phS1Q3z2bu+EzEF09t6Cw6V/MQBphqJF2eoqqz43ce2W61yEQ
-yhbHQm9nULI6rORCFMurAZk2/QeYQVQQNYDfR0azCapKAk+Hpf53KCPtVtTkhn2i
-W5vJEEEQ8IjxVkweFc+fSOXqz7rz8YUxnPN0+Dr59mHk/l3rjPbW2a2SkAFSQXa1
-3KvNt/fg9RO2hz7V2XEj
-=XrgO
+iQIcBAEBCAAGBQJT5nhgAAoJEC7dUkA7aK9HsVkP/16QURjIm7mDw/bdPwavXqFW
+pGJgyNfsbI2g7E/gDu4ZEL/zmCu2RU3MnRvSNC+GDicHEqkqBDhtdLut1DjX5Dwk
+0ew6aFiA8CxjYTl1G5TMNZymcTUJOG6tC2FpDqtAl1e9r0+IHG3w91SOU1s8p6bH
+0ReQ2EQ5VUdM10YqjRPJd0hhpFYlHmU0L+1kTBgs4jAR37z6Eiwue0Sx3+G9fcxS
+0BBgYIlN2i7YagBSeNnwPT4oM6oyr2EVig+NO5LuIHLwURpeSBdtOkF8AuHjrfmC
+24p8yhciqCPYTx3kuxX+Lslynl96fs4UWY0Hwj0b0gHlTlCURmLoln8MqDClLSfF
+KoOXp3sx9jaIP5LPFoSxK5nnDUhnIadXJWDKx6pau2tg5ii08vMwDLKJ8Uj+LjkU
+YePViDxekCfX5iHlQUrzBqI5kUcJNNhnOQGEISfojYHJt8+oac3frjdjBiPgu9B3
+3LCoYhVE6JIBhSAbvH2yzUO6g9b9H6xNEUOQ1DSGk5S6IDGQjJOtvuiH+TUFeBWv
+/I1DTgW490kk9IlfMCCmivkkUMqv9fpuHdkq5l4gRb8GO1nPhKmewNK9nQa8j7k4
+o9UpZk7RrpCusi7bSda4m2MGBbIYJfUcUETnz9rgp1U81Wld9niRXAdnLlYqCQaQ
+tFQVNYh4qYnL0w4YbjKu
+=sguB
 -----END PGP SIGNATURE-----
diff --git a/sec-policy/selinux-policykit/selinux-policykit-2.20140311-r5.ebuild b/sec-policy/selinux-policykit/selinux-policykit-2.20140311-r5.ebuild
new file mode 100644
index 000000000000..a10dd0cd946e
--- /dev/null
+++ b/sec-policy/selinux-policykit/selinux-policykit-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-policykit/selinux-policykit-2.20140311-r5.ebuild,v 1.1 2014/08/09 19:34:45 swift Exp $
+EAPI="5"
+
+IUSE=""
+MODS="policykit"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for policykit"
+
+KEYWORDS="~amd64 ~x86"
diff --git a/sec-policy/selinux-portmap/ChangeLog b/sec-policy/selinux-portmap/ChangeLog
index 809ab25408f8..2dbd0cc06dca 100644
--- a/sec-policy/selinux-portmap/ChangeLog
+++ b/sec-policy/selinux-portmap/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sec-policy/selinux-portmap
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-portmap/ChangeLog,v 1.64 2014/08/08 18:49:44 swift Exp $
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-portmap/ChangeLog,v 1.65 2014/08/09 19:34:47 swift Exp $
+
+*selinux-portmap-2.20140311-r5 (09 Aug 2014)
+
+  09 Aug 2014; Sven Vermeulen <swift@gentoo.org>
+  +selinux-portmap-2.20140311-r5.ebuild:
+  Bump towards r5 (fixes duplicate context for hiawatha)
 
   08 Aug 2014; Sven Vermeulen <swift@gentoo.org> selinux-portmap-9999.ebuild:
   Make 9999 ebuilds EAPI=5 and transform to make master for version bumps
diff --git a/sec-policy/selinux-portmap/Manifest b/sec-policy/selinux-portmap/Manifest
index e7957317a247..ff984cd51b78 100644
--- a/sec-policy/selinux-portmap/Manifest
+++ b/sec-policy/selinux-portmap/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-portmap-2.20140311-r1.ebuild 391 SHA256 0156ad666597cdecf05d59d634f07cba72a77cd7b52fcda3926699ec9f6de741 SHA512 a9b08617fcff2ad15c088dda17802cc94ba807f2d81206428c8a56179404e1ded0a897af71bb009ff04ec1766a6668e99197c439df1e7292c67ccb48d853fbf4 WHIRLPOOL c2da9341f12dcc206b145ba8dca380fdf6987a2ebb20ad1d53b4bb14596d8a8c4effa3af9d9d0ce79822a3653e122d027cdce1a51f25ee2b85f9ba6fac69a44e
 EBUILD selinux-portmap-2.20140311-r2.ebuild 391 SHA256 14ea65d3c57e8a2cc345c5a0830af80191adc4534cf745823a192c21cf793c46 SHA512 ec72b0a62a39dee1544cb989c2e4cdbd305a8d02a683d363eff7e1a23965dc0f4732d03a7ed904a22928d5e489f19f2c646ecff3651c8166608ab1e43f61da4e WHIRLPOOL 81e3fa3658f732de98fb4f8d2e65e869082da064d7625333b5c79c29e562d9e8e201bedf0096ffea1d251057b16b6a08b13c3fc1be1304510344980308cbae97
 EBUILD selinux-portmap-2.20140311-r3.ebuild 391 SHA256 140f6659d5ffe74dabd8f18e1b39607f2b3fa8f3c8c087680823e381eaa63bd7 SHA512 dd4a6db56147cc867b7c46d0685964991546dba90b6643ba18acc0e74f10a2aa47b6803de291131b8ddf79be74336a0e029b7e2f76b671438e34cbfb958e1994 WHIRLPOOL c2275f0a5c3a621b36b37e2efbdae1f48781d092fde35f1527d33736e5854109f1d70eceaa0dc1534505dd7b3ff63032c10bc427474a2eaab18739ab596badb8
 EBUILD selinux-portmap-2.20140311-r4.ebuild 393 SHA256 ce658e3e7fbd19db18878419b8ccd5b2ba535fec88004cf46a61cbff8224b5c2 SHA512 afccb59174c9f5d43ffb818ba2ac24a9c1eabc8b6242812bb8f704ec9da973253d424a2a0faa4d0d046bfe872aa60a73dc8749148642cee4ab25fbaf5628d1db WHIRLPOOL ef75c70c5f27c0bc30680939b30bee5984476a14a27ce04e2251cef7d837c925c37466c0152a71bb85422aee56b3ff07152dc1455a36c87e834f5daffa7e4f2d
+EBUILD selinux-portmap-2.20140311-r5.ebuild 369 SHA256 731bb4e14375c4a771f2fb38d3c2ea867012ea4be0bc2251d5459fd3e54c88b0 SHA512 c98b10c131e4e6cf5c99a7e3c6c946da8080acbc3457c457cb1dfb7fe157c59095728a3c5eecdf6e43da56cfb164d28a639765ae2215b59a8fda385098088c46 WHIRLPOOL b5506ed7db463be1b051c4f68e9256fc37d5bed8abc8fcbb0f778dbc1bb97df320f6c96758cff335e5d0dc005be9502fd39fee6af66dd3ea04940e3df50cf263
 EBUILD selinux-portmap-9999.ebuild 349 SHA256 6480e9c221523f201fcfdbf3c1613ba9eaac1278248ae0d33b22f3c59b640eca SHA512 28e01214c5d5d1af804e9742d7ecfbace2721e5105dfb3c3245b224209739c2432da86f19cbc017cbef24f606b1d098ff37c011f2ad5d57bbfbb2810b39d4283 WHIRLPOOL ee49f84ff2efb674aab248d562d29d09efe3d0bc41b481ba5e7da96fc7fea0ebe65b8b75c888ba0b9e25d2d8f16e85ff1de6605d4850367715bc463ad0b4dfdb
-MISC ChangeLog 9486 SHA256 272eeff2c5ad188cc603ee4945432d45cef318ce1466f0bd36f196b811590548 SHA512 b939089a2b27485731fccd114b2fc0b8dbbcc6463648e680f8abe38d36490bd86fccc10aa67680f04830b67586386361b4a8f5109c5bd8fca1a0c4063ff01f26 WHIRLPOOL 6751a3fa9bcea5d26c236110d18f4a734771ebf1aec30a45a6790c36b48a5c58183d798aaa48adf7146cfc953c6e683cf47373438e0c8809b8d5664343495fbd
+MISC ChangeLog 9680 SHA256 1bf6c97d10f940ebf19b60ad6c808d9fec45a527f340a3f4e0d273dcf306cc84 SHA512 9698dda2cb2a6b96bbd061f3c6c528d904b1b5a89059168633c08255b46b64413fe69b25481877d7e90820b6a81118af118429d634903e4d84328627731c3267 WHIRLPOOL 852189dc0557a69782f616fb91967e90feaa8aa9d7157026ba54886097cbea2ad99a99ef481c8bdd1244381904d1bc22064c7bbac262938008015e5340e774e5
 MISC metadata.xml 231 SHA256 6f3ca3cc4923cf9f0b4fafbb39bfb9ed2b31578906ab55b7aa17e4c9104317d0 SHA512 e92bcad748cf54811e83ce6cdb84784989502acdcc4d414e373e62341ead4edc3f151173d974be3fa1ba7fbc74d8502b0522060ffb724d1558aa147f1e823c4f WHIRLPOOL 0eed33586157c1471410924c46375db6d78ba0adf90ff0daba92da8a6b66bfc960c3a9dbb4696b0269093c342a25d2cb494aad8f7ad6664127c50a0fe67eca1e
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0
 
-iQIcBAEBCAAGBQJT5RyMAAoJEC7dUkA7aK9HYh8P/15aiyyI+B4oifQq1Rw29/OG
-rixQbwKHB9LnTJIdNUf6T8RwZ16H6PduFBgrw7iw7DqkBwYKSnusww5/dwdgUW5T
-8u1D129sxPGGXNOoZRguHum2lRCeQAnBI1+BsMWh96CBYinN6x8pDqqyU6qCstA4
-zCPcoDc9wvmMpjvxeZxrjx5bUZbvppQztBBenNR6os71ruSFWCARXpoK7/fzmQnl
-6/OgBZ3QWoD8apo0trWTc1DeNjAnBHbMjn9GLeQCcfmocIAcQIXHK/QyCIyqjNeU
-/vUghk+IxpP9o8sxOR+XRrDBj/0wOgpdeMa9MdxzagVZ0lagDg83AuZw3Fb1sWfE
-pegWc0A5xXvdJ4DMfgPR6aukNZYdW5aeg88ZjQJTF12MMQ5r9nXo3y4OXtep26VX
-KBoU+0YOs0lTm7flzmhRMfAQp3FwbTS1/0BKdT2pStX2oKSHd9vtAfBaQqdys7nc
-kajNY8ofBT15Sd3acizJ6u66V6MvtN0rnGraAZm45zk+vlx7hz3JsbOgjIECMWI8
-WpGyQfJ7vp6n39BQRvPAuzIfXaA5kmvRZ3xAzXmTyv/N7vFbO3eCtSEGZa6bpo2K
-ohdytKF6rPnNmrSYQSGSmmIobCmBgV+gRlnBT+PYgHrZwYO3sOFqaGNLTaZuol6u
-eEyTaKd4MBcWgBi+kdap
-=YWhq
+iQIcBAEBCAAGBQJT5nhhAAoJEC7dUkA7aK9HYdoP/2aB5WIDh9q0DYD0tHoT1Fom
+D7u1nUKXHEhxImNLh8TMRIsMoQJF94B8ly1RNWLXGpJKswKDjWFeyGnCgaut+Hrq
++bmTe7DHgJ2Q9hf0t7uffR0A+NBRjdHoGDblIZXy8BWpLWY5vXIqVjMZNn0fNTHB
+zPernTC3IHPzmeju20xdQza9ivzl7Rkt22fUdHiY9pGOLDVEpC9SZIiKh1JtGLv9
+uRrBS/h9wDMbQd1+wocEx6YyZtj9NAb+VY7ITKXiAs+5WeEgeMRGBn0Z6NhAjHd0
+fw/lioPmzQCELmYZv//+caSAkfznOYbAElbuWd33VNMl+ayy5YOUXavKgGvY9slp
+Jxud1LpJ4Hhh+KLErEqfV7r7Je7cXo/millUDnM4aaAGkRUASALZaBbWH5gDYMwV
+L/Ms4My/xQrhzoS8St05l3JPSULpi/qtoHGFKoQpPQ7QZWFgu/EaXYTCmQ/yiPi7
+CI4O+b6bm2Pg8aNh4G5Oa15f5PC8vzdMrzfeMmr2L9De+ExKN8fdKaHvYlOR2qHW
+rzUMwFaEsJ1bWdea5Y8H+nn7kaj4BIS/D4qE075hJpb7Csd//YY2b4frYlMzdFdk
+Iaib1254OQ7/OeL8g4lb45nyBCWjyt0d9acJuxh5u0/BYqH3+NTc70LZzDyTS+eY
+9Kb/06pqRRFTmrVHrIw7
+=B+1p
 -----END PGP SIGNATURE-----
diff --git a/sec-policy/selinux-portmap/selinux-portmap-2.20140311-r5.ebuild b/sec-policy/selinux-portmap/selinux-portmap-2.20140311-r5.ebuild
new file mode 100644
index 000000000000..a30d3ea57f7b
--- /dev/null
+++ b/sec-policy/selinux-portmap/selinux-portmap-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-portmap/selinux-portmap-2.20140311-r5.ebuild,v 1.1 2014/08/09 19:34:47 swift Exp $
+EAPI="5"
+
+IUSE=""
+MODS="portmap"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for portmap"
+
+KEYWORDS="~amd64 ~x86"
diff --git a/sec-policy/selinux-postfix/ChangeLog b/sec-policy/selinux-postfix/ChangeLog
index 3693987c8b4c..4ca8831fc784 100644
--- a/sec-policy/selinux-postfix/ChangeLog
+++ b/sec-policy/selinux-postfix/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sec-policy/selinux-postfix
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-postfix/ChangeLog,v 1.78 2014/08/08 18:49:33 swift Exp $
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-postfix/ChangeLog,v 1.79 2014/08/09 19:34:06 swift Exp $
+
+*selinux-postfix-2.20140311-r5 (09 Aug 2014)
+
+  09 Aug 2014; Sven Vermeulen <swift@gentoo.org>
+  +selinux-postfix-2.20140311-r5.ebuild:
+  Bump towards r5 (fixes duplicate context for hiawatha)
 
   08 Aug 2014; Sven Vermeulen <swift@gentoo.org> selinux-postfix-9999.ebuild:
   Make 9999 ebuilds EAPI=5 and transform to make master for version bumps
diff --git a/sec-policy/selinux-postfix/Manifest b/sec-policy/selinux-postfix/Manifest
index 04e3eb12d4cc..dde5e802131e 100644
--- a/sec-policy/selinux-postfix/Manifest
+++ b/sec-policy/selinux-postfix/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-postfix-2.20140311-r1.ebuild 391 SHA256 1a958a8dec018f3977b10eca438db07a69212f2bd26fab6e38bd5b287e308391 SHA512 b9a31b1bb2838dc668970da5eb5223a7648588d770c581ba92c58fe12ca6124edd3bae7654796125eae0c4566ab5c8fad372dfd88be6ff7c0ca24e4dd3880b87 WHIRLPOOL c1b427ca77f744c676ad4ca6022d27ce80f0b4adc671e31ce2ea19195d1f3fab5de445f932d8dd8eab03b637d9a50b47c027dddf94f8f96f0739a01b605222a8
 EBUILD selinux-postfix-2.20140311-r2.ebuild 391 SHA256 ab1758aaca2886693c36580bfcae64573007993e3c8b17181edb095cc97c8f51 SHA512 785344c2d3e3b49e028ab400ff9051452f7e05c8effa165e4ec6a8cba9be1eb537c0cd78c26368ed8999c0fb42ce2703db724344779c7648c43ab83a5375e710 WHIRLPOOL a92ac45653dfdb6721d03caf5c63f82ad6fb14089219bddaef43d333ef8a6d5e9126064a1041d5fbcd7f9ff1e185d48c2fce040adbca455505dced6d8951c9cb
 EBUILD selinux-postfix-2.20140311-r3.ebuild 391 SHA256 93fefa7f000d672869188cfa2409cc849937c801c2b046602956e85e0916fe94 SHA512 4bc45fe93546eb3f435296fee515522498a0ede1503ecc0827d4a6c2442896b8cefc760324e1edac58d49dcc273acd6f20e392d3395d0e395bbe09a127433af8 WHIRLPOOL e88eaf3caf5a71d30010fa51f2aaa936c3b41419e80c957d0614888a53f8874761932e3b2da92180bd3c42098bdb7de3eb5f5b3353cbc3c56d6dc4a7b348cd63
 EBUILD selinux-postfix-2.20140311-r4.ebuild 393 SHA256 0c9bc02361d5674125c5ea73f09ebae45b708a44351435be97aa14b2410ee391 SHA512 1d4424b04a4f92aa4cc46645c26e7148e816e4ae5ecde2500b1a5665c08b5adeeb0348d03cc26ea75f4021916a77b6ea6f655130d82d8e68911bf069b8a80133 WHIRLPOOL 100b19e7000e2b6b7988c99e8a0a8b84907759b616a692be85869d2d167591cfd84a994a9c35d4e7afb1bf658a32010396889aca250687e7501591457dff0627
+EBUILD selinux-postfix-2.20140311-r5.ebuild 369 SHA256 efbb8d535bd66afe56787a41345fb2bafe4aa7c7d624e8d9c415d3daec38c932 SHA512 b494d2d626eb0bb449f431141abde420b826dc160a3147117940056a0985df2148b2918108465864009676eb1b1e324169eb92350d7e0dc66686897cdebac07d WHIRLPOOL 39cc6726cb05691ec088782bb6afea1f77323849babdcfbea61f2db31ef71ce551776179bfe3fd2be52d983e0fdc5cdc2c929de47d8e59baf1303b0350269ffd
 EBUILD selinux-postfix-9999.ebuild 349 SHA256 d55b3d8a8c9da6bd340d70865c279e8d90907d66ca1b312b198b04b0198f6efc SHA512 5843f565ab94e34ca5cf71e51b06f8b9e1dca7221665ba2b457a89584f7ce92102b7b4c003352efe0c250ffa97ff806a18b88ab30a36c590a66d23355aed4f9d WHIRLPOOL 8059531041273ae58339890faf6678cc56e00cf55e39f35de42db6b189b06e4104c00af98a61823a5d0f4b7f8d4b3c69121a29975756a93578a37894d59fc5e9
-MISC ChangeLog 12791 SHA256 4a6853970abd10e29716c333b61d4b2becc96108daf353bb5df9e46693eda209 SHA512 fdef5d8399fcc35b8aac3af0da10dd9e32908e5857e081e7c8abc53f8538e34836f5e0dcce084a3d52af46fb1d87b0e54a113cd504a5c09b24439e1d50a43665 WHIRLPOOL 07c6901962b3cd0b1b0a7bf428a8d3eb04fe9162d4e1cf24776288d19c0d5d2dce935961843d1d05ea65ca789f6331e6dfcdb15bcc85923065f0869e31bbf6f4
+MISC ChangeLog 12985 SHA256 df5b362e59ed0e13b72978e3da2726ced7ffc49c1fa50da454557754d0380bad SHA512 38459dc1160ea85017db07a2cb38335f84c4ab48a645b2d8a99977e962f960f870e101ea6c3e4c5fc84944e44fab681c9f21c2b94dc96fd9d7ac72261544740a WHIRLPOOL 9b70094a5b9c6c5a6104006b00aeb2dae989480a9fb5977cf2d9ad4a3bb59206fafb48c5c8776f41fbaef22ad021e88d5a4d5698f920921a360293e5b01906e7
 MISC metadata.xml 231 SHA256 459b7eb495b910e93d0bc072cc141a3aed301b3142940b6371d4473254257475 SHA512 af203293436e7a59b220b8d9dadaaa1b52fd2314774ce8085f3b6d26cc789926469b9c7e879d2af45effa67ed63a31013e7724020b838c0b60ac1aec50ed7a7a WHIRLPOOL b464d3cf16306ea5f5f9d0af1239a72f9601a10a38e6bb0b385fccfb18a0de226e6538394f7fe566c72d39dc3c7ad0f346722a8db80c0f2c4ecef4d54ac6b8af
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0
 
-iQIcBAEBCAAGBQJT5RyMAAoJEC7dUkA7aK9Hci4P/j2pgLLoEDloCPBDGiw9mpZE
-mxB+9WLkIFLtKLtd52BYuZMaI98i3AHV5rbXooQ2OmF00TSDzGM2vxjbZbbXMNlb
-OLOc379YzT+7picm3v9a7oBuBxUsIqMl4+j8DSaX+DPGBumSddcghVTzgTh2h+T4
-Eu0vyurM9DVoFBNBiep82rBoMD1ZGBPZTg+7l+GvrDoTtoZP2/Vb+R/P+uiQh8Tv
-bJuvbssLUhI0K54KgcnxnHw1PR+nfbAH0iuDjR1R1yYRJ6lJKgIDLZ13/2Vgsed3
-50I7EMg9FfjYXaofupwr/3H94460YgpG4Jjrv2uE0wW3MLtpex6zaxts0mjXmItX
-noC3C55bB1V8nog0V+aS1RuketE6Soln1NCLlN8DNAe8gfj70gEIloCMyeA1JNGv
-VZxziCPtC2riX4IjdcoOd1XDmcPO5bMm6PMZGzGSd/GdCa/sMn8w25S2w60hK/9Z
-GcbFgkGnRFrvg77F3NSyErX1HSQaE4oRGU1XKo5TcpiXP1MYh2EwoEuy3gSJlk8B
-Ze0U5rrCjh1cnHD/KT2fLUu6g17glKXDO3ywjkAAbH+dNsyUWQEcz6ApsAHTnjxj
-SgHrrMhRJq7EAVloh0KRH6rnXy6qeFM2Dk9Ucrj8cmjVh4OPm1zoE5h6zA//L3EH
-TmAbU33oVX6pHey9K94z
-=aPib
+iQIcBAEBCAAGBQJT5nhhAAoJEC7dUkA7aK9HZYwQAIFToqmqAHG8Y/7DsVnqsdOq
+1xiQzIIEnwyscPCqXCHNTmaCs+KbP6U5I4Cl91FkPFQ/yAvXI5DZQ/jjKMSgSkCx
+saC1GUHlF2nSIuubAP9njO5O/uM8+a6jPf44iWPZ0zAh8XnNMs9aJ8bc6J/S9OQg
+VE9k597YJjEspm85kinc46RscanlFB+679jIY2izQ0ou8olJI9enoBf4s8Nnv/mn
+9zI1QLvvFEbnFbp5nOaXPNye0/SfrMQAepz28fArFn4CFfeGDPUzhBY1dlvl58a3
+T7cgm6rH6UUpBblR5sl+mzHvu6acxDfUkmWbz8BgSNmzLcHXCMxgytwpHPFd4DS2
+PwbRPl1VdllgJNAC52vN1HPmhAgsN9vSg0ru7SRGKLawsJlhY9w0aCkHygyf8+nW
+r7S8weSvdkvKf6r+uh/LpH3u+TxZYqWKyqZeWffCJLXETwdOJNGeuYXA4GSadiji
+Y77X27vgQ5XT8biOjtzuBVKyYmG6G72jdJn59BGtk7zp6AohEjLOcyWlZ0fqo1wI
+XYv+r0yzC4bdo4gfX/SScBPwYVyQeAac7qa/EzTB66LvKcHSvD/eJyWJTyM5E7OQ
+36E7Q2y36i9+Kp16DTx+3loSpSH6JJAfmuuVosAsdkx/IupW08vTj7Jqv0WYhgp+
+SUpZ1YAYmEcLL+9b2NEI
+=LxCa
 -----END PGP SIGNATURE-----
diff --git a/sec-policy/selinux-postfix/selinux-postfix-2.20140311-r5.ebuild b/sec-policy/selinux-postfix/selinux-postfix-2.20140311-r5.ebuild
new file mode 100644
index 000000000000..f7b7b56aa951
--- /dev/null
+++ b/sec-policy/selinux-postfix/selinux-postfix-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-postfix/selinux-postfix-2.20140311-r5.ebuild,v 1.1 2014/08/09 19:34:06 swift Exp $
+EAPI="5"
+
+IUSE=""
+MODS="postfix"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for postfix"
+
+KEYWORDS="~amd64 ~x86"
diff --git a/sec-policy/selinux-postgresql/ChangeLog b/sec-policy/selinux-postgresql/ChangeLog
index ac859199b01c..017fe8dbb948 100644
--- a/sec-policy/selinux-postgresql/ChangeLog
+++ b/sec-policy/selinux-postgresql/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sec-policy/selinux-postgresql
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-postgresql/ChangeLog,v 1.72 2014/08/08 18:49:33 swift Exp $
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-postgresql/ChangeLog,v 1.73 2014/08/09 19:34:35 swift Exp $
+
+*selinux-postgresql-2.20140311-r5 (09 Aug 2014)
+
+  09 Aug 2014; Sven Vermeulen <swift@gentoo.org>
+  +selinux-postgresql-2.20140311-r5.ebuild:
+  Bump towards r5 (fixes duplicate context for hiawatha)
 
   08 Aug 2014; Sven Vermeulen <swift@gentoo.org> selinux-postgresql-9999.ebuild:
   Make 9999 ebuilds EAPI=5 and transform to make master for version bumps
diff --git a/sec-policy/selinux-postgresql/Manifest b/sec-policy/selinux-postgresql/Manifest
index 3cb0c8c8b83a..5e686aebc4b6 100644
--- a/sec-policy/selinux-postgresql/Manifest
+++ b/sec-policy/selinux-postgresql/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-postgresql-2.20140311-r1.ebuild 403 SHA256 b3cdf79dd0f35a773c16d8a1fb94baf91221670799f356e4e5fae6832ed2dba8 SHA512 b0947c5cb4d47e4112a493bdaa35d358f3e444d7c5cc53f7df77bdb33ba105da71d42ff6f34fd9cdcc5525f747c02ff8e1fa59c1c9c661f47e15f4d439ff0f02 WHIRLPOOL 12a00347d20d08c8097f71a5b8743de1e6dd27e61b44ad4634c48735608b30393d4f8336026b171c47f5c9c6e261caae84a5caf12235ebe1bf2a680b55e1304d
 EBUILD selinux-postgresql-2.20140311-r2.ebuild 403 SHA256 ee11319d2b88f0bf0457e785baa0a26cb8ddfb326e588141a132d66b55520a8e SHA512 749b06cbc16a8febf230c49e3108bbf51c057227423829c3c4b3dc158693e0223882c25ed14340738f42969e0a6154125eed95b0cbe8d40d1de0d0c5bd58feae WHIRLPOOL 855f74ae74323a74b37c18f8f3e6d0fe5f558fbc9ce259a4e6196c32d7e56ad429382b13a33ba521cf41a89ede4976676ce460d496fa5e487a176bbd3b1c77ce
 EBUILD selinux-postgresql-2.20140311-r3.ebuild 403 SHA256 e134d63a5fc95bc8676806fb92347fa0317f2b01840b5addcd763cdd08a23675 SHA512 1916b83f0ca3de5fe656192f625ee284fff89d1b7895ddf16cd468f3d75041dfef2ce50aa368280a1b8ba937bf223172b6176ca38a37bf45d6894cb47e117292 WHIRLPOOL 377091d7be76e907b5ad5b9101d1fb799d4bd8f8b0924608a98bba9e76d8919e612bddd24c5ab6e96763e4725cedfabe2bd5f48ac46e5c92760f72ff09e5c1a5
 EBUILD selinux-postgresql-2.20140311-r4.ebuild 405 SHA256 eb995d1e6da4e1c9ca62ef576b8754a9e7ebf11acd72138da5e89f49e1ef76e9 SHA512 b779074ea043ac1292160052f7d6f7ecc437ed44bcfe548895bbc104a47597b636ccff2b0d6bf04835aa9ad893ae28bbdb860e9a5ae223bbf5505e1e1b2e4dc5 WHIRLPOOL 4a88341308287e7aefb3a564c8712cdbaa1b7b4b217c06b3f7771921af18f2dfa62c35d3f7ef7db4f65adccad13633bb70af2ce5597881f2e841cd5d4906fef9
+EBUILD selinux-postgresql-2.20140311-r5.ebuild 381 SHA256 94cf455843df251311797702d435482615bdbc434d5c6368ed926557a0643ce7 SHA512 0ceb57dbd880f8faa144a4da9bfd4bfe06f6a8c6d6b7030bf032598f4a8e064f4fb151aec0f2812c9de746946fb246e319b4075cb37cb8d09e1ed20320682fef WHIRLPOOL 3a2f227e47275913cb71f685986efefa062711b01394b0b9ca116ca72fba4ebbf14b5a30c127031b41e04370a9e72ff85de8dc8b583714a6af5d037c19aeacb3
 EBUILD selinux-postgresql-9999.ebuild 361 SHA256 8106c1dca47108ac85c52c8b7b5a08b11f2288f5dedc39a961a979b73bddd0a5 SHA512 d1c4bd68efdff388364f50dd2b687ee07d23337f0129871e7da65968a520cfbc725dfd920ec5f30ee8dfbb41e744efe8e0985d9ee541f250a6905d0e490c396a WHIRLPOOL 72bf62b9a8a9a5891f2ec019fb4569f6b564e0d7cbc1dbbcfec75ebe8263ede1f6e274f2e3b1a2b619d6a86c4f2df6134115a992af59b2b66e4411b01ae76d48
-MISC ChangeLog 11794 SHA256 65ccb942b39a2a7a76dcf35a3764c0a664b7b7e7559356cffd33c0bdb2ad979b SHA512 b4fa892a0e96c2d8a9c6a531f3e961de85cc07987dbb8e7e46969fbc3c39c06702ff8ca89980b038800715c67d9efab6a188bed74dae52511629d88f928a5f24 WHIRLPOOL 6980aa355dc30c24c9f290cb9cdc906e94add2699a90ad7d0e9e4a8df46e9af8db54cb94215801c396248ab99ff37c0f91d1fdb46f7647e8c5604b5d7719d775
+MISC ChangeLog 11994 SHA256 9e7ed00abf6b10be422bfebe87106d634d2010d3ff035cf1a56f85ac6b22b96f SHA512 cebe3a197e5a28a9bf9434e875ec5f55430726f3507b0fa090c8ddf02a39f87768ade40ede7dfde21d3e2a4196bd25a70f12500a1ee3fa639a6ff77abe49b9f8 WHIRLPOOL fb331de40c96fde405e350205ca1231523452ad8fe56f0fb4cfda8eefca5e7fe3cd4b5c72c7853673ee1b6315d0465d396e1dda4d58f4c0321fd5537514a4fa3
 MISC metadata.xml 234 SHA256 2f770804d9a15b13be26e873255a4428b26e895fd6818f37485b38670b373e9e SHA512 9e8fc4240346f97aea0b6cfb9668da1db2b8cdd0018761efe46032e224dc1e533f96cd4a5e2946928643c794397c10e1a18da4251f715e250485b8871af55331 WHIRLPOOL 096f7c6b4ae621b2a852cd774c67e8db815538f6395e9e0cd5a0b926abb43a298dd7416b1c962b172d5303494ebf4cf6f6e9beb44dfc71961bfe500a6feacd71
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0
 
-iQIcBAEBCAAGBQJT5RyMAAoJEC7dUkA7aK9HM2IP+QHtUsa3f7KLSS8l/Bau8Dxz
-Fhc1m2DxJttoo/UNwmEIh59r5k9EnyFgdis7JFZQXFevG1IR+W3et7SgKq50/i8+
-TLwapbUfswAX/GnmTWZ+QtkHNni+BgTHj9PiJHGnzrQFE5aRxkoJ8buf3+qyh39p
-cRqwvidLhuBq81pIDPqUn06AT61rEyi7g0B3VjItI3SV+XS/ILMsyGHxEYS3uRQ8
-Xe0SbENQvOUapJ3Jyph9BTqFYyIdCVUnjyK71zWUiX+Iyd3uCzrrJkEcJ8T8hY9Q
-a1Egw8VMCy8ahyibES+TO7geVYE4C01vQktEtDsXWFodoKb/GCZZOqxA1t74O4EA
-2QseAUbhFbDl0V4nGnJPrYaYXKyQaClmlJa6noReRm5fe3rKUorPFqTxdui9Nlqm
-dOidbLbzijLcvfsv7zuKmyo52xFJRy/bhQhBHHOr8psH9JFD8iEhBJ8yvYx38dMb
-jLbZaaDnBdA5aGC0ERp029ZKL/COTo9Aw5bY44SadEWpDQcBQp/NvdlfpxTNSfeN
-37z2szJ36t5OlwibD0dKbTyET8FuoAQPDBj9aIgA7inXLVUfsbcvVszbJq1vTkwM
-BuOwiXjWl1wqSIy5JJLDyKlmxM9n4ajq2cUq8zxD033RL92G7+Y+p3FDyiRLZYmn
-OG+XhkXSAuhWnptXkiwF
-=ApGp
+iQIcBAEBCAAGBQJT5nhhAAoJEC7dUkA7aK9HHBsP/iS3UcJYIAUC1ffwtjtbddd0
+jUDxVyT37LyCq6TGp7z7RTmrfqrzcMMy3gje9oGWyOz8gL1dEwf4Yzr3MI4vI0LF
+/AgmoerNatcQVpISxrHcpc8UtdAyUlaexFDZQqIhEzZ5+WiZjK4NbB/2HuAC3Bqv
+7C4SHh65YLxfaxaU2NSOJS49EypcSVtMp2yVS/g/TBGVOLqrKM9X8YUJ/59rF+3h
+ki8aRZohnn3UmrvHN9c1AwyXt2ulZZUHPeP7XGLma4KmcUfg5abrH5J1Dw+RQ3+n
+ar6yZXl7Pr8j2RYCeoAOl3b6KONgivZ6IF1EHZraD7QcvG4rKQuf21tdSSjuPoBC
+OpvKXKYCQvSv7sNFOm0mZr80+6/wN3bhhtYQSAvRYKItyxoCnRcxDlvdmXDVtSVk
+vaZhjoYSGVHPlQvIAuLl88Z2GBV+k/P0qpDPR9ELQGYQViIj8kyaShsdyOCCmrt+
++ZzEh2CyfvmErM1OrAWNmMrvnOqbxXdECR9X7nl+KVdqRWZDF2rQ1BVDVD2ywxkS
+0fU04+Kg1R6sSxZin021juesxTrhskZcbaGSTIYmAYNPbYrlUZu9NGAgWTF/ORkM
+gWRyDalfaJzjIvKlw/mu67t0xlcRP0i8XuQ/JXtRv1zQOfm+lyI9wvIxFRHDNZbm
+eU1Xmq3PDJL0J+3As1w3
+=kFzW
 -----END PGP SIGNATURE-----
diff --git a/sec-policy/selinux-postgresql/selinux-postgresql-2.20140311-r5.ebuild b/sec-policy/selinux-postgresql/selinux-postgresql-2.20140311-r5.ebuild
new file mode 100644
index 000000000000..639245d87a57
--- /dev/null
+++ b/sec-policy/selinux-postgresql/selinux-postgresql-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-postgresql/selinux-postgresql-2.20140311-r5.ebuild,v 1.1 2014/08/09 19:34:35 swift Exp $
+EAPI="5"
+
+IUSE=""
+MODS="postgresql"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for postgresql"
+
+KEYWORDS="~amd64 ~x86"
diff --git a/sec-policy/selinux-postgrey/ChangeLog b/sec-policy/selinux-postgrey/ChangeLog
index 225b65cfe27c..170e7965a30e 100644
--- a/sec-policy/selinux-postgrey/ChangeLog
+++ b/sec-policy/selinux-postgrey/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sec-policy/selinux-postgrey
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-postgrey/ChangeLog,v 1.42 2014/08/08 18:49:47 swift Exp $
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-postgrey/ChangeLog,v 1.43 2014/08/09 19:34:48 swift Exp $
+
+*selinux-postgrey-2.20140311-r5 (09 Aug 2014)
+
+  09 Aug 2014; Sven Vermeulen <swift@gentoo.org>
+  +selinux-postgrey-2.20140311-r5.ebuild:
+  Bump towards r5 (fixes duplicate context for hiawatha)
 
   08 Aug 2014; Sven Vermeulen <swift@gentoo.org> selinux-postgrey-9999.ebuild:
   Make 9999 ebuilds EAPI=5 and transform to make master for version bumps
diff --git a/sec-policy/selinux-postgrey/Manifest b/sec-policy/selinux-postgrey/Manifest
index bea886cbde7e..1c3c6fa6b5d5 100644
--- a/sec-policy/selinux-postgrey/Manifest
+++ b/sec-policy/selinux-postgrey/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-postgrey-2.20140311-r1.ebuild 395 SHA256 8470878d08b9b6481a83bbe5a369c5dbce8d1571e6cad79e3a87acd30fd386a6 SHA512 c5a3cd8a5c314a8a2154884249290641f9353839294105583ffa30e1cd95a67b90561cbea006669ffcac93513091608463bb9ac948977c7d481f4ad8e2d20606 WHIRLPOOL 687bde26a4731942cd73ac7e222a81ce5e15ed0a5003abb4a512919aaf64d600fd2cb98aaa560eacb367f4df84577155c576f4a1436504c7b93d34fc6f30a176
 EBUILD selinux-postgrey-2.20140311-r2.ebuild 395 SHA256 8fb278aed16dd17841cf95eecf4a9ff3580eca6e215b5b5026b709f3ea4277dd SHA512 19e1d0993c01110c7f41ae34817e4e6b8e7cf2f198457598bd2329376085a11c3a3a53fe1cda4b735a84b546296e10c9057cb70e282a2ea0c15768e226d787e6 WHIRLPOOL 8b34833f9871e83ff3fff2b1893426c64c9478323b503852cdb2137676a625e131b2ab2ed92102733a777d9517b1132db0647f47e985d7d1873b3d986451601e
 EBUILD selinux-postgrey-2.20140311-r3.ebuild 395 SHA256 097901a046e864d27ead664bf55c363e0907331fce75075fe7752a30ef8bfaa0 SHA512 596c594dd6e41b8759c9ffc0cfd39b5100c005d2b501acad7bfa6743f575886902acf3c1c22baf4a91b296173c14985a1e5430bfce26bb96b62b95410d1a0760 WHIRLPOOL 93f68c3a8f247c8784bf18c75e33ed6849e48bbe3c418a5d32873ca1450efa725a7ce69608b6e708e33d018864f484eee577db497fa6d31822e42e22bcacc58a
 EBUILD selinux-postgrey-2.20140311-r4.ebuild 397 SHA256 7631f48343785348ef8360aea40245e0072cea8491703e42822facfc972ea28d SHA512 0f0335cd98dea21a3ccaa689e6af15d164d2e9209b9cc7f1e1a46ed0972ac3e783271be03d12d0e61717de0407e5f78837cf1d58e95c023eec421b2d5871747a WHIRLPOOL ea933c8c39777ad8307f5cc99959923b74812080a9a53270041d08662a9bb9ad5eb7a40c79085608a7908b7fea28b7714f7814d4aecb50cfc199026f08c70e60
+EBUILD selinux-postgrey-2.20140311-r5.ebuild 373 SHA256 7b76c09ea5548afbe4f7728e32ce2b39a4632819ed8f01f56f806211884fc91a SHA512 524cc4a688fe08c4d4819d1a9e8046e98ce7ff30e867a9554a00b0630d535e36473c9fde47e27d04c9e38b50ee7f91f5a255454a3080d5555c330e75e802541b WHIRLPOOL 02dbe0ef77554c90c9b44902855b54e93580910d92377c2ef0c2d770794a86f52924236bebc72c15786097d9cb030508f07cf4167502a657eac57b86a2982e47
 EBUILD selinux-postgrey-9999.ebuild 353 SHA256 70c8a044572e535c7497801523c1605e542bba95e20630babb78b23e6e064fd7 SHA512 89b3f5cf6742e09711bcff45d0f3a2b28097a6a67a27a1349a446fbd771da4d1b6a20de36fd7a08a7687306730009acd8829404d3448ad486eed9049a9b17cbc WHIRLPOOL 741aa9f27739548557b8f73e9af078346482ba2d66ba9e9359bb1ccee40ecb6dde347f68ad4a2a7bd5328f89bfc76f8e4dee9d329c7ec492328550b0c5143d2b
-MISC ChangeLog 6672 SHA256 faacbc0de1e132c723b1e3fb504ded587b87492cb5cd691e7ce35ed551cd2c13 SHA512 6df7b21cd435230ae29ec47cc3957dfd7687aca3dcc7b4611c8faa8d75a19d926ed8cb84480b6757bae61158deaaf5d6e32ebfc8dc2ece4c02d04d820cb29498 WHIRLPOOL 2519be5745937ae9ec3443bc472cc65d3c9e4b6d18675858b7a0a2346916b80e48a59762b2ade093ce0723e7260eae1daa56b9d966df14e47b9687df66e5c70c
+MISC ChangeLog 6868 SHA256 2e2b623534c13d3597d1a5f89ad9298ae75050ef9c6a8b80fc4b1c12bd8c0ac0 SHA512 4130cea82b968e101be78b725c6dabfefbefd6f6ab5d8e0086a92b1d39f70bf3e288ed5df16008ef0b368d210234cf7d889cbdd6265b63ca68d7c1b598974360 WHIRLPOOL 9d00967a0d2d229b02e695ead7ea13b223f64833e81c356585fdb02893cd4a5ec521a3da934a9f8b2fc16781d5a1d49b64d394ce0d346132b78c7d4d20feaad6
 MISC metadata.xml 232 SHA256 632aaf9aa7d98b88463108bcec0a5b12ed6326de4af70b5be1b687beca984b6b SHA512 707f1a48a57f27c03f9b0058f4089f87a1206ddcc0b94923635c0bd0b8c8b14b8b971ed840d028b683e66ea9f7e1c7496fb16e62dcb4f32bacb6a5c35ee2dda0 WHIRLPOOL 472df7b85f578c22f3af5bdde50dc73bcfc2761daa9af58452a3b9cd08f727aaa00c5edce359474255ef4477da15826464441c2cb1840f6d96f1bae95be56815
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0
 
-iQIcBAEBCAAGBQJT5RyNAAoJEC7dUkA7aK9H5eMP/Atu3fVS8ZaNLxX6E5kbVa9H
-QWqZxcDkzetzSx5Vau43ifwoFjBMOtM24YqqORN40kf+1IWO80rxNS5paVI33YqW
-VXoN5BBPqePm7k4DKfia89a8eER89p9Y3a75XUucz5AnMDKtO1N1mh0dvIrMplMp
-JI/+n1+oB+4M61Q3PHjoWUIDqO6wb7uyDxWLzku6C4p+ABNff0lnzUBznhDFaXkN
-cpPdAkeJ3PpBogG53vdzUJQuOJybL65FxF/oIlPyLikJPZxE77E+hpIFJ14yqSAg
-P5ptz34H8/6JxWscl/3ywfBt4+2rqFbYlNBVSkXgTpAhMgb+Vul4a7CTxVVA67zl
-7qL3UiqFjLDaarUkxea7d02n0ap0ej7Nzjxm7SuKViNqWB8rw/MoWUhApppWw9xP
-f8HIE4sd8wQYTb3x0O6X+DeEkZ84kiHgoRgBLDrKV3s8Q5aKL38aN5e/FCQp4GCJ
-ZAc8j5eWCBf23jGL2BlZgNGD+e/xDTS8rVq3SG2ClmgfhAjCrkTssHvubUED3wq5
-9IV9KWzE87HQV3DEQPSQMjTIFWaKUL8haToOV0kCfsydeXmR1+gtINtYjEg8TX5P
-/sV6qSEoONtQYuU/j8ayVWpxhywQfViqxt1ZLrK0Vjxa7gSzlOLer0AjMXG+pEVG
-SWW5Jrvr9uUHjldQwhe/
-=SJDa
+iQIcBAEBCAAGBQJT5nhiAAoJEC7dUkA7aK9HJU4QAJTBcXRA3ql5/lymkGmrXCL5
+vS4dROPU//zFwiRYMvjtEsAhUn6lSD1z11Pqo7nYOK53C/pN5tcgDt46iN0O9HMF
+86cOh1Z8014MOAabNbTdKP/062aZi498R/+hVLKtKM7jEdSi6Q9DqmuuMD9enAA5
+/N5QE/TO11dQDMq7zwUK/cWtarcqhXaVx4lWzg+oZ1KYgsUlrgwYgBD3zyqUMcXx
+mcN65RJEjhyICbB16o3ufotiMI8SXzxJqSBvfpWO3Cl+7yh9PLhRFYqkIzJWn4Iu
+qCJuBSHnN7dhwXx84uUKbYphvVBPZ08Q4ZOXBqtkGk/3+A+mjpyfedlchlXZqRss
++Em2nyMIjMJHoWJPBDFLNSMEV5U2fkP9BE/CMh6PPojG298Vx36g+34Drt6HzMtP
+jcY3HskDDnkJY4TLDYPKyotuzWt5oYMavkazy/Mrz52ZaoXb57bBGyIdiuEpmfUO
+qUv7hHirEGJz6VZzrVNqZ9nD/novQKliQ+j3sClqkf8c0vI5Nq/0dg8c+y+g64pX
+76q4+XafHapeLFRzTsPgj0/BvSptPl7JFWisl0ooI8iF3XpB2SQ9ay3jBp7J1492
+oeBouFbAH1dn09QQ2yXu0GVFRGXlTgfvzlmC62x0rHFTYxOe1skQVSRMDTzIJpD3
+7hAktvXcwM8pa7rMvnHj
+=QoaS
 -----END PGP SIGNATURE-----
diff --git a/sec-policy/selinux-postgrey/selinux-postgrey-2.20140311-r5.ebuild b/sec-policy/selinux-postgrey/selinux-postgrey-2.20140311-r5.ebuild
new file mode 100644
index 000000000000..6050cd955e4a
--- /dev/null
+++ b/sec-policy/selinux-postgrey/selinux-postgrey-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-postgrey/selinux-postgrey-2.20140311-r5.ebuild,v 1.1 2014/08/09 19:34:48 swift Exp $
+EAPI="5"
+
+IUSE=""
+MODS="postgrey"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for postgrey"
+
+KEYWORDS="~amd64 ~x86"
diff --git a/sec-policy/selinux-ppp/ChangeLog b/sec-policy/selinux-ppp/ChangeLog
index 6206da9dcee8..6bcc3d6e57fe 100644
--- a/sec-policy/selinux-ppp/ChangeLog
+++ b/sec-policy/selinux-ppp/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sec-policy/selinux-ppp
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-ppp/ChangeLog,v 1.52 2014/08/08 18:49:44 swift Exp $
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-ppp/ChangeLog,v 1.53 2014/08/09 19:34:24 swift Exp $
+
+*selinux-ppp-2.20140311-r5 (09 Aug 2014)
+
+  09 Aug 2014; Sven Vermeulen <swift@gentoo.org>
+  +selinux-ppp-2.20140311-r5.ebuild:
+  Bump towards r5 (fixes duplicate context for hiawatha)
 
   08 Aug 2014; Sven Vermeulen <swift@gentoo.org> selinux-ppp-9999.ebuild:
   Make 9999 ebuilds EAPI=5 and transform to make master for version bumps
diff --git a/sec-policy/selinux-ppp/Manifest b/sec-policy/selinux-ppp/Manifest
index 2ceb20dcfbd6..a4569989d5ce 100644
--- a/sec-policy/selinux-ppp/Manifest
+++ b/sec-policy/selinux-ppp/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-ppp-2.20140311-r1.ebuild 375 SHA256 6de303d3485a5c32fe8f3d75ddf92d0d7a4041d31720ef84c34e9f96d21ed9cf SHA512 a0b171dd92cd0350dcccf7c2e770bf5d693703e6df4970deee0c1e6b5ff31180ae73b0ed7aecdc86e947484ed7718519201d1caf5137d9f8f1346421e6b207bf WHIRLPOOL 7cc22f0eab98b3a535b316a7286c77bf914023bbfab343322eaa44fa5e587dd41d3716aae3b140a16da1c79798126200dbacf4ca6adf33194e5b7f39f49ac22a
 EBUILD selinux-ppp-2.20140311-r2.ebuild 375 SHA256 64caeba587f52f828a66fec7ba4748d301649a071b6be9320c86815e45e9659e SHA512 c20835d258d89f30712a11ec1e9b21f3992720af885ccdb3510d1cc4ddf2ffb04488bc4770e1237023f5df184ddbf98c95b2e8018f4aab8ec6a3105656a4fb77 WHIRLPOOL ba9e20691271a9de4974d74522a9c6897678d773cfcf539c28a24e207aafede683d7fdb99e908dd80f3dfca9b6d8af95af2ad3c4aad5aea87998c3430da8b8c1
 EBUILD selinux-ppp-2.20140311-r3.ebuild 375 SHA256 e02bb1591cc0583ab8d46c6596bb7aba77f440933bf78a26c6848ce39013565b SHA512 2df5d34a3eab237ab29d72183051c8d7caf6c462f68b7bd57d1b0a95ff7f343057cb74ff62bf5af0dfc6493daca1182708b4f850f76207b05e75463cf3d273af WHIRLPOOL cf98780eb956a6254a5d09371f8128c7aa269f7724faee4981d23c21deea0ba475bdda8116b7159f80e2144133a4babc82b9d2b6e455e3fee4df93276bc7453e
 EBUILD selinux-ppp-2.20140311-r4.ebuild 377 SHA256 f5daea0d7664796fc17336b060c1d2047164b1d1593f2a2c128ff6bc231e58ee SHA512 f15b6b98fc12f9e970b0f8fb71a23c42eb86e503c9ac891f8882126962c76addf79e1cc85a70585b5a502396e3204b47281811c0792163a190b9a985fb5bb218 WHIRLPOOL 0cc462b0bdc57feff13c5d07338730980690f87105b14552941e2de95d8996fcffc20a8e8693f26028f52ff57647498d069dbd422b4442a81d106cd94db417e1
+EBUILD selinux-ppp-2.20140311-r5.ebuild 353 SHA256 3d26473747d8e287ee6cff3651d175203f0f34c46eb569d25bd92f897c3d71bc SHA512 b684974b6c36ddeeb9f551241683687438f9afe0b45466309968c54410e26051ef1acfd210b5afe726094bc92146162dc625dda83f153c2a909a71a88cc0688c WHIRLPOOL cc41261123d85bdb56901459797711153035cb81502ee6e3feb9d6844ea66cd864ab95dd49ae71b7f4250b20b03eacb5b6dfb14cc6f00d06dd1f250548fe8399
 EBUILD selinux-ppp-9999.ebuild 333 SHA256 b307e3c16687abe130c4aff605de25e1f5e7ac525271df707d185958adaa355a SHA512 30bcf8128e700efc999c3c7510bead18de30558e76896a3f568ee44f1e52a20bea404699201dda05e7b50613675ca44b0e139fe05bd611c002ed07c5c7134044 WHIRLPOOL 9700f00250e894f3cec65d676c39b1fb9a002c33c91b76b114db577878f7187a21a92bba634be156e0a573bdb12bc3389f9b5f27f5ed7e687f54930adb2f5693
-MISC ChangeLog 7833 SHA256 2b744a18ec8cae327fdb5df79e9496b8b37474f5ede43b822041e7aa5ff077f7 SHA512 60a774c2847b2cf9f789954fbccc7a7ed87300f37d3a81855612b71a5e8a44ea2330f196bcc81036401fcfa5dfb2ab6bc9fe2e347de1e427339fb47ef1dcf3d1 WHIRLPOOL bf062352ae8b605d2c8689984c32e50b2a1d924af7be799bac93c4414507edbcb7e3749d0cbcf88fbd71a351df1601c77e807e509bf23a2e8259190933141a39
+MISC ChangeLog 8019 SHA256 3f26e2a42ec797be9911024da3a916a925017c138eb28318d883dbd7ff5d4cc0 SHA512 c37ba93e844a320e300ccf7f5418df5b1df834f6299bb6bdd8ccad54718e0a3b744e9454cd454e4b46faa8de084b5672ff636756e3d1329d6140a22df697eb13 WHIRLPOOL 7c3fb33024f3e30d30636fba5087d5bd2c1e99f496479e5adbaa617af971dccf9addcd60ba7ae7d0b4475b0e8200b472a82b6711d9bac2d65c5f05b5cc41ddd6
 MISC metadata.xml 227 SHA256 01af0f74c7331b52d9c8ead83736bc88a5ac27c8e9f9692e15314de6f8bda9d2 SHA512 d52cccd534b297b5dbde596b03ef579fe41d83112ce0b2dea2a79fa053d8803a9a4c6fafb36fd2c63fd40163df2516d215696445687e7b7690e9f8c9660def79 WHIRLPOOL 452061e29f75a996612b5b8854bd9fe555038d47a4a7f9a3ebf8c7e74e988432d86d364e8808893f741f4b575394cd571c034a18e36cac88bbd0d909289cfc7c
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0
 
-iQIcBAEBCAAGBQJT5RyNAAoJEC7dUkA7aK9H2YcP/Rox9ueRnziiU9+flf6BUuvm
-1HiFT8B9wC2eTtatL/cNTWWG9Qql0pkHIJFSV3nB/KdwFK29Y9MxDA2zqrKoznsG
-BxhA91jhgN03xFj0fvnDghlUlo4B4gnPUMkhcjU0V4A9OKhkNww16LtDCqM9oObA
-7PJ3e5bvgATo3Vr7rgJKYZcbzwxreRLW0YBbtpzf+sm9IrCOQP2yonj1HKB4owV7
-l9vleXk07ajbFDHa3e5jCDth8a8ZsohcGRH6JozWvYLZyWXoQ34oX60n/wG7+G1W
-Kz4klVw1pkmK7f65zMSsp38m5nD1Wx+wbe8c+u/20OEEbj6i5g31Bgr4QplhQBtQ
-zxiThs1I1lN8q9jTvWWtXwqzkxYgijN8tYZ7HVw7L2Kn2Bz4o2NVMr48+Njo1PUq
-3UP0ksqNWDcmhbSRS1CDcAg+GyM9bqtuxbXHR3j3h8HQMLkHHIa5HNV8Q8yGslkX
-9vjApX6qWPYffz4SWILBmAbzm2+O3Wnb7zobB90GPnbYBtiodxRa8lz0/NvocSYQ
-IEbLorfcbfJdVmyCqVVvV6MQpMFhBlFX81yiH/g7gfBoNJXX8G38IAL8A0DUQxNi
-xnwfYRhJnzEzR2/qiDKxkgcnFjQqUtORthsaMQe/dSgZWq9/OssAlqZ9/WfaFQyV
-S95gmBj7OLRognacX3h3
-=K4fr
+iQIcBAEBCAAGBQJT5nhiAAoJEC7dUkA7aK9HAdwP/RAwuBk/EBiwQPx9xqa/6L/8
+qppxJBUCujC0vUbAv7GM8i+AyBBV/bwVotOkgE1Hc6+BbdGDnCZG6nHqksORAv9W
+0sUL48DR1wQmH23FHlFa7Ya/ZQmRxWHLczwTPwtscccmz1e5sA9g88WLFaIWglTk
+HFkRvY93/LLoX6kGlM4mqE/2IpWtjWu/a5R/vDvfdo8EwDFM8HMuklQ53xcfydTe
+XwojEWm5Lo/SjX8+42qCPzUHVzIm/Zh/0kBocoY19VtxuLfD9TepGp1J11RT4l7g
+bP4BX5/jWmHDgfzx1Nr6yoOAGlfhpqrXOWxBb+LU45oVBKOqbEnPwAxmFjVZz3Ar
+V90oAVhIaXomF8fz7MSWVD4nh+zJ0d5sjS9IMW9G3T+5y5yWSMQPW/u81R29Owtq
+q5ZtQwddRy4UUNDkmok6xOwpvGnohu7NKtiAycICocGzt21tZ/TAIKgpjrfrQJz3
+Y+zvIb9qLstbL0tHvdXyv1OU6N3M3jObgwMcQZt5vIcyfw3Y9vka19SPtSIFOTrq
+qcfG/71ZgsPE8/1eET908Th7hYAhNoYPlk99ADKLbxZeZ5Ail7Cc3TlhsuyZwNXn
+ONhhI9FBkTT/iUNHO94i+OuO5D4G6SvFBxMrxWizlvqxUlgPYZhggelbI/w3I18l
+rCfsqmLHzofjHe7Azezp
+=aNxI
 -----END PGP SIGNATURE-----
diff --git a/sec-policy/selinux-ppp/selinux-ppp-2.20140311-r5.ebuild b/sec-policy/selinux-ppp/selinux-ppp-2.20140311-r5.ebuild
new file mode 100644
index 000000000000..18d03b297707
--- /dev/null
+++ b/sec-policy/selinux-ppp/selinux-ppp-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-ppp/selinux-ppp-2.20140311-r5.ebuild,v 1.1 2014/08/09 19:34:24 swift Exp $
+EAPI="5"
+
+IUSE=""
+MODS="ppp"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for ppp"
+
+KEYWORDS="~amd64 ~x86"
diff --git a/sec-policy/selinux-prelink/ChangeLog b/sec-policy/selinux-prelink/ChangeLog
index 60e3bd8df372..7a274d190432 100644
--- a/sec-policy/selinux-prelink/ChangeLog
+++ b/sec-policy/selinux-prelink/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sec-policy/selinux-prelink
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-prelink/ChangeLog,v 1.42 2014/08/08 18:50:06 swift Exp $
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-prelink/ChangeLog,v 1.43 2014/08/09 19:34:21 swift Exp $
+
+*selinux-prelink-2.20140311-r5 (09 Aug 2014)
+
+  09 Aug 2014; Sven Vermeulen <swift@gentoo.org>
+  +selinux-prelink-2.20140311-r5.ebuild:
+  Bump towards r5 (fixes duplicate context for hiawatha)
 
   08 Aug 2014; Sven Vermeulen <swift@gentoo.org> selinux-prelink-9999.ebuild:
   Make 9999 ebuilds EAPI=5 and transform to make master for version bumps
diff --git a/sec-policy/selinux-prelink/Manifest b/sec-policy/selinux-prelink/Manifest
index 4d5f43db648c..02a7114cb91d 100644
--- a/sec-policy/selinux-prelink/Manifest
+++ b/sec-policy/selinux-prelink/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-prelink-2.20140311-r1.ebuild 391 SHA256 b5509cc80c5a98112cafd29ec20199bad92683da16ccf6d1240398344bb3e2aa SHA512 49792657c7da6876a48cac642c2253df397fd8cc835adb5e4cb893e4ad11054b2adc8af9f2124c7348d30e6425f8de442c053cbd4fa27cec055db870cf777142 WHIRLPOOL c21bdbfa268c4320c33aa480717eb2e2b1c6182227154b060c33d1ac3d91042f61dfed6b85ab73932fdd6347f485e22401370a1a325f478e4f8297e8a79aba54
 EBUILD selinux-prelink-2.20140311-r2.ebuild 391 SHA256 7cf30ded02c3e594a95e470f3de4909b4ff05fa2a53d2cfeaab0fe54670480aa SHA512 dc14f376fd801ba70362fcf89c5d25818ef84e75a6c54a1d860b92b7e526f9e7e7e8fc5d53a6e0cd4a2f4c194bc260bd960cf6e933212c96a59518a290e611bc WHIRLPOOL af3f6551e6e59ae9da6b7d2dcd42b64b6726585844a04130f5c7f568e32cc194e09bae008b8a6cf39c16661b31f8d8589863fa6d74434fea6780cbf22392aa54
 EBUILD selinux-prelink-2.20140311-r3.ebuild 391 SHA256 c3b0ecd2f922fadd5a603bba3645b80fbb591f4eab2f1cfbac541b645455c108 SHA512 d6b2fa9cbeb0a05728d4a8b3bc79e4180fe17a097f572301b9285c22825f72ead78dbd69f8405ed0505403df5e982f2611a74d8915e3bfe9eba464792ca4088f WHIRLPOOL f25dab54069cf5c6b20cb89cc9415caeef857158c09e3e359043ba535fa0afc445a5cbf2b6e519f3041b611da92e2d805e81a7fabf5a2cab1c6158626f6ba983
 EBUILD selinux-prelink-2.20140311-r4.ebuild 393 SHA256 bec094c5bc9fe7374771d32c958d80847b0ca89fcff1bd542a4d248300da87b6 SHA512 edce8c1c8319e5ec8557ba2b6f0de297ade224dbe8f3f9763450fd057c2e15a2a8b1bf89a49a85aa3a75dbbd9ee5eb32cf069b5b270cadcdfac1d545756b3ed9 WHIRLPOOL 94a913a3714e16ce25c088d8f835f6d16805429f2928743fec0cc0f43d9a6076d2ce101b643bae217837e42677254e708a890959901f0e1e00c0105e590c26c4
+EBUILD selinux-prelink-2.20140311-r5.ebuild 369 SHA256 67df23ea022660187f828a5f0dde421c63c80c76ed157021918a05f283a9e2d8 SHA512 eeb14f6ba56dd01f07cb72a49617efd4d2674e4af6323135e78dfaf7ede3322e4376ac4b4c7488806312a0bf456403935a434d788c95cfc300efd9641391cad7 WHIRLPOOL a86168d5d55b41b7b33a60eafc63edcf539d07926839a83091f1f58e2ddbd2c41f6193226ceb90f94e95e15494565d98c5041b7be87e42ea7007936c3582595b
 EBUILD selinux-prelink-9999.ebuild 349 SHA256 6b9e4a32c8772977a4a90f53f588e59ecdec13df94eec20ba0cf0d6c16a204ca SHA512 d21750028a3fa409aad5fa54538885dfd7447ab42a500dae772243b7a345af811a200ee826131a41a2186f6f6e016c3026db952cc40f2d1373ae041b65ce0227 WHIRLPOOL 392e47e4347eab21e241ac51b85abae3a9ad8344d12c43fb31e094dc2baa55a0fe7f3feb6599c947432f1bff48d6e45f43e8f171a80a105171057dc37ebec68f
-MISC ChangeLog 6589 SHA256 4f463e2becb30ab0d01081f50fe2f2e6f34e4b7b40e2c6dbf70a9913b81e9948 SHA512 ae77a04b047fde341cb3ec08502251e5a8499be2218c7443bcb8245b2349e0055e61cb136063604b022bfe9de4d84aff97d8e701519323843bb5dc99eb2bcdb0 WHIRLPOOL ca34b5506b6d12fad70a99cc4771496e402b30edbf9c7577074a29a6365e2ba872996616afa3f26f046e866730c665e959adaf73646d073b01f4c28f8f1de7ad
+MISC ChangeLog 6783 SHA256 bd0c1bd974b0fdc45b0aa68c923a385cdd72cd67976893167d3788bbc3246336 SHA512 d4b2b67292f07e1fc42274da0ebfd77d7bca14c108de6958e4ef65124d393dca668f50fb9f6d91e1a388dcd4c2ac5b85df6a173ea2fe7e957ce1f42f59786129 WHIRLPOOL 270d3ffbab63dff0107843b542caad28b53ac7939c78d9d3e57e00fc435f5c65ad964e19a0b4ca3c69225ca2f98583b8bd9a60cada371fa442c182cf2c7f1e1c
 MISC metadata.xml 231 SHA256 b0cba9e4fd3951fd6f81cf757b17c4444ff9911605530a9debf3c21fcca679dd SHA512 11dd40d2527c9f020c9773d4a4d9e4817f289d59c59462a76329af53c49585471f96b5b9c162efd4438c3c160706b69632940a04470306e38a0eba506c226f51 WHIRLPOOL b10d19a4f7520a0cfd10dafaccb9fdf7267f5f1bcfc69b7960db1496c8a5c40aa54044248f72df3a140a261b1b2b4f887789781a8410e45188c692d27557574d
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0
 
-iQIcBAEBCAAGBQJT5RyNAAoJEC7dUkA7aK9HhikP/jvxqwQi9JDsRpGgsWhgSjSP
-3jCKMQBoPP2i3Jll8KH/WmgOoShc0hQAvBrS5VQT8bI/eyAAHZSWd14OxYpM699s
-8ui0cb0Q2f/S11YFUNLqOtNrt5bZ6ZEbt+uCshRMy0iMvGoojW7C+9Shfj/KRp/I
-jJLUX5DlXAWBE1etdEYS20/LEMDiBWaEnN+NlA2SbV3aB4j7YdBgyvj1nSjBrseu
-XyfHg6lIXunoru/DEYgEuGecb/MdA1y/HXgjeIeM5smfwtuco14xle8Jc6jJTjwJ
-TLiuWFXD7toN+7LVG40SuE5FC2FYvvEjxeKxV2pn7lVZfkLCIYnjbpum/6RUjBg3
-9Ve0oIjGtvIS4IXZw5RHLq1DR+l6qRtFMbd1480jHYPkfzQZG44+UtCOQymjNyrS
-7ewaBoPkfzBtlgMCBM+uS63zQqM3rDl9x6Ans80Rqs+ebRVWeKqaADsWf15XEjU/
-Y6X++AmXrJzrriqdd5+oXWq6qjHcr8KB84wahXNWI1hfWdykCn9eCMIwAcgKSBiK
-bmmqQHddpY2sSrRg7v4+M7cuu2APs4nXNmZ95qfAwnFX6phU71IaehZgaZEluvD7
-SAtx4ffpW6XNZkqegphQSJArh6xK+8zyIhwBeydpMvQqIMYODGpfPQAjr7dBbm4B
-DlOp6VXF0WC7ITv9WvPs
-=RXt3
+iQIcBAEBCAAGBQJT5nhiAAoJEC7dUkA7aK9HX9sP/3CnMYn6IZdmMFwFd6RLSc0L
+XnMAlelk61SuL3FqoLMPu7fWT03sytpjVIhWLQnjBzhfbAxGmzZrXc3MbnvG4no5
+oR32UqM8y2zGHoZ1mdPZpPl2AkJHs4eiUUjjIlo5G1agLxstkQZrvJHTcui/U81S
+9VNIzlLStERJKiBGsjTmo9NqEUopTWNiWZsTAmGcxsfHUOA9vgqsA9WajFjYnfm5
+33sOruf/nLSUSLnr/9Er0GpHlHxA91Fv43dpbK6mB1KrXYaPT8tpXkmyflYhgO4D
+q85B8iXcII2QgkMP0Lyk6RlwM+KswV68zW9FGGr5o4VorJMhzSjBH9NmOraAz7d2
+SiyQqWNAHFMaI2VUU9tBSR1VzvKePTKXiKCxYZUvJhhnCbPJ2gH+znJWr4QuUrFP
+cEyUj0NIJqUA1DxMU0I2tPtzxlFt6DWS2lVKy89KCgmc64dsSNpk62B16fa3Y5Ds
+pCzwSqNZ1dKGWSC46LKozh0OM/OnJtLC31qKqXnEzSenCetRAcKb1M4TNBTHTNOs
+Wmr7hh3QMcMLmOk7sIqM2tBAdcusm/B/V41YbAjNff1reL13i3uCHpVCeBYbwbtO
+GdnNBRI8eyE9M+cFSOLGBhfa2MuHlu8XzWMtDxJmxhWybt7X+bljqm07ZupJU52W
+A5F3Mg4FKjMzlMyzjpU4
+=3BKB
 -----END PGP SIGNATURE-----
diff --git a/sec-policy/selinux-prelink/selinux-prelink-2.20140311-r5.ebuild b/sec-policy/selinux-prelink/selinux-prelink-2.20140311-r5.ebuild
new file mode 100644
index 000000000000..5ad63c3dd3b1
--- /dev/null
+++ b/sec-policy/selinux-prelink/selinux-prelink-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-prelink/selinux-prelink-2.20140311-r5.ebuild,v 1.1 2014/08/09 19:34:21 swift Exp $
+EAPI="5"
+
+IUSE=""
+MODS="prelink"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for prelink"
+
+KEYWORDS="~amd64 ~x86"
diff --git a/sec-policy/selinux-prelude/ChangeLog b/sec-policy/selinux-prelude/ChangeLog
index f0552500493c..c904d9eb716a 100644
--- a/sec-policy/selinux-prelude/ChangeLog
+++ b/sec-policy/selinux-prelude/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sec-policy/selinux-prelude
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-prelude/ChangeLog,v 1.43 2014/08/08 18:49:43 swift Exp $
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-prelude/ChangeLog,v 1.44 2014/08/09 19:34:11 swift Exp $
+
+*selinux-prelude-2.20140311-r5 (09 Aug 2014)
+
+  09 Aug 2014; Sven Vermeulen <swift@gentoo.org>
+  +selinux-prelude-2.20140311-r5.ebuild:
+  Bump towards r5 (fixes duplicate context for hiawatha)
 
   08 Aug 2014; Sven Vermeulen <swift@gentoo.org> selinux-prelude-9999.ebuild:
   Make 9999 ebuilds EAPI=5 and transform to make master for version bumps
diff --git a/sec-policy/selinux-prelude/Manifest b/sec-policy/selinux-prelude/Manifest
index a71852874e7f..7a8a1125eff0 100644
--- a/sec-policy/selinux-prelude/Manifest
+++ b/sec-policy/selinux-prelude/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-prelude-2.20140311-r1.ebuild 458 SHA256 284125e7a7b1f7530e9326a5d7cfff1a52fe0293d5ea3a81b40dc79cdcb4cc88 SHA512 0b1ec7f8615f0c88e6973350340ab9c3658bf46089b8e7b456feba37f34bd22606cba18a32d57cdf39c92f908e00c339dda75393984e6ae75be547b868896b78 WHIRLPOOL 2de0e3529eb406c8e1eaec17a7dfb56e4cdcc014792cd4e0546fa2953a138da65d99387d75c4647c880759b0452426c933192cda5a08d6e70c88ca5e26b7b43f
 EBUILD selinux-prelude-2.20140311-r2.ebuild 458 SHA256 4db13a1060e44e41c7d9a8935c5a854477a5d74b02fd68a7cf1a1f37b174d76e SHA512 7c201ca78178e1623938b5bec7e773fd59eec195012b2a508227462d3cb6fe28d6af64ae21bdfbb38d9f4ec7a274a1c6742ef66fd2885c554fc7b34a3ae6bf7c WHIRLPOOL 7eb1b7cf66a4a837bf5ae83b8476b2e5b4cfc4ca2049f0af0f208e74734c606ef4dfd978b378e8c925832584f7c6e0d5b72ebe199f9ddcf738123d6b20cef683
 EBUILD selinux-prelude-2.20140311-r3.ebuild 458 SHA256 fbccaec1b9809982cae3e34da1d7e6726a11e547c6ea3ce6de85256fa99d2fa6 SHA512 a4d1eedbc829a947b242c0e9db9696e4525305297372680b201e6bc8dc049720c14ff6fb70a92551a0388c176a63656ca3c03b161197f85cec3fc8cbb004212d WHIRLPOOL 11fe4540ed844061b46b34eb39becace3e35c8a86d4d6ce51f53be8b97e1ac8cc5fb2adf3982117bd565900ad8002b421fe450ef4257a8b4b77c350b823e945d
 EBUILD selinux-prelude-2.20140311-r4.ebuild 460 SHA256 461d39a6cbecf909a3a4b78a618bd3ef49b41e584d543179e2becbdb0d9467be SHA512 253276140f78e9a39e787be05fbfc86d0c176a9509df50982c52dcd2aeaa3330bb49188da7ce85ebc85638751feb6c7cf62be051266b9636f60acc1e0fd4fa70 WHIRLPOOL dade6dd0480c5a7ac3460b1324a99ad0d891ca737ddcf4641d92b63becd8f4159f5bb8a4ab665bcc3d98a263519a3c18b457ceaa2082f1ebedc797371a11de90
+EBUILD selinux-prelude-2.20140311-r5.ebuild 436 SHA256 fab3db5b6558c123a85b0faef191fe00b357ab1681b06a69d6094cc25a362863 SHA512 323f5b3d9a47e9ee0a21f7a2eff87f38ea0cd13c1819733a47a86a33e3229cd353c87ff633861c4b834d7cfd180f64c3ee2a7cbceaf5970d4d907a8b63f62f12 WHIRLPOOL 925bbac04d5469283305c87049370d70b77649c380d2fefbebc370e954047bba71d69bea4e384c604cc2e9e72c223e42bf76bdc9f0f8607c9e14586e1f89c0ef
 EBUILD selinux-prelude-9999.ebuild 416 SHA256 9235a9e4808b813c7f10c63fce3a323d66b2b81219dfd87139c0729e5367d7f9 SHA512 5ad126f9cd53ee3cbda04059f7fc67cf873694d0ec3e2cf97c8fe73e17e8d78e6609bd60971e61ea5d7058b1aa60195e98da123805c618bc516a355f2e2dc5ab WHIRLPOOL f2748115e075b10206ef4cd6e20063a1fc76b647a7674f7013c1def70c0e710648b353281df93630cd41698ffb823c5b67ab584dd1dac826ffdef4819f8f6eb6
-MISC ChangeLog 6733 SHA256 b42d9045d414f81bfda173ca7e66cdfdf1ecbc03dfe49bb46448a540324e3d81 SHA512 2212fa07537db0ae7d766e117ca9b5854210e7293d3cbbc019bbd025c40f66a4ae497fc793678bbcb8ed2189199a028ca14082b8e09878267e14b8967d566930 WHIRLPOOL 51c78f4c92cdc097c2c60ac5b55a5ebda7594dd7b9868dc72f67979bb3cea9b7b9bf7658cb4ca0ad21aa0a5a7c9d941cc0313cb5b6883caa12cd3138a8c68a63
+MISC ChangeLog 6927 SHA256 ca600b0c74fa961c8c6a7d3dc80e3d6f79590171fed1ede97db2b72a40a22994 SHA512 6f7d0b35451c6c8c14797f7931a53678503c4f868a79354605d2c5c940b4594df65fd9bd2fee9eb24561562905e0735118ab5031d78e11c326545dfce3cc28b3 WHIRLPOOL 78e4ca72f3df45ed706d4fcfa07a8464349c6712b0ec1de8e7f91c0869054fefc4aa99444717d9a1c992e85a1cfc1db356fab43ce8ad5f0a91b3d74b34d736f6
 MISC metadata.xml 231 SHA256 5fc03b80d9080b4b1e539ec7acd66fe040edaaf52bcc2a41acdd74a1d21bc824 SHA512 04ae569d50641c7d1fc7120353c21bcf667dc3b1ceb2a5dfd3c2b900adf35a3466ed08305cf585ca95dcbc1bd5cfad6a8fa754d3306c516a76d092782c90d602 WHIRLPOOL d34ee44457334ddd2c1940b4c73f9bddde0adbd5ed73a39ad04118305c7d87f26503e8d0efa4ade3fa5b93c886dc7d91045ca32bc8e87b3210b77251eb1677a2
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0
 
-iQIcBAEBCAAGBQJT5RyOAAoJEC7dUkA7aK9HZf4P/17Ly3JU/1xjAUPhrNQ0wAoB
-Xtkjqufv0Qcu767b0xCY+fBCC+2olIv1Q1iP4sfykE/9AHKEEPtdF1zVK3mEcOuk
-CggmZHqPTc8QSKluFCdzgiLOCVxMq0i+jvdcgGpi7echUGdAy1aCPJYHMVNxZAnO
-OMQ6Bhswz7b3f1Pql+0BiwzXumuiV0lYTs5S8p8TrqNzzxewKb/C/cOQsjgubqcJ
-nCrWEHOUlbV0Ypt0yN2kxA61VxIUaCRV65mNIvpcgbq2j7VYiRJPRsbOwiEJ8hw1
-hvGI1o/jOp4EkLIOkOiop9f7Is4oRzWB6UaF+OIWgLa/m1nXLCl49xTzMlEuoEFl
-hc0Fe6ook4+2tp5JVn7WKliq99Hrs9YUWD2wngXU581GIOA2hQvGVdnGq1xmrZ98
-3p/pCcqL3dY6Oy4v1XRPH+vjFPfU/YNLqLcmZt/4ke56pn42gbRzicOZRGnoq3jq
-QFK257r8DSq5PknnXnO5y+pZVc7x7ja6oZAZV4k5zA6jQuzej3ZPEyCVAaPVVdSM
-ORwyg9mDbL2xEILej7cjBwEEJdEnvpslV3RbjW4CVpKLWeDyYk6A+z+7kdGM8J3l
-dqzzYbrWU1y+W34JPOFrkWyrYovbVNTpfTSxlFFlmquRKeVMcst6B+11qw3hhYa/
-zJtNyhtUPzqVKKO50tRL
-=Ytsi
+iQIcBAEBCAAGBQJT5nhjAAoJEC7dUkA7aK9HZ8wP/ie2pHS/1+e1oB+pYE1CoCr7
+inOj/Rb3yY0BkXMe7UsQUR3GLdodI6qAQL+XcnJGzzi6jDfYAPPB1sPENePcb3rh
+QwGs+FO1mcYhqZOc/qbSa34vjV6+Uha2WH4L2faRlKovs0wGMytWzudIeG3K2Wu5
+23oIxviLW23Q8+Fp3TnfOPBH9r0ZWDkZ/A0/a9sO6sJfjvVORAITYHkGhsKKltJm
+OFalG+Gkh7vSO6An1WTKxwoIJRUVLGNE9WL1fRzrtcdn2ksTvOUFuZOuldS9qqtp
+qdNudkWtbharGPJR7AFi97sReYPeTpLoHGkQHlZcL4Fa4yFu4QwAGqjTbCdH8mzm
+/jbUBRIQhlWft3dLxrpKz1ZTO6dOh5HZ3bSq3TR25dGo8vnGjRtywBlMP0lbw42Z
+SlOvNh/BrnK7HngP260mI5at5BfXrb7xri8/rXXiZdLxDuKXnUZxoCnuday86YT3
+lEWidY572wGmmFOQxl4fOXqKYvztD2zavMadBJ9+/txKYLJWg3j9yr0GWzasdSo/
+3I23d4Xkdxtm0TNUP50Xn6zToDeZrJfigIFjM5beZrqC2Bxg5335YsveVMnxOxtG
+ocIL2iBuCkWB+gNDb81yu4GZjFGRAGdq9g33jwntCs0o62IB+GApiO3zVxoTbRZu
+SbxV+Ixw4oc6G/I9QPLq
+=HmqT
 -----END PGP SIGNATURE-----
diff --git a/sec-policy/selinux-prelude/selinux-prelude-2.20140311-r5.ebuild b/sec-policy/selinux-prelude/selinux-prelude-2.20140311-r5.ebuild
new file mode 100644
index 000000000000..2a0698cc7dc2
--- /dev/null
+++ b/sec-policy/selinux-prelude/selinux-prelude-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-prelude/selinux-prelude-2.20140311-r5.ebuild,v 1.1 2014/08/09 19:34:11 swift Exp $
+EAPI="5"
+
+IUSE=""
+MODS="prelude"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for prelude"
+
+KEYWORDS="~amd64 ~x86"
+DEPEND="${DEPEND}
+	sec-policy/selinux-apache
+"
+RDEPEND="${DEPEND}"
diff --git a/sec-policy/selinux-privoxy/ChangeLog b/sec-policy/selinux-privoxy/ChangeLog
index 27f3e84aa75f..649371cdc791 100644
--- a/sec-policy/selinux-privoxy/ChangeLog
+++ b/sec-policy/selinux-privoxy/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sec-policy/selinux-privoxy
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-privoxy/ChangeLog,v 1.59 2014/08/08 18:50:05 swift Exp $
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-privoxy/ChangeLog,v 1.60 2014/08/09 19:34:06 swift Exp $
+
+*selinux-privoxy-2.20140311-r5 (09 Aug 2014)
+
+  09 Aug 2014; Sven Vermeulen <swift@gentoo.org>
+  +selinux-privoxy-2.20140311-r5.ebuild:
+  Bump towards r5 (fixes duplicate context for hiawatha)
 
   08 Aug 2014; Sven Vermeulen <swift@gentoo.org> selinux-privoxy-9999.ebuild:
   Make 9999 ebuilds EAPI=5 and transform to make master for version bumps
diff --git a/sec-policy/selinux-privoxy/Manifest b/sec-policy/selinux-privoxy/Manifest
index 64acda5a6c2c..f3a22468c269 100644
--- a/sec-policy/selinux-privoxy/Manifest
+++ b/sec-policy/selinux-privoxy/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-privoxy-2.20140311-r1.ebuild 391 SHA256 11df8e897841688926fe386ab5f8bfce814044eaa7e4b0c684f580c5cf2c5cbf SHA512 b8fb7374f6f7e33abe351e670d50d8c28daa151ef0b15d6ee88cd2e5ed75fd955c57965c1211b1f61a3e9c13985d7d82330ac1dff3b9a2b43c40b2005d37c024 WHIRLPOOL 1d5eb7778c82c2b1eb46341783af5040a404efd6d0eab7577d48b22b28339a1c3517330def203610aa010e9f99b7c3ce9d8227bcd2f2ddc39e1a34ebe53d454f
 EBUILD selinux-privoxy-2.20140311-r2.ebuild 391 SHA256 aabade4cd0a1ec168b5aa064edd88b87a20e4fdec516064cba3dd2ab9b26366f SHA512 2f61b7feb83a759572d4a89f3591c8840a1cda1b71d86bd4586621d549514b648ba2cfb7e71005593056dabf60a648f2f43c41c53c045723df7d2c6058f9173b WHIRLPOOL 44ba064a4031b335c5bf75e2ea1af670f8ddde092eef2683a4c9add7b65ff12d7048efbb07899c6db714577350e4c6d09cb5a6f3170e3d855afeab1752f26057
 EBUILD selinux-privoxy-2.20140311-r3.ebuild 391 SHA256 a446dbc0ccad45a8b3996e4c37b593d7519e231ff14506efa4a2f8620d35ba16 SHA512 8bf20b4d8cf602b527580b11a105e1f8d92742518674020d237877df98c18535019bf7a90123860284725359d0c8f14f20db3d6317e58a285bf7b7d0e7a57202 WHIRLPOOL 1d1ff476ff98ada825098b576f2ce28b7935a92add6aa5d6ecd7fb872719de5f02d31c1b62274a9be5d97dc5934e9a9b38f295fc496997d7a75f565a7d9a4b98
 EBUILD selinux-privoxy-2.20140311-r4.ebuild 393 SHA256 95ac1ebc3518267d3bd857d9d2488d0d1d5c42c0ed9243ceb75a240f2e19bda2 SHA512 f850c9d1ec82e51e184f96a72b88fd15038b31de2719cd771b23de4a4cad6aa0841f0e93d0311bb2e00410a87b82dfcb0b237c4ee05006ade6b48bb58388497e WHIRLPOOL 365a77ef2f51b3dc07a9b9fb63ad20f281e408f7ab527fee43d82bc56c92118aa1059195a5eadd56d0d67c8f792e1412bd68d1c231d2aad2231c55bd2ad6ac5a
+EBUILD selinux-privoxy-2.20140311-r5.ebuild 369 SHA256 c538b97e799d93562bc333b8e8d3152ad0cb4817979b7191c8a492cc76f946f5 SHA512 fc51966e1f5af491163381af9c37246a7a7ce579e4f9e704d7e18b5154df64d4aff2ec68327e0c26cee9b7852596a8c526c356afa6f649c891f5a6112c1a3ef3 WHIRLPOOL 618c1e6c99006cd3ad7b793be82e367b1369909b38c21eb258a4652e7d09561d89d06a42710f1933ed61e2e2b04edbd9b0cb7f05b3980347a0417846877eacac
 EBUILD selinux-privoxy-9999.ebuild 349 SHA256 4b1ed6c28d09aa6905e571fdc6ab2a9ae1a61a5f70622e2d1f879657ce064986 SHA512 73227c0da350a3c7024b4d6095588b5aa0daa86b936434644fe93a816479bc712365df5958418b2bcabc7f473542a91b44e30e46e076b9beac116a852062f745 WHIRLPOOL df0b674a2a80195dec9407eafd999b683aa1dffa9bf13367a67794f358c12fa7166f5ac0b0663b9b74efd5c8089fb986fc8e7709866ba11759b74a225841d1a8
-MISC ChangeLog 8950 SHA256 4cf399012f1f23af0a94b37ada9fc4867972615b5c13c1f4eab2c611f63fb213 SHA512 433f3ff9b8956ec5e9df148d2eb5128805b5234efaf42bf9522f01168e92f1fd19485fbc2e4ee81abe928d6f1ec8162cca66d41bfdd734b7b67cc58fa358277a WHIRLPOOL 665d53b55fb0296b6467baba35a2026a8b091452060052032955d9735e32a1422febfb90b226668894bbf27803f309914fb7f9568c3e98c1b3d541996b42b4f4
+MISC ChangeLog 9144 SHA256 c0c0b7d93f8c5c3713df8eae4e2964034bda4842e7293fe3ea78d15abe68e5f6 SHA512 79235b434f1c4ffcddd826820bdd5d7bc81958e756113ecb9961a9d29a93affdd7e7b2f7127aad83ba0e88e30b16dcf1695fd69e39617f644ded7bdfe99da38a WHIRLPOOL f2be46c9dec2e249d947f95d63ac5aa49901ff593d119675caa419abca70ba986a585a1f2501ecfafbd4e9eee601dde4a77b70ca9f0df5840d73d49d53c85684
 MISC metadata.xml 231 SHA256 933cd6893413930fe207c95869dde4f44953c6233ac2423368db687c7b52007e SHA512 91418648c34aa2d0da7e316014aa2c288b777e6a703721cc4b06fd1627ef05ede4183e702e82bcbecc46f6d8456ba13b7ceaded4a333b967f75b9109ec6140f5 WHIRLPOOL c581fb5894d263c847be061eef686cafd1bc970e181081f71e3df7f0e24df83cd80aa166ca479917f499879d6703b7e3c1d538caf4a0cf04cbfbc4394d56f40f
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0
 
-iQIcBAEBCAAGBQJT5RyOAAoJEC7dUkA7aK9HRqUP/1DzqI8H3jLVIfHpCtCSvaJt
-eUF7foYc4YrPruGlN1lUmjKIm5mPxHNju2YVYfDBG3F7VsSl92477Hkt9LVCTCoS
-fB6PXlSwdEJKACAHJKCGN2V2tqSWs+eLJOsxr98bJAWhoNHOKp+h9vaczJBQ2N8a
-XDcjU5HRJ5Ldls2RDEl3zEbZPNhjWHME4eGFaE3rETvYaSp+43zD/A9b0W63nk5+
-Two8RcuqeK7cEdbqY7ZCu4m47hAWzPN2MBw2fNTFFN/APq4wouLAfN7Jpfj8xX0O
-HJdPMEITDQ0kkgJv/nwjfvs4qGjN+zGQGb8tMee+wU4BrLKj6YIwXpX2HH2yjjPm
-op6wXhzTyxtlXVYHVIPr63UuSSFOYGm//opgl88jDJdBERTmJinJWEk8kGQwa7FB
-b9y8sQQ0SPiRob23mZekw7ifVgVOeLI5mDUZ7ykNLI098cNXt5ahKyx0vyzRlHRo
-eS7rSoWDFRrtKWPmJVZFyEx/n69BWkfAN6kICVSQtCh+eHl0H4yt7sQeuW/hjgnC
-qZfqBYToFvm0PagtiySsjoz+zRKVJCZ8EM9raeglqkb5mDqGEn8ZKQWBGbKzahbN
-17G2lREbe6VeuzBSyb7I2YlUD7xkQ/0t3bcRHm3wiiRxS3U2PYhcdjPRvkvqNQzl
-ekUJYR7sUV61Kp8S78hm
-=C1Hx
+iQIcBAEBCAAGBQJT5nhjAAoJEC7dUkA7aK9HoqoP/jgSi2S4IIQBlNUjUS6xtVNC
+6PS1Rn9dxhLM7ZA6onCAphzLVUSd/BvoOUWlIcXkArwgPHXQlDf/hfadIMWFu6Fs
+Xpq3JPRJMRd3w5cOszphwiioBtsX+DzhVN0ry00aB+Hy2/P9t9ML16b6qEuTvbS8
+HTsnq1BQr/UukSVKQJvV4cyiPsYIBGuoEkbBVAgIDfzHGWw39YJZzf6uyxvxxXQE
+F1wbmqYpPVGVmmsR2FbnbWO1Uw2fCNhBZt2ZDYF1UJELK8qk7nr9dtCV/UJ7l1Ou
+y2Apql0xoROkf5y+G0cgiOBjIPLwbNDIDImEKa6vMhMTcJQJnAwvap0D6m9zo9W2
+aHrqSQyzHx0F6F8W42zMhAu6QjareL8mjolV1xtXompnmO/C0VqZYOvtYtwTjeBc
+5gK/sS3UMyUYCMLlXFQR0XLegYVDQlnmc9FAyJ7aues3nFLG/fKnRPXPTSGt29Q4
+cg40TNngUWG5g9ReXEWjkVESxJYTZaSOBG0zE0pEpkyw0luQV45J4Ucd55dld9R5
+6fArDSqTeB3abKgYaHXX2aufqYuseeVFE8h9nRp6qDvQN+8Z2KAmLgduk6HeJsSs
+xYE2vJCWgee3Jr2kqoLxqJJkSpHwqNjKUqhzQc8F7tUGQOWfWHc834uYka5hqiJL
+zGarjz2PGI8WkfTl/Qyt
+=oP88
 -----END PGP SIGNATURE-----
diff --git a/sec-policy/selinux-privoxy/selinux-privoxy-2.20140311-r5.ebuild b/sec-policy/selinux-privoxy/selinux-privoxy-2.20140311-r5.ebuild
new file mode 100644
index 000000000000..bc83f4ce8074
--- /dev/null
+++ b/sec-policy/selinux-privoxy/selinux-privoxy-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-privoxy/selinux-privoxy-2.20140311-r5.ebuild,v 1.1 2014/08/09 19:34:06 swift Exp $
+EAPI="5"
+
+IUSE=""
+MODS="privoxy"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for privoxy"
+
+KEYWORDS="~amd64 ~x86"
diff --git a/sec-policy/selinux-procmail/ChangeLog b/sec-policy/selinux-procmail/ChangeLog
index cce9f5924fe6..2e877a48a9e8 100644
--- a/sec-policy/selinux-procmail/ChangeLog
+++ b/sec-policy/selinux-procmail/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sec-policy/selinux-procmail
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-procmail/ChangeLog,v 1.67 2014/08/08 18:49:29 swift Exp $
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-procmail/ChangeLog,v 1.68 2014/08/09 19:34:30 swift Exp $
+
+*selinux-procmail-2.20140311-r5 (09 Aug 2014)
+
+  09 Aug 2014; Sven Vermeulen <swift@gentoo.org>
+  +selinux-procmail-2.20140311-r5.ebuild:
+  Bump towards r5 (fixes duplicate context for hiawatha)
 
   08 Aug 2014; Sven Vermeulen <swift@gentoo.org> selinux-procmail-9999.ebuild:
   Make 9999 ebuilds EAPI=5 and transform to make master for version bumps
diff --git a/sec-policy/selinux-procmail/Manifest b/sec-policy/selinux-procmail/Manifest
index 054cbe846082..bb2613375ec7 100644
--- a/sec-policy/selinux-procmail/Manifest
+++ b/sec-policy/selinux-procmail/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-procmail-2.20140311-r1.ebuild 395 SHA256 0c509b9235e1fcf9b145664f2c2aa2c72177696186cf4dea12232971842184d1 SHA512 34fd38b78227198a753add82cd2a648a8a1860a6a245fdad82c821cff76dfebe2530892059eb2d9636b031b7a8eeb6d2dd8db25ba54f326ded57315af2e578dc WHIRLPOOL 322254523a7194fd157ca2d66cc38f994ae64247aa6cbbfc88f1753c383fbad0c9d2c58d45a59b0ae3c20a2a0aed035f168f60bec7d5f9a0dd900162ef6e0bca
 EBUILD selinux-procmail-2.20140311-r2.ebuild 395 SHA256 42734069a2aedb8fe54857869a694f15ed0403b71738878598b265e283a575cb SHA512 44d07eaad00212fe334b27ff56b51a18281faea239a356addf4f69cf8b4d921a86b72a9f96138b2ed5eca5341bcb99aee7e46053961f40178e82979736cdbe9e WHIRLPOOL 8fcadcc06b7e3c9d62a6f26f3dc59af91dda2ed7c4288ed2f823985438c2c09b2e611aea8eeca798fb376d558c54b89e832523c3d619c7d26d46a00c7afe2bc6
 EBUILD selinux-procmail-2.20140311-r3.ebuild 395 SHA256 4a67c00a0fbc13df5513a4f99571f493417dd421031167fae4ff972317dd5b3b SHA512 8022c18fafa40d579a0dfecde4cf3af753efc20eccb1044e52d8d76279f27ec52a6f63237d979d734a58f2438e426908f28d02d586a7a26b96f1890e67490159 WHIRLPOOL 1380c3466a666699246357857af7c6716bf78d7dcbabaca868cd09f03d5badefc419be5c453b3b0ea8ccca7e0cf35213f1ddef2a74ba0aefc55ab9e85959aa89
 EBUILD selinux-procmail-2.20140311-r4.ebuild 397 SHA256 5f788522e65d4e19b3c6a83124b6ca6a7bafe2926177e76c24d0abf10b48ff4e SHA512 0a01aa4de2fbc1c1f6f4693d6a9d255345b1aa086c1d15561e84ac7ac4df14e197332aaff3ea93880f4a99aa0ad976792d0de6771c0b2faf073d8569b7d3b7d6 WHIRLPOOL 9539dcf73731acf9914a1a59f6ee3ca1015cbf0334fb2cca326a6cf99558958bef88f7bdf65feb194cc1f599408bd09f1addf77ce72491d76a128771aed57675
+EBUILD selinux-procmail-2.20140311-r5.ebuild 373 SHA256 418b16cec8398f7104c21f32d26bf1f28bc65ac4a743794883befe1bc8bc2d91 SHA512 90887547967336d31096938afc8eb5782cb72c5ef0e33c0f2964b98051711320956637dec21c92c8897e068eec8206f736c7e6249bee2d95ce3262b5d81d7d67 WHIRLPOOL 9130db9e3d58748b0707701171104f3c9b845d9d2677f4f8b0df5583baaa428c7266bcb7698f30041fadf49a833bc09b0f6421fa485eb90f80ea22f75a6d9f6d
 EBUILD selinux-procmail-9999.ebuild 353 SHA256 9b6bdf81fb7b0d05977d3242a323af399a0d379b9700ea49b36f8cd5048d41aa SHA512 1353d6161f5dbea0299364eb7e83f2ea08fa511dfe6da6cde9a67a2a9f3807e8050e68d7bf7eaf2b2fe18d893e89a441204a5d41693bed3029f0704574ccb2ff WHIRLPOOL bbb99b6babb86c0aa946a75be586d7e5971f5ff51375e347e3a25b7fa378bbe430ad9e07e0d49d993cf74995ea06822b2bff7e6ab9e1e1ca666b64bb656fa5a3
-MISC ChangeLog 10566 SHA256 25f7165e33d98ff5fd0c9b065a97916e2724a9ff50839e40381e8f338efba7f7 SHA512 e4422b2fd8da4c6733cd5d83c34740c5189379fac1df9a98084a13a4f5e7f4199ea5712049e38bce0cee2b200c6c3d8adf15498945e145cdbf1a5aa956ea11da WHIRLPOOL 049e3d3acdb264e62d9fa062859a0bae72afe59e778001465afca84dd894f221ba6ba5bab76f93423f138828435851d9d872d139dec0f7a07a7e6abaa8d6d8c4
+MISC ChangeLog 10762 SHA256 50594ffcce91df7dd1a103df088c8a8dee45d70c8f081a7b1a9fd250268b6cbe SHA512 720b2689b4ee745b8c7a80679a82115b2a930ca1387d3dc76720537d6a078151dd7c31f4c6b67290dd61dc46bd1acffd773f6aa5ce46f0bd51709ea2c24084a5 WHIRLPOOL 7f78abe2041db1394d4e1f57870351b378dc40d5f504b44b7e969ab6b61404d7858c08dda12d9a5d0b2d6603977cd97142580e3a2170d190ca04df6baf5153b5
 MISC metadata.xml 232 SHA256 4d579f0edc6e03f53e6227d50713e8d6c9f4423a8ce8befefa477adc44ec47f9 SHA512 d3ea1c1e4df800f3bca1e0b986b07290f03f66512130eb1d5c8674aaa3d38c640b2788e6e81bc1d9aa29ae17d93d4d4d0b2133d36ed32f5cafa5029ae6fad8eb WHIRLPOOL beca47af93fd68022f093845116df47cbe1c5faf75ac3f760618081580f5bb7b8c62f52bcab8291205e2333413d9ca72bceffe1185a9c05baccee80b6a3b54af
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0
 
-iQIcBAEBCAAGBQJT5RyOAAoJEC7dUkA7aK9HmBkP/2Wqr7x2n5djMiwnGQD4k/tm
-OZCncW1S6MZ1g2bdS+ob799a4NHUMInxJAQehrhlDnYJLX7PUe5ATR8JeV8byRGE
-GcaF/vKPZ+Y4vikRyWEbTEZzVUd9kjfaJua1Nwj/l1zNNR2JvoirHTO5HELsVYBZ
-w3a/S4OPqXerJsRiGiDjTisURJjp73gyK52msJlqYjin/CTvSPgd+6q3OSGurPae
-8g4n2Alj5Q3KXJlOnwIpRZhF8pmKVYvTqcHtf2mcI11vlep1fIue+bpm1mBxvIkU
-dCkskmitwRGElMERSSheR6YVEpiFJLZJX2NnlUSwmiGnei+ddRuyMG//nxhrrD2N
-Rd5edvQ8CUmdQ5O8Ca9ktHbupESzEKI9e5YRDv0wjlRJU7rHzXnd+HEv3GTtZ8a3
-q/f3z4ng9Sk7T+yrKb3TmQwV57KV+S8Z5N/JWPwG6hLwl5JSCfMp7ZKSyeit7phX
-GP0mho+dA+7m2hNsKRxCqJlfGOo8IVV0YQXu7Yj7B381YfotaugCbep5ZCBdKy5J
-O/aR3zP0cskLuPF+A3UYXjQkq6IsfoVjmQAbpMOledPVD0Hn1Qa4zabk4UJUkGTb
-Om3fiNwiKaaN17CzqsnrP60X1a9U5Lvgy3oW9rZdHbSFr5lY1kr1nGPu98Gn858W
-tkKs/nnmtZNB01xcZ47H
-=di4H
+iQIcBAEBCAAGBQJT5nhjAAoJEC7dUkA7aK9HbyEQAKJICn9q2P6RyrCUrPmylpIm
+yWVuSLZzF/fi7Q11H9cxYv7FSEJkhDRPJRx0DkFvJ5m28TgcKGMai64SJZtKoe9L
+itLFq+77A0iCjqayZpm7iopa3xoqZnLX02Nez1bFgrHC5jOy6G0kyUC4frtfv9zW
+d4qaQDiYJP0CLCDLpnTBCsoo3aga2OVNerj7EtCeJBi+Tjd7qmIiTLpRVy2EM80q
+wxxJgIUPi1WYcLrGUlbxNP4zGDyPXV+WsWJIzTdTOZjP9QTfmaFlgvtVGKnnLR8m
+cL6UuvyaV2RwP2iYjVB3uYzByBy0UFtLv5MlrDL0hF7WT0x7JKCT1f9pnCpTcYVQ
+uldf1nMjS4vpRnvCq/8dDZVkwXCWAZxuBCfoh3Z/x42ac6GRRkI/BXw9Ft0nWBo3
+Z9RIlz6aEW/ZW2w/JSuBbQthRr5/bIIuDlxgbFq5RJa21kejgU94mvOI4katHehs
+VH5/ig/M/Xb5aRejC66TWxB0+6Eqhc/ItOYjzYJDXSG3Grq9SoNl6tE9qpp+gXYe
+8VyIs4MugCkUNjROqANyy0W3egFqMLzGN9Stte+kqYhVdY9/8o8mFWytNaU4EJ7D
+226s+moGsCPwGX3wL6AZ4WDYuduNQEKyLEqQYJH5irvDUtbIlhvVaTDnMvMeReSo
+eY1v61Co2CofU5T6U0nL
+=xRdX
 -----END PGP SIGNATURE-----
diff --git a/sec-policy/selinux-procmail/selinux-procmail-2.20140311-r5.ebuild b/sec-policy/selinux-procmail/selinux-procmail-2.20140311-r5.ebuild
new file mode 100644
index 000000000000..e2df5b9cad8f
--- /dev/null
+++ b/sec-policy/selinux-procmail/selinux-procmail-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-procmail/selinux-procmail-2.20140311-r5.ebuild,v 1.1 2014/08/09 19:34:30 swift Exp $
+EAPI="5"
+
+IUSE=""
+MODS="procmail"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for procmail"
+
+KEYWORDS="~amd64 ~x86"
diff --git a/sec-policy/selinux-psad/ChangeLog b/sec-policy/selinux-psad/ChangeLog
index f72117c536ae..adc770421da6 100644
--- a/sec-policy/selinux-psad/ChangeLog
+++ b/sec-policy/selinux-psad/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sec-policy/selinux-psad
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-psad/ChangeLog,v 1.42 2014/08/08 18:49:34 swift Exp $
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-psad/ChangeLog,v 1.43 2014/08/09 19:34:48 swift Exp $
+
+*selinux-psad-2.20140311-r5 (09 Aug 2014)
+
+  09 Aug 2014; Sven Vermeulen <swift@gentoo.org>
+  +selinux-psad-2.20140311-r5.ebuild:
+  Bump towards r5 (fixes duplicate context for hiawatha)
 
   08 Aug 2014; Sven Vermeulen <swift@gentoo.org> selinux-psad-9999.ebuild:
   Make 9999 ebuilds EAPI=5 and transform to make master for version bumps
diff --git a/sec-policy/selinux-psad/Manifest b/sec-policy/selinux-psad/Manifest
index bfd46484b73a..1569f61ff4a7 100644
--- a/sec-policy/selinux-psad/Manifest
+++ b/sec-policy/selinux-psad/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-psad-2.20140311-r1.ebuild 379 SHA256 f457203f95b282bc7bfd530aac64d2255a8fee48f85ad125ebc044977e42cefb SHA512 f704e091fa2a94d23215c18709933899d3192bcd9f8ea1d9659e5145964c92fd7f7e4be0d451e0114bb59d98d2cce2c65da90d5720a17d218012dad17e5d836c WHIRLPOOL 64f14c212df2b738f51dbf19c17224bd8228d5b3b59131a0b564dabb3ac34caf35d59ad32864dbaf14752562b9b0bc4b72599b4ba6f48007f724bb179e1aeef8
 EBUILD selinux-psad-2.20140311-r2.ebuild 379 SHA256 50d96499bc947dc2c1b51e58fb6520ce8742312cb98e971b9a2c083d013521c9 SHA512 fb009cdba81de8cc99a28a02665d97efc0b4aff56f4a47e2c54ac7406b41a80970da34d9be9a255b901810a64b40008958e4ce590e6479c71697a22b56e347fb WHIRLPOOL f7f02deb375bffd9d3580140684dab4f77ea30359f856f3abf051b11d5608bfe1f0752bda351fdac561815558fd28ec22c165a0054ad287cc227838f3e17dc3c
 EBUILD selinux-psad-2.20140311-r3.ebuild 379 SHA256 c10bc18aa0f7a0d38dab0d29ad7c1d60a8f2095b557b433f46b75a922f46855d SHA512 13bee3a13a75ad4686aada284630d30c225d5944e9541523a4f52508dbf162e02ecb3ef47426f0264c43b7826db5abe5c3267bdfbe73259836f2e1e5744f9553 WHIRLPOOL 163b3ec790df25fe5abd93068ef5dd0f4cec11f99bf255bd8a2b55de4e04f92064cbb4034d5c642104dd97b5ae359acec458388049d23228c9daba5e7849572b
 EBUILD selinux-psad-2.20140311-r4.ebuild 381 SHA256 5cd708ce0c3432b3eb18e0d34568754ec639f3e556d59866b689a5c02d498357 SHA512 3d3859b29da0777c99e2403f0b7c927547df703831dfdcebe1f0b450a8c8ee0884b70eb27c4e902829a5935d645e06dedd1beb1e2f9f500de1c49608e95cba15 WHIRLPOOL ac41f40d4cb28d763abafd4a0f97fdd036727312f86de165e08e40170b7d6d503c36194ddeec13703dabb62a3779f918b3a0e2f68d58819ca7c70be36006b76c
+EBUILD selinux-psad-2.20140311-r5.ebuild 357 SHA256 4c1cd94876e818e03f256d3a85f8515a22d9dce790a098f55c4581ca84e8d149 SHA512 5577849aaf8fda9d8c6632155440200351143b676b650bd29c1f4150d953645919b1e1fb20b1553e0ef5979459d38cb2f15b58d8ed1b24352f834b79147a7471 WHIRLPOOL 070043c2f6776ed0595a0ed8c6a37971b96aa8e1e29dba0866a7e18761237205ee0538d3f4347144ed1df7b747ec68bdffefbc14eefd8e569b083ce900a6c81f
 EBUILD selinux-psad-9999.ebuild 337 SHA256 8911331f8a2526fcfb75e90149b0743021151d8fbdd727c1483192f17cb65602 SHA512 a74519ae74d27df3de82dacfe0323c60f2f2f6c7d48c7eef95fe4ed2213e0386caf1e03a146dcc95060baec0ff9559a6bafbba5ab15e9697ee9faad754232a71 WHIRLPOOL 89eea955807d69a12f3412ff91cc60a05e424bd2d5e1cba3e35f25cb750875ed3ab0406e08e10f5bce11d4475f7dd4a1070024c06f040c18482bfb31b3fb4a3c
-MISC ChangeLog 6362 SHA256 4d3a87499c229a33da261fdd12ac9097e5662dd8095845471b1b2eedad1be9dc SHA512 41ce87446c5bc5df8a5eb643a7cbd42a062acd7b3a281ea697cb2ca3c5fd8518276750e04674ab178aa8634e5fea82e24eb19679f6c1a14094117c09b6dcc149 WHIRLPOOL 1b9fedb6c217405e2ae7ac007627eb1205e660c1d084c203e4bccc322e8fa076c1db767ed53de6590c23e9d3c3ef270c26eef7e61fbd10835dcdc6ad748dd658
+MISC ChangeLog 6550 SHA256 58f9169bd0867d89bc5cbefc62d51034a4c4919054bde9f047f80a0389ee1de0 SHA512 3d15c7d57dcb3cedfe7886d8428985999d014ceadbb8a9aee3e3001fa1196abf5b6a2826315eb2a3b74951e20a3d2d45710e83b4aafe745c28f8e154bc3fc94b WHIRLPOOL 33adc57e5a87f072b7631deb7229b0761ddc41d67f2e88afe5ca66e9b17be5acc3d60a5e398566e165cf4fb5286645c6a0726af7f6fc3661b55a3b3aadfe84a5
 MISC metadata.xml 228 SHA256 6c853705dbec43e551fe5dabe34f2c5068b3ec2989f7a6d9f79381b624d2b11f SHA512 7e357fbe73d69a6993c6eadaf8481131d88f9f0f4485df66c6c7d5ccf596ef8f35be464087cf9f22c1ed0b4fc6cbce72362a6c8f95848c8419b392fd4b5b8212 WHIRLPOOL d5123aa72828e7546c74cd5b69f1fb40a7d37df1339814588c279adc8ae8a6333b68cbeabb8fdc82fab43ee139630026ae879822bac8e7202e614817070665fd
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0
 
-iQIcBAEBCAAGBQJT5RyPAAoJEC7dUkA7aK9HXhsQAIHCtm33k+jHkgB4w8tJRbWB
-gapA61SFxvUA2GIBgqY6iC9mTrEO9LSNIMb7WIgOkDrejg+aRuHJFmKa8xMgj7yS
-FGFVvCFAxP0XubtgGB9p+DDxZt0xPWK9F8IilU+CCJrAGH4HFCOrN11nFhC6vXxO
-1oMhxlAc+LJlNAUWL3yAJjAI6jGeHjTVkQMdQs5/9PfaYICBUn1eMpQ84ryqeWu3
-HAZQM66MFXyC6bs+uG2fS9U/W5dN7j0OjlqY382cCGgc9lBWBqYOaIDFRhDy0lFY
-7v/ujz3jmOnnknOcQHRHY0m/gDT+s2QeZYCHt3D5pxk8/327mms43g53Tbbz/0Qw
-XVTVJR+BBrotghEsQmeA/gRrsK5AXGhgiJMwwxJC/+8ARMk5OrEzU2CJEQPAceIe
-inaivLU5LTJt6fWbZvHx+S5jUF2EQTdSjdnt5BpX4hekr6ypfp4WQpaMdzJGDcou
-fcLijlTunbPwdhIXmc3qVNPLsA313FzZdaed7R2P6OHYcwSuVKJl1hsmXLCGIW9j
-bwskZN+NotIJYjFEDzhxIMPA/WjPT/9wR26igBmRl/C1S4C5xUtjAuZNMuHA/2iT
-SU5YTZZpBwDe7s4bYS8/9bZTzvdN11kEsrkaHf6IrpP44mjArPEtIwm6WmZVQrPy
-ojgO7vEMYVhDsFGMBr7H
-=Qr82
+iQIcBAEBCAAGBQJT5nhkAAoJEC7dUkA7aK9HEfQP/0uBiuLBRpfCIXlLig/c7zn+
+vrUlGfCO1AYVDc2mnfeZqEYxDOnECGVS08F0w7KmPahun9aGvPH2Xq0QtocUjYie
+JYfXeL/EQye8oSc2gMVyOxpPjPSk6uIrRzRVUPfizmuZT0hIhDWre8UK8+viO39L
+Vy53glOa1TvpGvv1493+gRtgdh+YCSE3/rYuUBpiNBlBapCHbRCXOBpwihlSUINe
+MMIJ5Qdkc0BYdGS0BZfb+s9wcociuGu86CtuNpwfN/tdDsTA4+Tw/mCEBC5qBHwA
+LRHc+ntqf6huAp4unnnw5UFV5u37f0+j+NTuXlB59nkUzxQrcqCVQ3s7pKHVaSDV
+kHF7+qBQcrfG6dHHQF1n/XJWbfGOC/i/2WFW17PhdCmVMsO6T1aKhOcqQofqCmss
+NhocntEDOyd2Fg7Z4TK0e7mnGDJ8WAKwW/1VN+QsshjyZm/SejVkuAgjcUJ+ufZW
+lUsg2SMfoA+k6GGo1ZR1ZelGG0FbiInKgYB0it/qSeXCyU+m2KB90vNQ3dDYg5y9
+mQmY+8K90I/LpaQyd0WgEfwqwDE3coigK05+Jh7JlX+KO2/0r+tMHBOnBQjHuOVM
+cP4D/H5F+DrBGhChMp+86nrYY+exT+4qjYTbTE1Fslaylw453e0nnOCcbIvPipSh
+WaDNfAlahMuUxI/P3nw3
+=GLJp
 -----END PGP SIGNATURE-----
diff --git a/sec-policy/selinux-psad/selinux-psad-2.20140311-r5.ebuild b/sec-policy/selinux-psad/selinux-psad-2.20140311-r5.ebuild
new file mode 100644
index 000000000000..60d42c2dc817
--- /dev/null
+++ b/sec-policy/selinux-psad/selinux-psad-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-psad/selinux-psad-2.20140311-r5.ebuild,v 1.1 2014/08/09 19:34:48 swift Exp $
+EAPI="5"
+
+IUSE=""
+MODS="psad"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for psad"
+
+KEYWORDS="~amd64 ~x86"
diff --git a/sec-policy/selinux-publicfile/ChangeLog b/sec-policy/selinux-publicfile/ChangeLog
index 1e85e535d01e..b2feab0a1fe5 100644
--- a/sec-policy/selinux-publicfile/ChangeLog
+++ b/sec-policy/selinux-publicfile/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sec-policy/selinux-publicfile
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-publicfile/ChangeLog,v 1.65 2014/08/08 18:50:06 swift Exp $
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-publicfile/ChangeLog,v 1.66 2014/08/09 19:34:41 swift Exp $
+
+*selinux-publicfile-2.20140311-r5 (09 Aug 2014)
+
+  09 Aug 2014; Sven Vermeulen <swift@gentoo.org>
+  +selinux-publicfile-2.20140311-r5.ebuild:
+  Bump towards r5 (fixes duplicate context for hiawatha)
 
   08 Aug 2014; Sven Vermeulen <swift@gentoo.org> selinux-publicfile-9999.ebuild:
   Make 9999 ebuilds EAPI=5 and transform to make master for version bumps
diff --git a/sec-policy/selinux-publicfile/Manifest b/sec-policy/selinux-publicfile/Manifest
index 5cc8be4c44ad..bd0aa936dcaa 100644
--- a/sec-policy/selinux-publicfile/Manifest
+++ b/sec-policy/selinux-publicfile/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-publicfile-2.20140311-r1.ebuild 403 SHA256 67a83d9901f8c198c091d3083596d1af60cd48eefd73ff26aebcf24191bff0fc SHA512 19b65a777d247f2d50212f7688e119f2fbc5fd37423516dfbac651c5c68aaffc3a00d6725464b824ee7720b3f9b7ab4c0e21341b00365b75ab8c8af5cba2c752 WHIRLPOOL e5fc3755449ba7dff179179b0f5a407c52fc1242b65c6ae1cae2828e8ae18809beef9445ec4b7ea14703faadc6733d3be6d9a7ab217f0a9a3be341bdf397f470
 EBUILD selinux-publicfile-2.20140311-r2.ebuild 403 SHA256 920f879261308be5003d7020bc6dc2536001810098589e1f0a52eb4992ae6a53 SHA512 882e44ae3f5e8f4cc24023b013736ee04d4e62e8b2bf91b16e7a06c47d4db9843072773129d056393836b06ac83ac4d945153a5595799c81d31155d9d64ee43d WHIRLPOOL e68717494600656780c413fde5f7b5aac6f352465496abb778a7ea0269a39a1a76a69069860bb4785098df84f7457e6e1ee545fe8ab0e9d3c574a289fb621d76
 EBUILD selinux-publicfile-2.20140311-r3.ebuild 403 SHA256 e46df7c576d87e283cd36ba688607c59f91a880821cc3b7f92848999977eaffb SHA512 074e1a904718fdd98958657867f01d8581af6d915f9e7c5de29a15e1800a169586a27c8e59ec7931a9690f6ebc93e4abcf27b5cfe2441a7c1bbaeef83a0bee77 WHIRLPOOL 2702945ae770a9e6d5a6c8ca74de16080f47477542a82f9b8fbe0b3e36be9950a43d150e695cac9152236b682faa651329d6b7c47d5f786602fcfb16e9ffdf6d
 EBUILD selinux-publicfile-2.20140311-r4.ebuild 405 SHA256 6e7ec498809af7c64398bde31f1b6c97573357793d9c7f53812e46f92d45eed5 SHA512 610fe7a4210cbaa35b53f27186f040e79149cbb24e9d0a50e3d51e1edbcfa4847b2480e41482970aefd6036b92a273f1bf14269c1efb07b7f03de3dfd0730249 WHIRLPOOL 253b865ad91884d0ef842809ca1d65047ea5b0e734c73df5d4e2182916beddac809548ca521d99b64ef5add8913e41ec833c60fd8e3e06b858b14c0e5d5a65e8
+EBUILD selinux-publicfile-2.20140311-r5.ebuild 381 SHA256 2918109f471b3e3c4c4b4f362bbbba34eb243427beafacbc10becf8e163dad9b SHA512 7e87ebd6152625120cbcc3d71efcf1d02b0b998411287b9aacccc01381948905b6df1fa48a901e7401fd344f1ae8244716e2f71033c5cd75a931e9417b936836 WHIRLPOOL e5387f0f1958896da0f859c110684a7b52afd953e572b59756e028579cdec0d70b1a639b1efd86ec4cac9a7150e3b55fbe5de97f07eac01108684d4484876d93
 EBUILD selinux-publicfile-9999.ebuild 361 SHA256 3bef1dac164bb2ce990538465d59e0b43006320a4f63c3a07852d71a015a5835 SHA512 c359147445010067ab81b8edf762227c98b8f9e15f8df31db5b126ca36f118d2d461cb3566a3eba0bcc8cefede662bdf81be4446d1930c19265b3d91bad78ec8 WHIRLPOOL fa391ac20a0032990e38b983eee06ce4f95ee0cf6432265f8c43b60cb5e0fde979cb43bd7656ed71486277d6a6f3ad37b82fad901a5ec2a2bf30ea404a526756
-MISC ChangeLog 10266 SHA256 aadf6d8fff880e3df7e3ed2a52f7938f496acac0d832b8442fd222b12401b505 SHA512 554340bbe7123221ea2a9cd786b6c2025ec840af7aa79daf4bd62e182e4664b5a12d0cf85bbedf88b185ccf0577a3fe074e1bdc6cf6e2c2f57d5ced52131988b WHIRLPOOL 7843e4d854ea4e5b89946b5901eb19684bbd6412fec7e79f392dd2c205d76a06becba5495bbb235c19fddb2a08c403996a601b8cd123045f1d96181809fff089
+MISC ChangeLog 10466 SHA256 2b38fda8794bc35d452273f94efb330e950725ace5be57714491e87b27a081e2 SHA512 fb41498b2899651bd090c5a311cdc16d748813770e37437458c8cf103189c26a1057f48228c7172fdc2de2c14849c047fe5d119c206f4e5296339985b2371a68 WHIRLPOOL 854a84825153afb94795ade84709781fdce3647725fb968ad469ccba80bde6ea5071b5a98e6fab95ebb93619ae91de542c1dea40313cab49aa131f4683ad0942
 MISC metadata.xml 234 SHA256 b13d84657bfebbc9d15954d32ed7bf19feefb69a65a55d0eeaf362f647a7dce8 SHA512 0d5c451e4dd44110ed89d505b08ceaf918fa4dcb19294edcd252f1e5c1645f93acbe89d823e024fd0987e30b3d9201622259fd071fee23d6b6ba280df0d7be89 WHIRLPOOL 93b24f301a9cff5d4e1cf5b1e42e97e503ec765e8c289b595889838ffbb98e358caa5897c729eb3dd4adeb4cbbb46c1daccd33b68f562897f3c515b4a46598b0
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0
 
-iQIcBAEBCAAGBQJT5RyPAAoJEC7dUkA7aK9H2TcP/3sMEPK4LE1RURjcgHOA9C9n
-P5aZHEwbgmdLS9/qG2MogxJh0Iz7+FhVRxA1IeB8c+BJPZCvd27zQ83j1aSewjHI
-IJiRPJ53SUN90ocu9/7NmcJKEl/xfOT91KWBRXOBVz8Rd5LOrGKxbpVok8Elz4E4
-jH4kIWezaR68Mkin68PQG1+IQfQxV585ozLFWCw7QacQ31J7XbxWx37rnq4815KQ
-oxVkbDDWRrF45tZPa8vVHxCzUJV89eCve2sOVxM3InYpGHczdeh3FpTUHjjwDkGc
-Ip3Xe1eCvyiQoJitzy7ysYEd64lp+FH3AAWGOsSo1sEvEwIs7jhraZIVa+Grr84i
-JMfhjsVaZ3qelOxpWnSIk1lmxi/x/RTE/T1G1tLi44R3uZ0vmWTrgbLlKTxA/bDu
-gU2T7sUa/dPU2CM+iwhnaqXNZ4Gmj9k9X6ovAfBJDOe8h9q/smZSvZ8f4f53euLG
-zDNpmqpgVSjHodjTzU+hB97V6WiK3jBMESNyiiTBvsfzGs1uPrET0GJnQys68fmY
-qb/hlCX77pbuwELThm1hpf8duXorlEvJswpHzBLSE/f4j418T7f5objpkZlCvNhr
-Ls/cIaZMuz1SmBiKjkyIObDgTmlX09TDdlxqVMDsZPHk+aQVcLlbtwUt5kX1wvRg
-7kCAJQVzHw42kcYq+OGR
-=OcQO
+iQIcBAEBCAAGBQJT5nhkAAoJEC7dUkA7aK9HL9oP/3OBKJslnzeA3p/UmkcJUvWI
+1+P+eocezyGV+a2T2M4tXpSIOEmXGYq19rlJjZfUha8ILu4dEJ5KHk3+K5J5vgwf
+FSjOvvFYuSpBPoLCAsYQPqcKX0K5ce4g6CbhAhD0W86yk4g/WX732X7eF479puIm
+a5EMElK+leBeEBtOfeWXsnAALJRAgEqgxReYw/FAAP1j+qXYiWhMaSxOvY5PM1zp
+VWfLS2qk2e0OI4gF3s9gMLsjpinW4s7/JOnyjd40boDHe+qI4ehB54t1mejIUdN7
+rCG17IEqlTNzWofSZPU31SZ3sAW56CJBO7rCmFazgVhN+RPHM4ObThU9RyWSpKq2
+CGtPhgEJi5vDTzt6KgOu39xR0kVA62Px9Yyc1KE41NFTvRngRem2yVSX4ozNAV8K
+P+FOQ0N5XZxHwWLbvl+RR5FBkzaLZXpX8dZY2Xjj26RPfitFeoYiKDRinEqCmtcr
+r2VF+ZrU5fthiDgj0GtmUNMcGG1WlDe5Olyz2WSeKsZhgXw5NUGrKmuwCv2qnkF0
+7gIBXqCe5XgtYY2NsFHoyynstmilgENMDpSdd7cxIVgLN4wJN1rHlhtFtlZt4Dm0
+ImiUWenl9ttLvJmVgWtRqIECTtcRvWpaLUdYJksLG/Ya8/wANaAiBqzS1Ya0L8q/
+WfEaf9pdM/7oommKycFz
+=Tay+
 -----END PGP SIGNATURE-----
diff --git a/sec-policy/selinux-publicfile/selinux-publicfile-2.20140311-r5.ebuild b/sec-policy/selinux-publicfile/selinux-publicfile-2.20140311-r5.ebuild
new file mode 100644
index 000000000000..6260074add6e
--- /dev/null
+++ b/sec-policy/selinux-publicfile/selinux-publicfile-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-publicfile/selinux-publicfile-2.20140311-r5.ebuild,v 1.1 2014/08/09 19:34:41 swift Exp $
+EAPI="5"
+
+IUSE=""
+MODS="publicfile"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for publicfile"
+
+KEYWORDS="~amd64 ~x86"
diff --git a/sec-policy/selinux-pulseaudio/ChangeLog b/sec-policy/selinux-pulseaudio/ChangeLog
index 2fafca7d3094..2b6339013340 100644
--- a/sec-policy/selinux-pulseaudio/ChangeLog
+++ b/sec-policy/selinux-pulseaudio/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sec-policy/selinux-pulseaudio
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-pulseaudio/ChangeLog,v 1.42 2014/08/08 18:49:20 swift Exp $
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-pulseaudio/ChangeLog,v 1.43 2014/08/09 19:34:42 swift Exp $
+
+*selinux-pulseaudio-2.20140311-r5 (09 Aug 2014)
+
+  09 Aug 2014; Sven Vermeulen <swift@gentoo.org>
+  +selinux-pulseaudio-2.20140311-r5.ebuild:
+  Bump towards r5 (fixes duplicate context for hiawatha)
 
   08 Aug 2014; Sven Vermeulen <swift@gentoo.org> selinux-pulseaudio-9999.ebuild:
   Make 9999 ebuilds EAPI=5 and transform to make master for version bumps
diff --git a/sec-policy/selinux-pulseaudio/Manifest b/sec-policy/selinux-pulseaudio/Manifest
index fce953814465..292b27b77a05 100644
--- a/sec-policy/selinux-pulseaudio/Manifest
+++ b/sec-policy/selinux-pulseaudio/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-pulseaudio-2.20140311-r1.ebuild 403 SHA256 d917375773ae265d515c12be3ab9e3e0c19181304deb33ea4e01cd1a92870822 SHA512 711f4ad5e89dcbbdfb7ff0eec769302d4e8001fd6ce881f491c2c2df4f3f286c8c41494d2b3d7ce771f4ee690ee69f1c5cb0c17683580d8148080097efe42bc4 WHIRLPOOL a7c6a55d09e5c19b4502f8c777ca9f8d45adc35a522c98d89175125e900e6a16945e87a6a2c3fed523d97053f89950c21e6ae72a320163e90f5e00dedfb58a55
 EBUILD selinux-pulseaudio-2.20140311-r2.ebuild 403 SHA256 bd2c211c9574da159f813d3245f88be8b99728234858a6de25b3bb4b1f01bf9c SHA512 1964e964b661163bfe06dec20749d8b28f052a4cb52752040290b2326df1e70f2cd9a47e5f316103edd4c710d6dae629fff0f7a890740904e469bd33172969c9 WHIRLPOOL ca548fa486d63a3a0944dd0307bf60434109d071c47ef3ec47a108e09f922d0b476dc6ce350aab8f5969c32d8f418a4c0e628979a6b25be3a5069cd96fbe85a5
 EBUILD selinux-pulseaudio-2.20140311-r3.ebuild 403 SHA256 f3e68c7f01adf74c8f9f6e8309e3216bfff5598dc27bba476f02efb6f92ce146 SHA512 223ef5b07300c655b3bc67e4f5bc65c3d24f0dca20d10d456933be93e07ee4d5ae6a910b8ee5862d4cc6b6886a46aeb6a96fe5f598f398370d83c1db1bc7cc97 WHIRLPOOL 28c3a90adf3c26e9785077509d32dff0297da7807dce121c5ec18e3ec13fe7a13a298252000a123a707e61703f4af2df9f53609fff4dde05e023993c0e6c46e2
 EBUILD selinux-pulseaudio-2.20140311-r4.ebuild 405 SHA256 8705dc223f495a2d44f45bc1d180819ca3bcf230c7114a38de25fcc87c9d6b13 SHA512 98c970576db3827e0c0769c8c7b73837aea41cc4e7ac980ca9d4a7840528128afe290b8e6df0765b06582fee2f344c2ee64aab31f0e27319e6375b3a2b682af3 WHIRLPOOL 95687ae2e295b49e79fea7ea89684d573c531a3677b3a3ae1a3a97cec83450ce33248f604247664dec7f53a924d9c64af918ea5096ff3b241dc7f5485a730b6d
+EBUILD selinux-pulseaudio-2.20140311-r5.ebuild 381 SHA256 b7ab297e8af0d86be68e05c254455ad8e1cc1d2446ea7f587c21b582c0826692 SHA512 4eb2be953778ab394111f4613aa58e4378570e05119bc4b5eb16638ecbaa40fce62df308e79526d483d228249bc372a70480ba930f534a381494dddf5ac0f4d2 WHIRLPOOL fc6016ddb07d7f754c9b832c4b89db5d3c1bb29de23e9e42f8f3e6a8d30ae5e7458ab4e2f5783b7849e75eafcc78c3121c9e1bdaa0d4a40e57d5229117558f8a
 EBUILD selinux-pulseaudio-9999.ebuild 361 SHA256 a982c2cfbb290ad4683a937408995874e20b51483ccb3396574a40800bb24cfb SHA512 ec8657e76e33c721d0c311caf47c7f1334221548b644ee1ff169285cc8ddf79e96015795f570d7f40d495a202b1c74c08f7b46253fb8cba116eab57c35ad70e5 WHIRLPOOL f63a9c7167ada1dcf05bfa5e30f86145f9ac9682c98111c977d9f4d61b5ca8f41b0a9d88629f898a86d7e9256a86196dcca561062744429a17a3a9520866eb76
-MISC ChangeLog 6826 SHA256 4af6ce91eebcd865686825f118393a2b74f3028d91697620dae106be027b61b4 SHA512 a77cd522f267f909516ab2632ba44de6076330c5030fa20453d88988c0922d3896ea37c37226dac5b82362ff7c2347419a7a4ea86cd37c877dbcfc118dd0c255 WHIRLPOOL 71c25a16dc4ee19cc4e77ac295d9b026776ee2a6a9434e07f26cf2f7f25a129844562b238420cbc45ea0feebac2374784872527f329a8d7000e18f30833caeb9
+MISC ChangeLog 7026 SHA256 bbf2759b3b3931350d198fe80527eefec29678582a18acb55529de07662788b5 SHA512 16630cb0dae8ab67896744230a5d6546b48201b0c7bbde6bceed22fbc945f1935d3ed6955d6cf537ee3962e593130960251e44d717a0db50d0f4eac79087a019 WHIRLPOOL 98218658fa0a1cc87e86c8699216388eec57cf0d09ff4775682ff1ebc6a6e30482db2188108dac1c46f5b715fe14ca3b91fe044fd43c9fcfef96cb3b03c59c69
 MISC metadata.xml 234 SHA256 a3e0f2f599ad1b6a19e3458a4d427e9e658e60d758f4eed2f0d5ae2332f191f3 SHA512 5ad7cf5f7d17cf86f51d7d69a82c214a099b208afbd8d929216f47cf36c3e6132d458c6a8866f6beea98e25ce3229e0bc79322ac89bb6c31620d79bf1170a138 WHIRLPOOL 29035bdbcd4fe59ff7b77b043334fbd8056f6fbae0dfa2fc2d9184e08099dbfc2494e3884106dec8b903d5ffd67dcd7c7e55cbf17c1e4fbca8ea1f90e98c14f8
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0
 
-iQIcBAEBCAAGBQJT5RyPAAoJEC7dUkA7aK9H95AP/j9/xKiQM4qAYHsFmp/tMAOj
-kQ8fdYyeroagCzGr62R85qhMwZbu7tEkG30yA6VN9g5OZLNdkCV7FE5BGe8J+4RY
-lJQM5v63wORluLzRb2rncsW8YbQPtnLp/1+l9ADVW9mPRqWo1U1dgvy16ssb9SX4
-lNh9nF8j2BYP/n3Iv5Wxr15f/JAYnzTQ7RqEFjWbTkiEA+CvHbDVFJfeW30ltut4
-YW+sMCPoCdIbgA7cDQa+VKvhaOXur1k7sSpFQ2lcN823Wkkxdf4AbbjNlajAo3jw
-jOUOmrtl3bXSf+/3jPIQ5ylYnFDbhj8n1e5b7ieXfM0TtBRcJYQpNGTbD1z7J61M
-8w9MwEfP1pffaLA/CTxeiEqx8mrYiW+rIkjZkGKqMNusQGRnpxOBA+p8VYRn7tiT
-wz3vzWyoY9ToW4wwNRJhL8c1n5NIFk8l7U/4KrhxRr6b7uMyGmBGBBzN/eGUvbNJ
-U+zACWl5Zj2pjloxcPFrt6GmbLCHyLKpgTNtld49jOX7m1K/Lv7T2rGphsZA/qBI
-ULdeXMg0sk/yJPJNCI3mo20G29IrSpP9umxsuqOUkw63a7goyhopnx0B1llf8I4K
-Zh3N0wyz61EepDNOM7Up9e15ZBhA4uIqCY1gGdmGEHJzdphN6P3shfCe3Knk/Lnj
-TFMnPqw6ot8gbbGHQO27
-=YvJh
+iQIcBAEBCAAGBQJT5nhlAAoJEC7dUkA7aK9He2YP/2UdC4gacm/KlvEDKEEF/uYx
+9WKkS9Jsvya9Fl39r3y1lnJrW9+CKm41gf8w9pxQU2Sln0iFOqP/RtfZwXxseYk4
+6YSPLsiZsJxVJoHfC3Ka6Rmtq1vDcP0T8Zpnd66IFKK6iyHkKTgNlpIJ6kzi21wO
+LiMDcNa+JvwxqWK/Cn0jGUoK+nL6JZsaahUWogcBkC7Tmifwpe2SXoHkyianTZGN
+HkE9gqQB+9DlBX37MhCHkV0ZWgwA4eNDKAvfBPxczSx8Wwo1iKMnvTTF35z335i9
+Gkx4GNuc8c3FYoW9TTYz/rOR5TQLcut/0If7pgOhCA7DW8HwoNBXK+446QJ4vM7x
+jxHwhc7QXgCPg4X0s8TswVYkTumIupZ2w4iI+t85207+UQDepWy7zwunDDXOQNCR
+zjXLOx7qWdHA2bUE58T46SqtrrwfLdIKMhDzOx1juIia9/xh/ZOyX2a01fQatNG2
+AFn3sTOMOnwzCuaZGg3D9A3cINet+LGaMgNrLq+Ly3D/2JgVt2FG4eZFphkRhQz4
+Sz1eEYgNoufLN4WA9mXSbsqWXT2ToxyvQInBZ7ZcoKlIKuOgqGTZ++DlkA94kryI
+BwdNro6DzKRUmGTeada9MArCAI7/EkNKMbLiiRrymAVqR5EiKK/M+XtTBCH9dQ5c
+Pigw3gSLLqCRTLGqVfRn
+=0wH2
 -----END PGP SIGNATURE-----
diff --git a/sec-policy/selinux-pulseaudio/selinux-pulseaudio-2.20140311-r5.ebuild b/sec-policy/selinux-pulseaudio/selinux-pulseaudio-2.20140311-r5.ebuild
new file mode 100644
index 000000000000..ddc9cec6e011
--- /dev/null
+++ b/sec-policy/selinux-pulseaudio/selinux-pulseaudio-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-pulseaudio/selinux-pulseaudio-2.20140311-r5.ebuild,v 1.1 2014/08/09 19:34:42 swift Exp $
+EAPI="5"
+
+IUSE=""
+MODS="pulseaudio"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for pulseaudio"
+
+KEYWORDS="~amd64 ~x86"
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"
diff --git a/sec-policy/selinux-pyicqt/ChangeLog b/sec-policy/selinux-pyicqt/ChangeLog
index 2c1a0ade0812..8c2be769e8c9 100644
--- a/sec-policy/selinux-pyicqt/ChangeLog
+++ b/sec-policy/selinux-pyicqt/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sec-policy/selinux-pyicqt
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-pyicqt/ChangeLog,v 1.42 2014/08/08 18:49:29 swift Exp $
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-pyicqt/ChangeLog,v 1.43 2014/08/09 19:34:20 swift Exp $
+
+*selinux-pyicqt-2.20140311-r5 (09 Aug 2014)
+
+  09 Aug 2014; Sven Vermeulen <swift@gentoo.org>
+  +selinux-pyicqt-2.20140311-r5.ebuild:
+  Bump towards r5 (fixes duplicate context for hiawatha)
 
   08 Aug 2014; Sven Vermeulen <swift@gentoo.org> selinux-pyicqt-9999.ebuild:
   Make 9999 ebuilds EAPI=5 and transform to make master for version bumps
diff --git a/sec-policy/selinux-pyicqt/Manifest b/sec-policy/selinux-pyicqt/Manifest
index e3f193ddb7bb..5f5daa2b5b4b 100644
--- a/sec-policy/selinux-pyicqt/Manifest
+++ b/sec-policy/selinux-pyicqt/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-pyicqt-2.20140311-r1.ebuild 387 SHA256 99d4e2fdbf3f093d1d19731c6a189ebe2c1ce40f9dc651087746f641828e7ad1 SHA512 6c77fc14df4d8e16cb9f795c10e061760192e001ffb03321945d649ef5b3663189033938e7a01734c4222acc53eda065232d99c4116d88c4060daae6861d517a WHIRLPOOL f60663dc59622649117acb4120b3253a1d5f485c57c011cf483ce87fe7e443ab71ce650bb517b382549a5183bb267feca3b20a4d39a48bc2f6951fcf5dab9e19
 EBUILD selinux-pyicqt-2.20140311-r2.ebuild 387 SHA256 016ef8ffebc8466e633e011d59a26d4a4dd28067b8666168fb4bd3120a1f078f SHA512 b587d04b704c751c7c2423df546644b11e30401371e8229a9747299b3442b95b4796f134cc708c544c575355e065ec7e6b9069463da7a524cdc579f9186b52e9 WHIRLPOOL 8c695620e0b27e866a9b3c9ceae47d5eb8bb49fac4b17ead5d721b37f621cffc3f5111bfc6b2797ae9e47c0d147071ea549f754f965be056ce6d586c588b3206
 EBUILD selinux-pyicqt-2.20140311-r3.ebuild 387 SHA256 7b330790da2d6636367b19138b194164fc921cfd413f637644d0a5a317ecb8c5 SHA512 a80484a7718679092308fbc0537e47510699c2709cd991d295f2d223d6c64a7d1e9babfc3ada634f54d445d940da1fb057d44a778001a447fcf86991dafe4283 WHIRLPOOL e0570ef8c9d604c9af7a0b4110e9f98f1771fa5ea2d0db8bf6eb4c90585eaee12592a7790b44162d2904475764743551a3d422631912e5aea510d2cb90510a42
 EBUILD selinux-pyicqt-2.20140311-r4.ebuild 389 SHA256 eb280555015f81a0e7acef45f8020c7ea4f79516ad03bb38709830e66f7c02e4 SHA512 2033f4d4256f355dae722c754fbbe96d18e01aff7867d048f761fce12abc7d8b75e3ea0b991e8b1bc435b1d60c4beee2d85e8d7d1d20288ac324260f1e2cfcea WHIRLPOOL 856c2d64ae5eff7e8c935a3f4ee33bc0d4f05cd4eb2dbb9023966d783d51c69a9b4c4021e481d2d2aa4211d9ed567e0eac9150fdf08cdc6e5428ca741b8f28b7
+EBUILD selinux-pyicqt-2.20140311-r5.ebuild 365 SHA256 a258b01c809b0f8b9e0849f0cb6e1cf4cea848c0f96bd320d6b3d984f3d850c9 SHA512 e91900066e20f20416444c1f4afee76af2917666a51aab6f90370f9cef4f22ed1317e1392ffa6e8a23091029c82f1acead9644a5baff3f0169d16066abc3e0c7 WHIRLPOOL 81c010c1ed00cd2f5ff7716c97a8164582b5ecffdd18610e38f76a3300fcfbf4097adc3be74a14ae4ce629f86d065e2de309fd3ab24d03e63f69f6ee4872bda8
 EBUILD selinux-pyicqt-9999.ebuild 345 SHA256 259f17b7f26b0a7d8fac628df9b97bd8b306d3aa142963c04c6eb3ec73df68d1 SHA512 8a9175c15a59501c6e06f86da2a1d7b60232dc276bf465c0a80a16cee26a5e1fb3935cb98a7df808b296446f5b5d06a9ae8588b4f8044e77061851efba7a5028 WHIRLPOOL 5b566647ab3628d5081b73cb97ca27d981802b9be89fa14462e89e99af7556846dceecea968b44e09a730e97a2b32b63019a9a93e8f16dae246628f85134617d
-MISC ChangeLog 6511 SHA256 a0e04d71d35719703ae1643c45c8cc7ce1cac8daaec717c0b18e0b88e196343e SHA512 b885e7e52306d9434179b6cc19ce557c7e07c829ee34f5f11a30ab55d6c02ca3981e1c7f69726b451b4d7fc52caa3012a49b47a458dad444d67ee6f76aec4518 WHIRLPOOL 2a73aa02ca8f65b8be5d11f2410a3c3ec1ccacb247b6dfbc48ac7eccab4728f399d3178f35715562bc9822da53ba6696be0c1c40ff5503ecc137cfede2a2585a
+MISC ChangeLog 6703 SHA256 43a295db63a5be697bc9bb3af8d7a046c517a78ee6b65ba8aac90b59aa25f9bb SHA512 ee8f31d26c9359fc91005ed327d681a0df787779f48a242bb86887515764845274ac39d50844f2e798eaa66da4f916553433fde2bafe5bdce7c7d0045d6b9bf2 WHIRLPOOL 8b444552ea8db712676e2f778df8e0d04806587cbc0805820c867c0d8d99287b963a5effe59bfaf99d96ecce73fed033fab05438ce727beecf2cb7b923e892aa
 MISC metadata.xml 230 SHA256 3c60d8526c142ae883a2af0331e14ea6e4f51b14c8f439322d597ac6de5ff507 SHA512 6ceb3e9c4cd447798f1db75948bd3073ad8d0a0721f681348fa700cfbafc36833fa7b223bad7b25826dce61bd8c0edd33411e72de2b835ceaedd774c7b182a91 WHIRLPOOL 654a256604a71eeddf1333320930872351f50b442d1b4cf1d28ea8851e714a8cbf3a9aea17fd1715ac1249e3e9cb58bb9c65f2722fc998bac29b5399f63f28ec
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0
 
-iQIcBAEBCAAGBQJT5RyQAAoJEC7dUkA7aK9Hz/IP/j6/3uNjcQ12BZQ1XSVtM7nL
-+Cch/SjUXBTAZPt0fTyhzyhWPG0As8Q4PR4AjMGx0fsTZXCphw8JX0QTL7gvwnqp
-lkqFpAk1mWMIfnhgBYj7BMRjs4smVyXvVvAPYBGW+MV9CBe13zOfgp2qEBQ5t7Ch
-0Zhr1wh0Thffr0ZGUBQW2w6/3z6nEHSNOZFHmDYjgBoReZrUEaD0B0IsQjLg4ySk
-GRDWEElFIlUYSx+jRE7z6nTmA9YSHcGbiSZDL/wfVgecbraTwDX1JZ4sGM6k+HGL
-eCmJcpMZsYlPh/smDV07Eukz+hTGNRaKfpCMpZTpQ4Jls6fTZVe9/GKhlzVmeN9v
-F/RfS+Kly8Lo3XpGjSKqJN3bjQbgjvuHyZcqRdSMTUjWeyfnRdkxzDQsgwSv/MHX
-KM0Gr28jNzWxJaX6oc5L216mcURfEs++QH7G0TuhOk4FeOwc10St7LiNKmp5nQ3T
-DcSunCYBIQXpoZ4bPB/RaCf5B6BH5cW72jfpcUXssLMUU4KvgeUcPqKe7WP8jKKj
-JyF5ayuSGvrnjOFNEDFabHiHcxkTHE57vwN/jn/wBgKGYfS7WfCH4ORDkv0F+6LN
-Gc7+yH3KeKFTX4rIsPa4Prd0h5LhedkUt83IZBUcBRE79XBTFJDgMQ4I5IQ3F/mC
-osOwNAJ4MnP34Ev5wmB9
-=oHXf
+iQIcBAEBCAAGBQJT5nhlAAoJEC7dUkA7aK9HRn0QAJwTzHqPyEDaay4upnZiyBvW
+VE9eSp5wNfqzNJCKAXHPilnx0Z5qv6yYcdqiXc7VIP595e9Z0BrSWUIY0BUH0GK8
+tJM4r63rULxyTjnf1MGMHiI2I+jjQoPykhZc+f0chSCm0z3e0ehSH/5SNTLfw50V
+sYhda0sZsM2CfMs3if3SROW3Zl6pbuuoSay91M0+E+YjoGopNTI3t82nwlyBOVN5
+RiZdHeMKX3IDcPOWrW1L6b5qcQX92tl+3B65VG4suwRyxfnxaaLxhO9kViCewxF7
+37zwlI/9j2iNXDmAiRqPUryHP2fNgFQuBbVK4gwGpAxVBgMSwpkcPlJpP2UggNy+
+WFH4dt8spXnNrjZiAIYaglcFmdcbV8aAbS+r4z3kxoIt8WH+EVmiphYrok/JMnzq
+HX3D5a2jpIzR0y3aiWQx0polEvfJ84pHpGaNay2ZtqQFoT6Cv23+C236FUbQzGnD
+qr3YyLJuwcqm71Q8+uvG50/snJyGVBZHR62iV/qMvrK0bIAL9f/2UJ/xsDHraGOA
+at6Wh6Y+Knb7l6piNfOaRTw+UiXLZZ+/67BFu+5NsgLVwPCN9SE8GMRmpf8WH3hf
+tR9Ju+4rn7YlavkDQerJocrAH/+MSTuDhOktQBAqQAOXfr201W9oXjsoZirlZY4L
+RmPFWnfz5CvTOJTYwjmV
+=TuWC
 -----END PGP SIGNATURE-----
diff --git a/sec-policy/selinux-pyicqt/selinux-pyicqt-2.20140311-r5.ebuild b/sec-policy/selinux-pyicqt/selinux-pyicqt-2.20140311-r5.ebuild
new file mode 100644
index 000000000000..e48597e5a117
--- /dev/null
+++ b/sec-policy/selinux-pyicqt/selinux-pyicqt-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-pyicqt/selinux-pyicqt-2.20140311-r5.ebuild,v 1.1 2014/08/09 19:34:20 swift Exp $
+EAPI="5"
+
+IUSE=""
+MODS="pyicqt"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for pyicqt"
+
+KEYWORDS="~amd64 ~x86"
diff --git a/sec-policy/selinux-pyzor/ChangeLog b/sec-policy/selinux-pyzor/ChangeLog
index e6fdee0fb6f9..5476c80c8189 100644
--- a/sec-policy/selinux-pyzor/ChangeLog
+++ b/sec-policy/selinux-pyzor/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sec-policy/selinux-pyzor
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-pyzor/ChangeLog,v 1.51 2014/08/08 18:50:01 swift Exp $
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-pyzor/ChangeLog,v 1.52 2014/08/09 19:34:15 swift Exp $
+
+*selinux-pyzor-2.20140311-r5 (09 Aug 2014)
+
+  09 Aug 2014; Sven Vermeulen <swift@gentoo.org>
+  +selinux-pyzor-2.20140311-r5.ebuild:
+  Bump towards r5 (fixes duplicate context for hiawatha)
 
   08 Aug 2014; Sven Vermeulen <swift@gentoo.org> selinux-pyzor-9999.ebuild:
   Make 9999 ebuilds EAPI=5 and transform to make master for version bumps
diff --git a/sec-policy/selinux-pyzor/Manifest b/sec-policy/selinux-pyzor/Manifest
index 3708b799ce71..dab006910dd4 100644
--- a/sec-policy/selinux-pyzor/Manifest
+++ b/sec-policy/selinux-pyzor/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-pyzor-2.20140311-r1.ebuild 383 SHA256 6a485963167ea7d6cbd322d904f9b1d17930b81b94f4d3e68f159d2eef7b513d SHA512 c6314f8896b434b220deed565182aae633f08e9cc2a3185ee9b79ead99b567ecd45f1a22f2490b315f25450194539f3425fce363eec7f67a7c578007c67fa9b5 WHIRLPOOL fd60b72513c450f34ceeca9e4e1a83496b082cfa7aa5e71be072c6f3e0ddd9df8b9dfdbab3887fbd6aac74919d112d950fac054ba4a04f934b9e08214dd169cd
 EBUILD selinux-pyzor-2.20140311-r2.ebuild 383 SHA256 aa692b2689d06794b04c0302c5ca2741253f52970bed5fcd3bcae6d9b01850a7 SHA512 6de38000110618edbb04de880d9a5841b443445b02d2f48d7b5a2fc289c9b479b1fbbfc5ad1786a42f07383bdb315eefcd966a9c2c4bfdece70b9d2736ae8922 WHIRLPOOL 957a15c7c490ddeea1a6aa56a817118154ef77228f8621a75dcee087080372888129a4b037e67e04fb17b376b4666d43719a16d61a03a28b3cada9976d1b2899
 EBUILD selinux-pyzor-2.20140311-r3.ebuild 383 SHA256 7d0e1f4f7153b5163c50bdd43c702a0a922e2f869d835842a35c3c1d0a8063e3 SHA512 0e652c3b4e4d154e40e980ba7655c9ee2f8d18a7f0189f80f6c81ab0e896f61e70c2fed3464faf0404c930dd7e734d30b212dac47c34b276f76f49703915ca4d WHIRLPOOL 8a2c73f5aac8626ecef06fb09e6865837697edd28f247eb1ba155f898c36c5f510d579c7787bd0098a381f509a66fd0de3f3e12312d02262a3c5793a9cd65c76
 EBUILD selinux-pyzor-2.20140311-r4.ebuild 385 SHA256 266a61023553bb6987ffc0505a39b41b21fe01fa751ab027c10a29c34be157c0 SHA512 6ba2066cf0abcbbf6300184e7eafd716897d8ab7e193627158a9cd103afad4bf387aaf4a917395d4b3bcdbee429d936ad315fb6cadebed39bba1e29949d61237 WHIRLPOOL 3a3f8aafd80fa087547182fb53bf08891f763e56a356a9ce359889fb80ef371e41a1b842392e1b2cdd0f6c9f5eb311f7f819541f9d62b53cd802408fc9c007b8
+EBUILD selinux-pyzor-2.20140311-r5.ebuild 361 SHA256 70897d1066ceee0cf18beefb2f98a00e6aeb7c215ec5c8bcce77fbc0fe94cb08 SHA512 1ec99470ed3dc5017fcffe318c701dc1aef768adacd6835187ec069831b6f62b8381b4eca8e3c8d8408b46542b743b9d321aae2cc24066bf64692f1956d8b470 WHIRLPOOL 2aed74d89794b438d43a07a92d21e4d5690435b1507c05b46a2fe020c7393772aaed9de968fc5031a781ae691e8b4b92689998f3f8279f18a59de6ec190ac2c8
 EBUILD selinux-pyzor-9999.ebuild 341 SHA256 cef1e2a78fd6c024b56d8c370abe6a059ae8fb9398cffc8b2a2ded71a8f01819 SHA512 cc6d4df7cf403588f53fa762688ad3efe229c7bf7303706619d1a47b53360085363048199c50fc47c449db37b00615420e3c0498b91f2b47f62491b314b8525a WHIRLPOOL a3a438b1501a8e3262b73a6f0dd59b40d830f35dbf1ddcd042fcf0ea603cc7d81fbf9665766f9b84f47a5d9075053c9102091331f9920c360de755c2be1fa2b8
-MISC ChangeLog 7934 SHA256 158482dc2fd4a9966272290b153327be72344e5c2128f0b3fb438bdab2c705c2 SHA512 8a28981d1ca536f934f70e7cecb96d4a8676d2e565d06a8765c47e30074780ee1e18dd7fae16af69d188dab303032be9474627d440f2a1445bef4384a49f2ef8 WHIRLPOOL 16b5b61a861e4c9d2092e28ee9807e7bb5978dd41c48ef9c88a61272fd321b0b62ae8074057dc4efca3193457e92eda06bbbba9af0363de0c180468fe09d55c9
+MISC ChangeLog 8124 SHA256 0c80f515527c6b679c2c08b34b0ed9826dd38a011ec5b2657bed62ae442b00b8 SHA512 1724b8acbad1e1ef29d96500f789163f7b871152bfcecc48dcfec1a8a3d8259b07d1ae969407dffeb63c7435659b752a4ecc60341d25f23b59f16d5014bf5860 WHIRLPOOL 12be2f97233e50fe7c7e31f002dcf1af5ad0f93543e9f3c31bf9fbf27cd05b46017ce5ecc9dd31ed5b8edcf8917e18943029387a1e212daa77ef3f0695435268
 MISC metadata.xml 229 SHA256 93ef643475909e60120d42da937b69ee3427c511022fd04507d5034a637a2d25 SHA512 66e2631b09f3715fbcdff8763fdccd3f42538113309c1daf767fd441bc8ddc961844096872404dfe204d9caff1d6fada74d72e5254a68342fa62ea5ae43d6915 WHIRLPOOL 93c75f565c85e77f750f8623dde5eb95a8399fe9f8dbc2ab1e9953e982e612286d2f60c774ea514e8dfacd18096fa2892ded1cd86dacd4056dfa460873405543
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0
 
-iQIcBAEBCAAGBQJT5RyRAAoJEC7dUkA7aK9HzboP/1BmucU0MgmFQTqVmcDYsHFp
-gF6ktui/nl8vH9k2sopKwkPeOWX6L3lBHvxTQA4//6FVWDdwj2zyCAeV90RlsZj6
-YRkL+fHBholKbfwS5NaKiBMHX7+NbulHYWLSQB+UzrJPoglw3SEWGZ14Oa6rrNZ7
-kas5zbaHzoQvNxkGX7GXo0mxb+Z78aIRzzDNvbwrjnst5AdpqV/zJDYaCROCRb69
-VoVd9bnwXezk6qK/otH4hfPZqW/Is32mGNr0jywVSQ/t8M9/JHaTd+5Ww2ZlzEgT
-UY1TzbMw0eBtKG7YHooENPErIiVvnKip146bngShuVCYJTC5xpbiNIQX1cVNcpT1
-pklhuP/qB884IaF3H4gmjlRD1XPpNFhvYihgpAGLJNFpYpCEJ1rOUuNjvhD5kQ2U
-F4ALAE09CZkFi+N6/8E1uDhdrM8exxDRTYyhj/7ARhGcvH6hqK4B6Az1u2MSmRh0
-b14dQdFDU3h+CT42Ogw+XPDKjagYp7Dms3JWVIOdX0Ayiunq18oGpuH97bgGNzWK
-NUwkdNlFMbMadiOcF3tMS5R3QtcU9NAyj2bRINGPP1wpChSfwel756Gx0DXw2t4A
-K1MEpbYMhI5wf1zgi9PCeojNSW1Cu3Ull/BbvkHy7qPA2+GTmW7v1b3fhRd7ScMV
-beTvlEZy8L4ZTfAw8t6o
-=zuV+
+iQIcBAEBCAAGBQJT5nhmAAoJEC7dUkA7aK9HgsMP/R9ynGxnBe2nZuscASQEUdiD
+F4NQ4vnIok/vVfahDH6zD9UYVqH7L7OJaIWd90GEdwxbF++IX0f1NkJaIU17c9jP
+RzX5mTGhQi7VPhm0P1Bd8IrycJ1dwZzZ8iLGG8AHmhq+1d+tNx4xe+yUHm+Bhfo/
+Uj7jnssiW8Rj25rCsYaLahfsGBu6X0YDQCl3RB55aNk6mOPrUOWBMo3L4nxBgMAZ
+jW+lVw/VkLeV33djSr1N+FrIbbkt1kjTTrhfEn2NlNpldN3YiDyffyUCrJw1Qiak
+IUYze7uD9mM1CJjUTe28DS3ix5PjKf8Hfb3n8sLDdvXViVcMZKdFdtxaiEXAcmem
+w14IkBnMmwoKxgKz2VAqCQ+wbug6qVNdAbFQoZUQQV2vdFtzQAPqtbqViWSjy1FY
+MjhDthwlZVgkOvkT01kDqC3WchXR5N2ly9pYvk1LumgKOwyL3j08K5H+fCIp7HfO
+yPBq18ZM1N9rXgYT6ZJuFRSHHez3jkKzyRZAor4GnGF0yktd+ll64bdxIib+fTVd
+qafwWLx6wOvT/raW09aVus3JdqbzuJsrZY2HAhudPlLzoQXfIIvH/e3fwxoxTDuY
+4QsgVpmMdxAYBRsUp2dcI5juvFoMNBIgMRW/uH4kMP7XJH7hE2NUq4UpwG+bk+Jh
+hGoZSkv3T5dzc63+liMj
+=lo0S
 -----END PGP SIGNATURE-----
diff --git a/sec-policy/selinux-pyzor/selinux-pyzor-2.20140311-r5.ebuild b/sec-policy/selinux-pyzor/selinux-pyzor-2.20140311-r5.ebuild
new file mode 100644
index 000000000000..9c45cbaf2adc
--- /dev/null
+++ b/sec-policy/selinux-pyzor/selinux-pyzor-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-pyzor/selinux-pyzor-2.20140311-r5.ebuild,v 1.1 2014/08/09 19:34:15 swift Exp $
+EAPI="5"
+
+IUSE=""
+MODS="pyzor"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for pyzor"
+
+KEYWORDS="~amd64 ~x86"
diff --git a/sec-policy/selinux-qemu/ChangeLog b/sec-policy/selinux-qemu/ChangeLog
index 349a1bd7935d..6485877790b9 100644
--- a/sec-policy/selinux-qemu/ChangeLog
+++ b/sec-policy/selinux-qemu/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sec-policy/selinux-qemu
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-qemu/ChangeLog,v 1.48 2014/08/08 18:50:05 swift Exp $
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-qemu/ChangeLog,v 1.49 2014/08/09 19:34:40 swift Exp $
+
+*selinux-qemu-2.20140311-r5 (09 Aug 2014)
+
+  09 Aug 2014; Sven Vermeulen <swift@gentoo.org>
+  +selinux-qemu-2.20140311-r5.ebuild:
+  Bump towards r5 (fixes duplicate context for hiawatha)
 
   08 Aug 2014; Sven Vermeulen <swift@gentoo.org> selinux-qemu-9999.ebuild:
   Make 9999 ebuilds EAPI=5 and transform to make master for version bumps
diff --git a/sec-policy/selinux-qemu/Manifest b/sec-policy/selinux-qemu/Manifest
index 277e5d86bc9d..ab574053fa09 100644
--- a/sec-policy/selinux-qemu/Manifest
+++ b/sec-policy/selinux-qemu/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-qemu-2.20140311-r1.ebuild 444 SHA256 5d58c5f24e84175f87d1d2994701d4732cad4ac7964a9a766a231dc8f3a1a74e SHA512 8da8105d8afea73ce836a887216a7bdd3471b3de497930cf2350a2a9504933275ad90376498547b66dfb68c0067b838e661fb58bea85b6a3771facc377c7e50e WHIRLPOOL 15234bf439164a77fc4e6f54dfd132b4b0c88b787bffc087c9adaab714c02fe50f77d762ab505a693918477d7e059abe407c4cc1ec0d147db142074970248096
 EBUILD selinux-qemu-2.20140311-r2.ebuild 444 SHA256 a72922ae15e7601cbd13d028333f3961a91de042ab775081eaac31d9aa3b4ccc SHA512 a1c0fdfcdb9f1392b6bf1eab71e10c8fef696a68a3f188547c19c0aa127960e58783892bf8d20495f868fbb8e2000c5c6faf133293d33e4772e85ea8a9861fdd WHIRLPOOL c0c4e18cd2188c371b54b42ba25c6419552faec83cea3a78bb707391606c14652690d38076987aff3340deb93b9e5c6fa2a74e10cc7b85325db7648558345505
 EBUILD selinux-qemu-2.20140311-r3.ebuild 444 SHA256 7dd165aaba7e79a36db0127de0e3400f254e319098f684bd5a1898b326338e70 SHA512 009df4fd6c99f5e826adde371ae06233a50e14d3045c2b9eedb72da9cd42ba78b25cd4b193d0e0a0faaac217868264b6f763d51e8665eb90755db26a6622c54f WHIRLPOOL 55f1207e4165a545f40911d24e138d9cadb88ab1e26d287ed8ccbe628b149ec6f5082e1d1833f3977d25a314039a628d591df9046b24d7ec0acc83a9c7e74a1d
 EBUILD selinux-qemu-2.20140311-r4.ebuild 446 SHA256 ac840e2dd275f0dafc41a7c6a4b6a09f0bc8e150bddf8b9e6994b602b49018db SHA512 8a9a7a914aa28717a0d4b96c0a53d5bba8f9c89f1e44a0461988847a77050312e2e346eb7347f8ddd84b020018569443b34de710077df6fb171daf968ec12e2f WHIRLPOOL a59e0f77feb03ed5219389ac10c92ffa2f2f04a3649448d43e173882be4b9ed59a555aed0c83b81cebc5ea9db5601f556d62cd0a42f1ad8b03989f0e8fcbe531
+EBUILD selinux-qemu-2.20140311-r5.ebuild 422 SHA256 3e845e90cf1b43f70af3390d2fb4c790cedbb9513b1d47339bb9121d6ec73c1d SHA512 7af2e8d2b792ebc35b3ee6835868d35a95886a36e698e9e02d7b25213be3c79b37e3853c0c3c0767b80efa732d302bc3687d32b52a1562b4b476594822798fba WHIRLPOOL 80b3fd63e3179caaedec5975f8c86ab5f595e9a95cee346e8f7784b8a2dfe60c4b0b7d7790da08249b709ac944e7b325f59f8e58e10fd87058e1a98217322232
 EBUILD selinux-qemu-9999.ebuild 402 SHA256 35ea8dd6ee096485e81404b39da0b144453500394c907875497db3407fe17625 SHA512 e88dd95bac599e7d71d40cc5e52b16a855e9e5d2fbdc67444470e320e5278b3894bc81194dee0c75a669a2cac3ca460f8d2796b23d70a343b6b8be1806048760 WHIRLPOOL 3efa25ef6db616c1f1a6090847159124b5e5f85705b7ed5524f8840594f72bb3f576cd17869b9950dad308eb4f009ae24253be5e16b88c394a55f16efa89d987
-MISC ChangeLog 7447 SHA256 49abe402664a4ca9ea08bf9661ccc927e86693e076bd05e9ceead6bc3058ab3b SHA512 b240d5faff288c4256370cf68c58a9607123b8d822f4f0a22654d466e0b3efda435e2dcafb8b28565603e4ccd9da18d2bdc4b51ad5c7fe3e36bacac30b177149 WHIRLPOOL b63c37e367e3f2abc5f19d1a001a79bf5573cad4be156ec468590ca9226a1746fbe112d65d228a82c01a546fa703c74cdfca42451b95d353fcf16399dc6d1a0b
+MISC ChangeLog 7635 SHA256 d202c7720ad2b6dd7da2f935b592d947033d7d77a47de3efa9ccb7f005d1edc0 SHA512 b6d225cde432b7b712d06da9ed1d10544e6d17be3da1fa937cde8709fdc8cb3a9c7fec7193de36174e14c485ca37b9a59fdd1dba2a6b150edb95763aeecaaef2 WHIRLPOOL 629ef27b20bf7d99b3a2cc71d15a6234385e27aa56d4a4908f2d34e60c46a2c12e0ef91f5a8a38ae51730b32fb1ac31afd6b78f95e3cf3fbabbb8c1019584f5f
 MISC metadata.xml 228 SHA256 53ec05da3df2140c21391eac48a9d76ed9a69187ac11f88651ce523159fe6949 SHA512 ebecd324f4bad814a89264e9c538e115584b656047a22a740422145fa0ee2bbf5ab7bb85e5808f932ebc875e5a4d8e4904a99f5dd4fe7bf10cf0b407aa982e2d WHIRLPOOL 93bbc4b74a23fc75c5ddfbc9547a01c23de6bec8b377d6dec1dd7f5f2abd7bd4fbc807296dc451c277e6b37facee4eb5cc6bfb16ead222cb03444526b39cc6d3
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0
 
-iQIcBAEBCAAGBQJT5RyRAAoJEC7dUkA7aK9HyzgP/0eDBEy9+k9+BJE2pJLYEiwI
-bvepwPlEeJM7Fbehg7Gg5CEWqCUR51xP1mFN/cl8gNxpsJCmkmW/PWLu87Fp7d8a
-2I9nKJ9N3W5ZOtXFdsJ65P3FKfbzbNMmwOhHOnAoKGiOHTZ7/hNEWbNzzNc1K+uF
-YYldMURh/CPvhtUoTLjnw+tc9TdmQLew/17IrekncKjeZyudeGmB+S1c6orhvDwL
-wsChWw9DLctMAW10vg/r1wP8j/nve05f5GIM66KGxPUniZhT7Aom3UnnLwUWvFNR
-iB9RN49xFjFvEmllqWOubb//8GJTStqfC7iJxCcwSzXghagqmUCr7wn1Uif7rkeG
-f4pJ91ALoNGdIASXJm3/OYtCS+CuhK79JFnTSf8yq/p3TzQI+RjECxmVzNz+2YYP
-FfLB1VSSLy/Bv2OR0njm8GMpl7N2ZE8DEdDRN+AzCpMVgzZZHd1kKjyQGYeytqi5
-CvMIcVC00z5XXxlLeXHIENdajF3Fc9nBKUBC8oiDNvPYKpGorgh7ZQKaMVdEw5lG
-3L5/NJtvC41Wseh85IfPv9FHyF3soSJB3rly7x9s5mgbPuJoSOdTkiAxxgfdl3uc
-yKxmu1Zk/zaQhhriH7dA1wfOE2htLYz4okbuROA9VDpA0ZEH/QSMZxAN/tApky3B
-y/o5rOyFLR8qL/Z6bBf1
-=7Cyg
+iQIcBAEBCAAGBQJT5nhmAAoJEC7dUkA7aK9H70IP/i9z7WotY7GqZu31qhRf9xKt
+fKsFIKkt2oLLmC5LlQGA9SVtQzYASRybTtSmeBYsCNWbutGkJzT0UDyM/phzP1sR
+hIWa/TH2Bue+ZvYZsy/48Z8l1J8zCJRtogtLcRgk2T+cTkVXTVQuyCjKsRDn5dRG
+t9C5scYtSltqEW9nJqUKO5ERuz2HFEVud+kdQR9MwEp0CESzGLsdrJ78imxCj/2q
+uN/br+PJSvFnuvGGYXhCG7eLfZK8Wq2TyvjDT0JrWRA4XVT7KGnCzt5GnucGFxcA
+3Nfa5fuAjCny8LRLuumeIkTBcDZ67OUAHAI2OMgwv680hYORRKuI4SRafYUpYmJE
+KY7jwMxtJEecIG5bUZBxD0bWXZ1dzdfhXVBA0rBmu3U1x2pxlbgHNOItqk7qPNtR
+EHeEpnINo74yw4FUAuxwVey+UeIBUPIJXAdQYZ7FMMzopCfsQZWnoBs22cDTj1D6
+TXkWXDffOR1vfbFo71UIoJa2oBWCHsU7wQ8V8ld8yBVh1PULgv/4vw2e2ZmgA19N
+dPkWxYghbGZujvOJvtmmP0Uzaaox7SmpccJfJSP3Y8ZQogRCh7XtJPIu0AeXS2CO
+MO+dOPaoMu2HNiv2a1FaJrrKhB/8Xxkpqy1NRdrISU1ENGjHVnNIodbvnNlu8uNr
+k7T1wugLDRixxrAjlpZ7
+=NOzy
 -----END PGP SIGNATURE-----
diff --git a/sec-policy/selinux-qemu/selinux-qemu-2.20140311-r5.ebuild b/sec-policy/selinux-qemu/selinux-qemu-2.20140311-r5.ebuild
new file mode 100644
index 000000000000..0e7d44c801e2
--- /dev/null
+++ b/sec-policy/selinux-qemu/selinux-qemu-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-qemu/selinux-qemu-2.20140311-r5.ebuild,v 1.1 2014/08/09 19:34:40 swift Exp $
+EAPI="5"
+
+IUSE=""
+MODS="qemu"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for qemu"
+
+KEYWORDS="~amd64 ~x86"
+DEPEND="${DEPEND}
+	sec-policy/selinux-virt
+"
+RDEPEND="${DEPEND}"
diff --git a/sec-policy/selinux-qmail/ChangeLog b/sec-policy/selinux-qmail/ChangeLog
index 7fefb3b12c5b..f31fa7516d19 100644
--- a/sec-policy/selinux-qmail/ChangeLog
+++ b/sec-policy/selinux-qmail/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sec-policy/selinux-qmail
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-qmail/ChangeLog,v 1.66 2014/08/08 18:49:28 swift Exp $
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-qmail/ChangeLog,v 1.67 2014/08/09 19:34:42 swift Exp $
+
+*selinux-qmail-2.20140311-r5 (09 Aug 2014)
+
+  09 Aug 2014; Sven Vermeulen <swift@gentoo.org>
+  +selinux-qmail-2.20140311-r5.ebuild:
+  Bump towards r5 (fixes duplicate context for hiawatha)
 
   08 Aug 2014; Sven Vermeulen <swift@gentoo.org> selinux-qmail-9999.ebuild:
   Make 9999 ebuilds EAPI=5 and transform to make master for version bumps
diff --git a/sec-policy/selinux-qmail/Manifest b/sec-policy/selinux-qmail/Manifest
index 5edf63d84b65..d2c3d380666c 100644
--- a/sec-policy/selinux-qmail/Manifest
+++ b/sec-policy/selinux-qmail/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-qmail-2.20140311-r1.ebuild 383 SHA256 44dc5b7e6dec9bfc0a385108c58c992769425f073b7d8c6e0670df5d9d556347 SHA512 43ca424a93c8d85682e60b1955990ff64787cf57bd7779a5b9408b35ce85ed71d209a6c3285315293e6320d46cc4af3b1df99e7e96fb0182c6255397058d5275 WHIRLPOOL 844ef490f705c771c98aeb1e12e798571b8dbe888c2043d6c00aef62644524235a51c7396353e57b3f18a8c22c23f3db964d4847dda98b41cf29ea323757a456
 EBUILD selinux-qmail-2.20140311-r2.ebuild 383 SHA256 38f99c4939cea1b268b1848ba7410be3fb510d768051bb7545361532515aa4f0 SHA512 11f849c775465950b55d2e2ecba7f0c765a1c95d2bc27bf2011252f023250a1be5e723507c7728bdd63b0a5567f035d15266d94afee6bea1a5ef0670e0638924 WHIRLPOOL 92ada0120bfff19491a49de7f6570414c00e1ae06efc21577ae9522f45a10e04a5407a51cd4d1b42d4b8687e2d1260e294d20adc198ee4247ccaa3fa23514115
 EBUILD selinux-qmail-2.20140311-r3.ebuild 383 SHA256 7aba3b1f37d2b8f6cec999467242a04020bdd2cbc16c659430d3a4ea43006039 SHA512 786dc0f8c3fb48d9b1e83d8e379233ef0f1351e0ab59aea820133e44574f380f755598183848b8089482709c1cf8652dc2a45c71c7eff02ac47f99d59eed1eb3 WHIRLPOOL 8e90edb63ce6fdb88b5d7836152a38b8e1c3d673d82aaff177fc13eaaea7a2cfd695517e48ceacdff7ddb642120f4dec4771d700acce7e6a993724303187c50e
 EBUILD selinux-qmail-2.20140311-r4.ebuild 385 SHA256 79d302974c5f598a7add4bc6dc1de427f5ccec11563eb4f23764b7bf325dfbda SHA512 ce63e3fc612e24c90f240816bdea64bc85af1534354b28305be23422f4efb5d483beb2a34b9013f718829526b6d311a08ac81bb25d86e015036d496fcf340fc2 WHIRLPOOL 3030bd7bb7c926cd79734d198fc8096ec7e9da45673a9985655047203043a686ccb98fe33e9b389eb3acda6198dc9ed97b7da54f54c9886f9c3a9fa17107e99e
+EBUILD selinux-qmail-2.20140311-r5.ebuild 361 SHA256 1ce45eb8ab4c2b8e4582d5f50399a392f217cf161b2df13d205245101f8da803 SHA512 645153d7c8b2420214d432c3274eb39fac84f9bd3b305facb49825ba039214746ba6d671f667faf30c1bc04476715d566209a75002608115519346e4b3fccfc3 WHIRLPOOL 6128ee79a8c48b99de687a9547cf5d5074432b8b81cea35188f54b03e305fcb7333ac05878021d266146ff642918a2584a1dc5af547eadd2e3106f0a30fa9178
 EBUILD selinux-qmail-9999.ebuild 341 SHA256 e8e2672ef79b7a34b520454f50545db5e875e4382124ad05cef1bed4fad8f675 SHA512 b00eb9eb3c3434d263d20ed1cb3da5130dc250b262826714435180917a7d14c670b0bd329f60f0a4ddd40c734f4ffd73c17999568cc37e37d4042fb91627964e WHIRLPOOL 73e1154091f2008087abae30f3ffa59acf11386947967ef209a1e89da5b7e7782f5d47cceabc088ba28c85ce37b319fc15056a36ad0642414b126fb1e99cc6b6
-MISC ChangeLog 10178 SHA256 d05c9a31c2e0c7a792fd0864ad64040b5179acfbc6ee5a4012fa3a044849ee79 SHA512 4f26d090fdde30fcd9909bdce955a089435051f90ba994dcd90b295d05718279e8c44f4b26e523b292d321a165ef8667b4b21d548d1d7679315a63ebb1b7a502 WHIRLPOOL dc6a237cee556840e77e20d8c4563a286b0511ee65e66f835a6303a4cf6f151d73f1990b1824d065278f7878c3b0360a1ee527708d59f17958eb8fcf91e58756
+MISC ChangeLog 10368 SHA256 dc7bf80467fca3d49fc72ec1ad79fa02b39964c9f79348448acff1b5ee8dab0a SHA512 6c40e68ad0a3bb535dcb4ec750e28e18bf3df2085e5a0d675e25720c6d1cb75caa94b5f4bea9578ad40bfbff83d6318e03873dbe706df9ff55ef9933d6b12444 WHIRLPOOL 0e37ec8f3a6bda28d370e5c33cd93c6a5ba47d1bd1cc79a6ddb6ff74f210a3ad97774c98426346cb22d3b4c600a364b05c5915e9a2fea7e0203fb1e22fdd1e9a
 MISC metadata.xml 229 SHA256 0da42201a31928d543bd48ca6a8e9b0877a251e48ab02fe146a5a71dfc0ca55a SHA512 b43efd22db6b73564c8a4f82a898dec178fb38be278e344af93cbf7e4fafa1b533e041ee2ff483e7b3c3d2c70fe1a3e910e73d880e38fd794a6e2e031104ea7d WHIRLPOOL 9afb666fe17f43eef255b9074dcade0845718e775344e69425969d3c7b60a1ca744e2e93bfb319958e98dbed4e4b3e7ea77d37fa014635b85065fdea24103fef
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0
 
-iQIcBAEBCAAGBQJT5RyRAAoJEC7dUkA7aK9H0XwQAKRYAzySQ2/YTnOZ2YLDeVyj
-ocD1HfJx5XQsqisDYY+4ak9UTTJuKzDGRacQ6hOnwQAD9LU1RTQdWtBXeM8eWOjp
-IV5zltR92QwccoIWeFSwjXVXCdazSJ26viykjLlk3kJu9nj1hmB7jM4FmE32ZqAs
-RqPtawt5rBzB55/tLMUU++q5axNdWtXVWpcAnifSFzG+9MowDEZEXtLiJ3Nt80IN
-4o7C5AX4Mv03bLUypH9UtCb+sHN9YsYpT+PmI8SkOJ0m/yW+A0YdXVGvFq1tarG5
-VVs8fA8KdxK1OdNzTxpjnBTBO1Kpn8e+v40ORtXn3+U+H7HzTcVx1Dts7CBMbC2R
-QjJA9gqiaKhCz1UjBG4biI8EgqUoz97TLNXtFe8KWxcyv0MB0/gIW3ehzxUEqZU0
-54Rdn/uDhszjilr3ztqDhYI2BnSSfCZVcPXZMIkiE8tZCNsNyZFgSapwKFykUmAE
-MQ5aC18dcf/FZhVE5gFUvCxpypdLci++YMI+lwxJoUVtF97AQC+LZlI7QE43mCYr
-KXVN7gFmc02ST9EUn/t7t3q6JcZ2jjb+AIJEI+q9xp9vWdP2qgKaofHMp88JaKfq
-kE0SjknBiT+QFbdhYSyHsoZQS958EaDCVfE95f5TDiXQvhAfTMsKPSNARqN9mwU4
-nw5dh2ahEPn3wzaFBNRO
-=am+Z
+iQIcBAEBCAAGBQJT5nhmAAoJEC7dUkA7aK9HAH0P/ix/mAMcYWOoJ67hTXoVJ56E
+iOq1GDXYIelckG4CNgdFqeOpoHtY8IeLbg2YGwVk4X/bnxHo87Qlg2C65ew36YLI
+60LRXxeMTS3BS1h1wpojAythHFZnLZeo8SKPKhDirkiTp/zJsJ7KTdsoRqq+fEKv
+NeZu0rC2hPeKD4XzdNijAfIZkNKQWg2KI048yN4EbBIYxev1zxsHfB9T2GWKqSUW
+KC8uyGab+siKOMYyn4gs2r6L5XIDLmWnUGSul26OnFtLJ+iX+cAaslUmMBDUApux
+CNEx/xcrUsgPwhFO8PRBK8FKCa+9XVKRTol7Zeyi7TjseiNufmKSE2W5VEzdqaxd
+PseekJaxaqpk8YZkNy5JxWVNaO4YyLtaimFAg31QGcFAejn/bbYEsg51wk08yvMZ
+YnIQx+/4ycE1YcasIjqaVVxUCVOclnVEXsKi6vBaUsD1VfjZiF6zmCO/ikC+LttM
+65SD92gqiI6+OeRBrR6FJXteqCCt6YTzKhEbLpoaNr4NHUxoXfzrfVYKMQqUsB3t
+MwbA/Tg/POCp2rao1kaap6xucG69kMm7GibG36sv4bSjpPKvYGnqlsF0KogBn2mR
+9OBY/05WyikxAOjxj8O6/Lufd3MvR+uZvwAT3CCr0jdhbKUe2IezROuYnvT92iEU
+F330DgnoN1/XhmYarEo2
+=gunv
 -----END PGP SIGNATURE-----
diff --git a/sec-policy/selinux-qmail/selinux-qmail-2.20140311-r5.ebuild b/sec-policy/selinux-qmail/selinux-qmail-2.20140311-r5.ebuild
new file mode 100644
index 000000000000..853ac66b4538
--- /dev/null
+++ b/sec-policy/selinux-qmail/selinux-qmail-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-qmail/selinux-qmail-2.20140311-r5.ebuild,v 1.1 2014/08/09 19:34:42 swift Exp $
+EAPI="5"
+
+IUSE=""
+MODS="qmail"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for qmail"
+
+KEYWORDS="~amd64 ~x86"
diff --git a/sec-policy/selinux-quota/ChangeLog b/sec-policy/selinux-quota/ChangeLog
index 9c1aeb08029a..eef3ee5bfad8 100644
--- a/sec-policy/selinux-quota/ChangeLog
+++ b/sec-policy/selinux-quota/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sec-policy/selinux-quota
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-quota/ChangeLog,v 1.42 2014/08/08 18:49:29 swift Exp $
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-quota/ChangeLog,v 1.43 2014/08/09 19:34:12 swift Exp $
+
+*selinux-quota-2.20140311-r5 (09 Aug 2014)
+
+  09 Aug 2014; Sven Vermeulen <swift@gentoo.org>
+  +selinux-quota-2.20140311-r5.ebuild:
+  Bump towards r5 (fixes duplicate context for hiawatha)
 
   08 Aug 2014; Sven Vermeulen <swift@gentoo.org> selinux-quota-9999.ebuild:
   Make 9999 ebuilds EAPI=5 and transform to make master for version bumps
diff --git a/sec-policy/selinux-quota/Manifest b/sec-policy/selinux-quota/Manifest
index 342d9b5124be..30302f4ec669 100644
--- a/sec-policy/selinux-quota/Manifest
+++ b/sec-policy/selinux-quota/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-quota-2.20140311-r1.ebuild 383 SHA256 37e92e1ec6f669367cf2074e9616d59c8d747ff06dbebd68a1284d4823869c67 SHA512 11dac5e99dacafabcc02380cd179c72f35672fd5ba26b1a1e1c15e237336a6dd92527e0deb8183096b8398924b3e442605629aa9ebbb4f020c43bfbe795f4e8f WHIRLPOOL 77e1a6b1ca408a7d281b786d8234a94b38ce9147526f9434f43f616926c11289789e95e0146e877b08049c64244d04f8125a8184784958d0b917d8a4469c6d57
 EBUILD selinux-quota-2.20140311-r2.ebuild 383 SHA256 a7682655b91c45d461821004a754b17774842f743bcd648ea3459e66f65bf378 SHA512 89b5ef281ef105742cb267026c6fdd1903a47f3c9d534e016505da905d7246e93cc118bc95fdec85787c94c38a6ab7fc305ce0414df749995ed3291f59c48af5 WHIRLPOOL c85ee3aef20da800da449dc311047408db3dc8af1f91880b7e6418d50bf82299943fb27adcb01e0989dbfeeff96249d881b35bcb8719c04cc1649981c198ba6c
 EBUILD selinux-quota-2.20140311-r3.ebuild 383 SHA256 0d4154947c00bc6e1bd23920641dd4918498c4ba0c1f95c95af60cb00c4fed99 SHA512 7aebed955ffa898b3f31bfb993829a002b1e4a156a805fee55439b3a12f3f120986e3293c13ccedbc2d922b33d57e9cbef732032017067e5f9edbf78fa61dc01 WHIRLPOOL a18a75a83470d56845e6d7407e836740a04ba95e1aa44f2eca4ebe8270d705de0908d27081f0a9de5562d70f64a0a01db46431636c37a3187145680b89d8a336
 EBUILD selinux-quota-2.20140311-r4.ebuild 385 SHA256 031ecacdbe34261c272338ab076e757857e7ad7e58acb784be0ba8d91e84a0f8 SHA512 8e855c2c7abe0c24369c4ab3ea9ff634b7a405ac43bc20dc926b3271cce06b448b93b05fa81b57f8427e5574496141f9e284b872d9d3c74e227028923e94c26d WHIRLPOOL 9be98f1abac6ae69ba1ef8a5d35147a370bd5e95dd6304c3dd1a62b81c30da7e5a6cc9abfcc6da8a7ef4587548858e80becdc9ade7e99c7ecf461a852ca092d9
+EBUILD selinux-quota-2.20140311-r5.ebuild 361 SHA256 9eae0c09f97340d7c9259ae0a0ad8e146f271a0a5709e6c90173700108bd3a1f SHA512 178a495445623eaa2af4644f0e526fc0d1595bb4963ed2ab1eef45ac7507dc3b1448b7c50bf5fb5104a6ff42b6cb155f56b0c3c54ecc181acfd2309bc5fe126b WHIRLPOOL 42bff618454fc85791a7cdaa14e3b05ab8c1dd8ce6b6a946add82968e3af76719f1d2374cfdced85859574237d2b1a531bbbf664f76568f03923b6c0d49cd712
 EBUILD selinux-quota-9999.ebuild 341 SHA256 ad21d3327f7630239bc7b1c9f63c6f6cc3b79ae87cdba928f115c8cef6e677a0 SHA512 c75b18d47e670db81bb4c443ab0f83763fd06329115591d9dd5a5870dda7c88def3246fd6bad1190abb5427b59f0c032474b4569153becda08d29c825d16a0bb WHIRLPOOL 3c3c77ccd8370681255190ece4a953b1b5cbdd5cff6c108062a85bb99a684d3abec9bd99b75600a12eae5953f2497e0880f4528a9d8aad57b928c90dbc9182fe
-MISC ChangeLog 6436 SHA256 681f7d76a8519ea48abc82473e66e52f65cb508c100e1b32701075b2feea7094 SHA512 5558b856016b9ebeeb2dcb8cd0399f862754a183112a41662b1e55c8cbe16e85c71fd7615146b541df9afff2dd1b753d02a45b63353ef9fe5a4e99d546607f96 WHIRLPOOL 4054e93cd5afcb9222124791455fc8b8e2f23e878a0a0f49b0b6b2c766173c3d6070ee4eb8949c39501d8c9d96ce138f4a34e342fb5007604664a796c0dbe492
+MISC ChangeLog 6626 SHA256 8c055f2460a45d671e84a832043d7224d15ce6ec1236af93a58e2871de06262e SHA512 e4142f45dbd71ba7484bef43561eab45206a462e9d75aab00704e2178c341706620f6d3ed46403fe5800c15d4d66cc8793a556f5e7c82edae29457439f28d666 WHIRLPOOL 486d59d3f659c4d3d8dc60fa2791b67ccc72c9f873becfa42e47a8ea52def41734b1494b120009e8e97b592dbcc267cc0c4d165257d807a5aef219ef00b51147
 MISC metadata.xml 229 SHA256 7b09fae92cc9c5254a668c7de7012049d21f3a4f99e14a4718e9ac2ad7ad6f87 SHA512 6d8d735f36a60def370ab65a8126784622d41964ba67b020edf6b950de2b5fcfaad01da7ef4d907a838b8543577caf3166c8ecfde1920e5a99a96ef888160496 WHIRLPOOL 903195430b79891a2b1f802e7a584b4df37768f980bcb07212bf1a1dd32335949715cafc8e705f2f5e1187aa13c465e8d8dab6b34247b706d202f6c315a50209
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0
 
-iQIcBAEBCAAGBQJT5RySAAoJEC7dUkA7aK9HzbQQAKcRLohXkYEOYTmSuMyjD+po
-y8k4pmymg3KPH9sPdFLIwxYQ1LF6zwyWyKwtTVvCBTejrpvXY54+cKLy1UY6cRya
-zZSd9NO67drpP7D1VKJcee57iN4mDOGDj4IdY4tQlsNAZdyDC7yibrPAbqietpRW
-44Z/PirRMoLlzP2UcK/V2qjyliQKYXKAlqMofXhxbwJL1c5vYhW21vO2sdK54AKy
-S4wq9MhWPly66H3xt7QspdRwM2/4d3JQhsCDcfaJBfiTpGgWFTkRnjohCUxnCOcS
-Z2EpBjfdVGnYAZ/xDikLRN8ifqnx7dtKAnRkE/7QGjWOytLng3FZ1huBUz0s5IM4
-gqzmoPFhcyrEWdM1enRjl/tRnwsFNGht1rdRbCqIJnccH2A7hIez9ZHBolqizuS+
-5xXLBpsYa9A0Puy3GeOz9tMgVTAkixlLh03OIWUvVcIkBZs3eXpsUJ4xfjCiQ6Pc
-T2Y8F8hyq7p1tJ/ZpzLp0VSthfe1YaNrvAlSMlPvxIfJ5Us0Y2A1v8MSAeQ1aiDF
-hVrNJRGsuoFf+vcrRqXtNZwnrUmyK61ZeDtrXKtnMK0jbPWDa427peQrm5QuXCwj
-Em7xy/sAkLXi98X/fFdJ+UN5OngMpJTgsJe0cPc+FNwxCOKJqxEZF/5w/A61Vwtl
-kQ3X/W2ulEp5OsNo+nTt
-=qi8J
+iQIcBAEBCAAGBQJT5nhnAAoJEC7dUkA7aK9HCLYP/2J/m8trJYs82VqfeC/qmHFt
+rpNbkniM6ntQmW/K2Kj94scSzvb5dsatidJuMvul9B7LrP2vPK+J2zv1iQvEQRQ+
+OLchEOzbQe1eIm/vZAKLgZmwVOJktd17mBP7RINPnR0qIV15imizUTTNMSK9Nyoy
+fS5hDdcl/baTtoHlHLGFp3waX5mQYvrTbW+YOYlurK5YLEVrZMhNIBxcwwmq4Pei
+6rcA7lXjCyRDtqdBbMnOn7huDzRxUhRBRoysWRiPusA6L2ApixAGabDsv+fyELNt
+P86u/3oecDJdTuo45hW3xSETsrlAI2spdNUwDRE7Ah6Qf1LKftPVSqf4jkVYRi3E
+2LqL6fLN0IaitmkpnGhqPuN7XJxpM3ecJWUfPS92nXFw0rrZ4yPSGxnGXnzrqMBR
+VYYrC74TLD9zAnW+9v0SFu1v92/CxYS/uTXpDm4R1ddNC9Axgo1z00JvZTBHeOnZ
+NUfvwI+JbmXlRuKf3pUjgK5O+dy7OcdzPkWWwsKAB/EqlOyjLibhJBN/ceDiiTxp
+tG2TvQMZWTc88D+3/eVjNYRGQoVxtyNgs16gh6Etv3o0xQJqTlrmp07T+Qm+9Liv
+avyCZmPIJD8F3pE5QNG6vJud3FjG7NjsjcG5oHi9GW07zT1drqHEYkZlNMrcwvbJ
+f3ABZYAdfG51ISUjx+QK
+=XirM
 -----END PGP SIGNATURE-----
diff --git a/sec-policy/selinux-quota/selinux-quota-2.20140311-r5.ebuild b/sec-policy/selinux-quota/selinux-quota-2.20140311-r5.ebuild
new file mode 100644
index 000000000000..bb6fb54aef50
--- /dev/null
+++ b/sec-policy/selinux-quota/selinux-quota-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-quota/selinux-quota-2.20140311-r5.ebuild,v 1.1 2014/08/09 19:34:12 swift Exp $
+EAPI="5"
+
+IUSE=""
+MODS="quota"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for quota"
+
+KEYWORDS="~amd64 ~x86"
diff --git a/sec-policy/selinux-radius/ChangeLog b/sec-policy/selinux-radius/ChangeLog
index d666a2c9b128..d1b2b3f7b50e 100644
--- a/sec-policy/selinux-radius/ChangeLog
+++ b/sec-policy/selinux-radius/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sec-policy/selinux-radius
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-radius/ChangeLog,v 1.42 2014/08/08 18:50:07 swift Exp $
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-radius/ChangeLog,v 1.43 2014/08/09 19:34:27 swift Exp $
+
+*selinux-radius-2.20140311-r5 (09 Aug 2014)
+
+  09 Aug 2014; Sven Vermeulen <swift@gentoo.org>
+  +selinux-radius-2.20140311-r5.ebuild:
+  Bump towards r5 (fixes duplicate context for hiawatha)
 
   08 Aug 2014; Sven Vermeulen <swift@gentoo.org> selinux-radius-9999.ebuild:
   Make 9999 ebuilds EAPI=5 and transform to make master for version bumps
diff --git a/sec-policy/selinux-radius/Manifest b/sec-policy/selinux-radius/Manifest
index 07800a11d5b7..fd9ae5c4d54b 100644
--- a/sec-policy/selinux-radius/Manifest
+++ b/sec-policy/selinux-radius/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-radius-2.20140311-r1.ebuild 387 SHA256 3aa3650a5e26731afcd15fbdcce1752d9250002ba70aef6d44245f94e976b77b SHA512 0994c75a5fbb74673b6f5e9dae7634ccf314d05a0a4a043a12b18fb570fbc47060c5d8db4badfa5b83a7bfe41998238a3b72ac96aedc695fd575825c986417b0 WHIRLPOOL 05b37a71e9561dee2ac7144ed2fc756e66d4ec1c231fcb9acef5492aae27e0be0ce153bd883669cfe921e47e44b0ae542e3f2636a1ca3e15ba66c09fb3da9240
 EBUILD selinux-radius-2.20140311-r2.ebuild 387 SHA256 4facb6179fcfd39b23ec6fa7ef2f20a774f5d5f891401689d054aff11ca26989 SHA512 ab84840f57f875fe6e61ba5c9e91ba7e6695b5fad9d671be1e2b4755a4fbefa764ef944dd538c7f851344abb4b10db5a80c5faa4965f8419dc5e096cb723d96a WHIRLPOOL 776402340aadac468f22d2a6b785f9973eafeecfa8b4011948bda0c0f05628f28dac0f4992f92255efaa9c5ab8dd35dc99d828a2bce8edbc148affa1b728d94d
 EBUILD selinux-radius-2.20140311-r3.ebuild 387 SHA256 840d00e671608b137637f03eb61c0ae0e80ca6a422600e8cb04118088d695afe SHA512 0043cf6534f009c8b9f18b00518c247d40f8e4954b3f7353473bf2adbd59d9f4efb84f8ad152e1062f153e2dbd39e7d040964809d770407a8f44836ce60468a3 WHIRLPOOL fb5a521fb302ba6a15b8a725057b680779a10bf35e0ccaeffc6cd806b51782c94045ae82df0fbd9ae6568eafecb706f07c6f1e951d74b29c3337b7b1f6ecb003
 EBUILD selinux-radius-2.20140311-r4.ebuild 389 SHA256 29bfe8075dcd733397912b2278e7e65478f9d871b3699ebc192a5b1a68ebc493 SHA512 39f356f6dcac636b7ae76a4d69828c6bd5a8fd10deb7c180c552d993c4fb85333801f72652834526627c27d789aadc5a3bdc8a5c013faab21cb59f2e484f239a WHIRLPOOL e8fcfa5f081cb4dd1bfe46becc6144e4f2163a941883a30622951ffda1ee88996ee68ac8410371d7d12e3a92b89e4f460e317453d16b2e1348aad8d90d1ca5f2
+EBUILD selinux-radius-2.20140311-r5.ebuild 365 SHA256 51ffbb0ac03972000503031de61772e883c2c982729b7a79321718ffdbafa9ad SHA512 02ac6be097dd7c03ae4f639b43169b62951c107092d9ac3414444e177ca42cf3e83caed85388a670963c7fd74e67300b2593f8bd975ec26da00010169907bb2b WHIRLPOOL fdafedc24a7d3d9fed9e301b70ac07be6c43f1caedfc1661facccad6fa2af5bffa6e53affb6c0e27233993155ac6c142dfb87c15f43650d2257cf51267bdac1b
 EBUILD selinux-radius-9999.ebuild 345 SHA256 5513f4ddd87deae15f3b3b89ddd4f0f0b896fb130cbeadb0110315229d6dbf11 SHA512 03c17d203d11a08dd7b925b622be5ab2f5cd6268179c56f95ec106f9b98448071dee49fcaac85864c6f01212c3aa27d8b21ddb0f3686b882ae07d026fdac2ea4 WHIRLPOOL 38bef989c8e2da2ab53d0376bac98d891d2110a51bcac40d31581ad174c1a8066cf236779ada8299bf974e5c161429fa6148c5030ddc38ecb571262c5a8cf768
-MISC ChangeLog 6511 SHA256 20a7ccbeb8ad415cf07db58c885fc6412662ccb314e5f6b9cad765dbbff07d4b SHA512 d83850afdcea4df9587ed21d9a072259a57f9a33da675181957ac26e0a7889cd2d954b5df2177bbee1fd740260278a32fdc9f48ab406997412b2346107b43e87 WHIRLPOOL 3e06435448ae713818466083c11388da81c99591299e8b8c0d7165ab37e5f26c5a26b6670a1cbf8cc5fba48e60b4ec444c5daf8c2820e45487c448989f50acc7
+MISC ChangeLog 6703 SHA256 e94978106f74668da40ca965c8bcdaa257710c0eb2e628f28e4a9b85b2855375 SHA512 abd2eb18be3ead04440f683577404dae71abc7812eb310d4094e253bba823fd451d8c23bc69c0916b883690aaa9ac923ea5fc786d5ab23de269bca456792df78 WHIRLPOOL c54cbd1e0c2b60f46b8ecd22a77b86980a294d0efb1e02827d1ab81053596a8273c5680c24954958ed00be923dba2be392a8db7f7a2e6a28f8eb3f1a6a19311b
 MISC metadata.xml 230 SHA256 5384bdfb55580f3714817ea97b02b46f0b161720b95553631a221a819000610c SHA512 7dfb81d689e382a7c342bcdf2b04e02e75e428a001d43b1d807cd2a31d8cad5e9c000c45b8f6c3744ffd43e429f838cee1f0f524cd78b9078d958282069b7ed1 WHIRLPOOL 59b518f8fe04829419e4f0b0681bd4fda4258d5d7c3c5f4c419eb0763435f8848adfd1761dbd41d05054acce8956f321d58b2ea908c4ed54240ce954a1d9d2df
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0
 
-iQIcBAEBCAAGBQJT5RySAAoJEC7dUkA7aK9HO/wP/1jmCfLNLSvV4yMlE4OdW130
-6XQTwSbLOGFWOTdnpMgobEvpPNNJEKe21/G2TSP7NISx+zUcyNikOmffrMD0E5hN
-i2Fo5zmISobEL6VkAXFmqQ57wSpT2ekZCKZuhs4VBIqQZFxq1BPRIfMc44G+6DVb
-97SSAQueWI3JB/lZ1So5zV8vDzt1uzDzGKIs/9f4DzaZDhG/p3G/3eO57AOcox+K
-BXta9Yw9rlrlS5eKZABMe3d0VLx64T7Fy8Yn9ZEMUrsgFLLILMF/Cd62TVYiBjkN
-mZBA+IkdznqEbTNZ2gqbh6DpIR6si/itF3D19FMMFROzCCoN/Wc/QDbDqqPR6X2D
-ThRTZbtsBIdm3FzTIWt+GB1EP5yPT4MO4snvxSS5VAesjDUyrhiaAVaMAiP8a7Yw
-dgH1VKzCJx8uX8x/E9muxpXeJFgZP6q0f7xqoq2ah43KVGdibYThjp+S7syRTZK9
-hH5c5e+sphgMAQZu3ukb99eI171SaVsF+zoXEbFvzI4pfxDip5zJBA/qSQAelein
-UD/KAlSNprhKTutjyKpMZiC1U6Yk8HMBEuIUmlDhDsxazcwNWaWHaveJHyGsy15p
-go9CGdGK6vzb5ocIjvUZ7gsUc+yOSIOq6ROmUCV9AS1oKG1KjbdKVF+0wetykpzV
-xnN1fyANwKN3olzExK9o
-=ODIU
+iQIcBAEBCAAGBQJT5nhnAAoJEC7dUkA7aK9Hk7oP/3UvTFePPlEgxuyGF+bZy6PG
+RbAIQDOfHei/2f8V7I2+sxZM7jWj12XvijHr+Ry1ROQHUPOWbSc47XTDnbNGTszz
+xHNUO6/qPVQf/zs5NPS3LJd6ZdDRuUf7NgakjkBwbLpR0EnuD5CgGL3iczSZNl+b
+e9cw3XCYZKVkoAL58YyaoA0AWn0c/PDIeTbUrv0bFBYGhw54A9uWUxI8Q39NB43O
+TbjxjteD5UnKkpxKI3vOU6XBip4w4/UKSmtWBJlNeR5qyDQO/f/kB++OEd9RZ90C
+iCD6C6kl+I4pphhgMbC5vjPlQhlFJhEh2ZyTPZMp9drfp0Qwf/Uwhu2XjLBtaM6t
+rriFg4x4Yhm5Z1vwJAiSvQMlNTEVw30FLn10tTXK5IxKsKnbpBkf/vmji3Fuvd+L
+KUXZprVUiKDS7rMzB1b+ETRdiITXrIhZzs4Goskm7mk/ZUCeoRTA5mIbkY1EdB4/
+yakIv6uQWbxhhnjEygh9FOG83yCfoTj2VLExWgBXiyC/5AhVvX5GfBsxpz/vG9iq
+31Ev/wRnLpbTCadBqNNiqd0bo2PEFTRLdFDKlsN/uaGmyiYztMExoVlHsZUfGz81
+eWLb1OHzkQ2iozPh7XODy2/6KZ4dbFaWgucv4kZSzziuSSA/ovlzHwf6RPQQs7Sj
+CvX0PUF9mq2ZNiSPSHke
+=djNu
 -----END PGP SIGNATURE-----
diff --git a/sec-policy/selinux-radius/selinux-radius-2.20140311-r5.ebuild b/sec-policy/selinux-radius/selinux-radius-2.20140311-r5.ebuild
new file mode 100644
index 000000000000..91a366041242
--- /dev/null
+++ b/sec-policy/selinux-radius/selinux-radius-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-radius/selinux-radius-2.20140311-r5.ebuild,v 1.1 2014/08/09 19:34:27 swift Exp $
+EAPI="5"
+
+IUSE=""
+MODS="radius"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for radius"
+
+KEYWORDS="~amd64 ~x86"
diff --git a/sec-policy/selinux-radvd/ChangeLog b/sec-policy/selinux-radvd/ChangeLog
index 0d5aaa54b0ee..30c3a87d59e1 100644
--- a/sec-policy/selinux-radvd/ChangeLog
+++ b/sec-policy/selinux-radvd/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sec-policy/selinux-radvd
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-radvd/ChangeLog,v 1.42 2014/08/08 18:49:55 swift Exp $
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-radvd/ChangeLog,v 1.43 2014/08/09 19:34:26 swift Exp $
+
+*selinux-radvd-2.20140311-r5 (09 Aug 2014)
+
+  09 Aug 2014; Sven Vermeulen <swift@gentoo.org>
+  +selinux-radvd-2.20140311-r5.ebuild:
+  Bump towards r5 (fixes duplicate context for hiawatha)
 
   08 Aug 2014; Sven Vermeulen <swift@gentoo.org> selinux-radvd-9999.ebuild:
   Make 9999 ebuilds EAPI=5 and transform to make master for version bumps
diff --git a/sec-policy/selinux-radvd/Manifest b/sec-policy/selinux-radvd/Manifest
index 5e609d12d8ce..90c587ae47af 100644
--- a/sec-policy/selinux-radvd/Manifest
+++ b/sec-policy/selinux-radvd/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-radvd-2.20140311-r1.ebuild 383 SHA256 6f88b06608369e1928ce2c8fa476b6fdef8068dac33867deee211e370cec16f2 SHA512 cbaecd613a9f37fecb0deb59405078edf64fca20d0297e3aeb5414b43e10db856d4bc477575ef16f9946a4f1288af4d617e53922c82fba2a3615e7c0bdd807c8 WHIRLPOOL f12ccdfb870dd385a95d660807ec90cf4a8da7ef82804fe5af9019ae7ebf356c0665667c4433878805a3dcb33c0345f59b08332889636c830a2876a40772775e
 EBUILD selinux-radvd-2.20140311-r2.ebuild 383 SHA256 cb38608f51035cb89185dbd4788d1b9042f3cb810fdb17ed18079f3e6afbee2e SHA512 8f355d95aa6291713743d73ab02b7bd3372fca34df06394886d0b0a4bf0d0aaa21d60354607fb956fc3d9d83e2d76a4a22f1c8f434768747e35988d0e5d35433 WHIRLPOOL dba2bf4ce8afeb57cf34e44e0eec3afc1f8f4cc227652bdf4b89a8dfbbe21b779f2171224197e4f3eca663e7e0fe93acdadfcbc19d8939f35657dc658d307f78
 EBUILD selinux-radvd-2.20140311-r3.ebuild 383 SHA256 d430066d365aafcc10ca1238c6ca7dd675ddb07224adb23681d4f68af600236a SHA512 26bbc9274e09c99f6471ba1b24642572366d924eae6e4caa6c5052b8b65c2cc4bf468c942626025c8de3a973274883f94cb92a3f90276970643014ff90e7da1c WHIRLPOOL fc91407d0f16e4bd2622af6e0fd8a6d9e03d9cc1b7f8f326980fdfaf209b4401b1dccf23fb28d7488b2d846abfe93524d5d5a20446939d36db35348e6dbeac0d
 EBUILD selinux-radvd-2.20140311-r4.ebuild 385 SHA256 9e4e8bccc23a754d357a0f9e5af57edbfca9bf4344c4d73a776c94e3ebe67b3a SHA512 a7a45e328950128871f056578c62eab7a6e9f111221d2706cd5206a1b0b728dc1f659b68b033e5af7eaf534511b90d9d1f6440fab693379c83ee4545325ab4d0 WHIRLPOOL 79e2de8144981716cb9ecba7b744f1c0bb9b422e173262a545c3c0d1c4611ad1926de545ace3c20ed6d7f5af1b81247a1e01e112813343d079432fd9aac0471d
+EBUILD selinux-radvd-2.20140311-r5.ebuild 361 SHA256 239dffa3e481ea7e04f152c5d7ff4289e7f26f9cab52a6b823d26b0819e8ca0f SHA512 da8a968ca5eddbdbc81cc49d6edb8e052d1e5bca231a73ce737cff28ae1ab206bdf791405c936c6037f1d5cafb3d2b21914be7ed3338257eea392a8bac643e8e WHIRLPOOL 22af0d794ce49751a9100358b72c1de3d05bec7bcc06c7d620bdfa09264b34bdd6838948bd0ce53dfa486738e06a04ee3745f52b6e090ecb40b93281d9081aa6
 EBUILD selinux-radvd-9999.ebuild 341 SHA256 c2ede88ca6d94cedad17a3e99216e1f9723bd10ebefed938a0e70868dc7a84f5 SHA512 1aebb35a113c340bb585a94884c6ff0682aadb7e823db91d5b30e81bfcc4474e5bbe76fcadb52470ee3d45ca3716fc222be739d93cbbc50d73d808385c9115b0 WHIRLPOOL 8ebd053e7106ba09b8b9c8b2948782afef92dec65d83ff8921fe349d0af7fcdee2e7c68dc170adc61c4d382b905bc3b1baef867d014ae823b0d73429ae2a81d8
-MISC ChangeLog 6436 SHA256 6cea567effbed77d1009ce8380216b11343df9885efd99a5c3dfe40b7c449680 SHA512 3017e4c9d2ddeb3f102f42beac25f4cbcaf007bf9be7ede4235d6aea9a33ea3c03fde0e2e40e3ea922c310f5ea07cff3d69e85ffc347a83dde19b252e4de088f WHIRLPOOL 3e1334f8b469d7c181109cae5c2b2df9e148ffaa8a646ed65177d33dbc0b8f878404fd0e970fdc33da7486f313bd3471809b7480bb26d9a47af10559c1980aa6
+MISC ChangeLog 6626 SHA256 9534b7a102c7e03513b264ad06120b234bf1aff246126b83d7ce0b0b64800d6e SHA512 f7e6bfca8103414ff3f51052ee6279d96120c8dc95569d27beeebd05cc14961eda6caedf7e34b19da45f38712fbe763caedd48fb2b2e54cab2cb9ace75abefb2 WHIRLPOOL 1f668b437b3c77dfe8a2416b2f789381b7118fc10cbbef871c7e0f81c7e025c9842108312a423972dafd4ea15054bca84619e04edefb72044a9382bb456461fb
 MISC metadata.xml 229 SHA256 3f99159311e4dc20ca98dcfbe0221a53e9b34a234b98187f0fa62ee933581237 SHA512 46e6c6f3d4ba27bc4f0e9a77ec8af0af33769aacd81868fae8f1664e4c43b955eee67816930dfa69af04ac99d9524733efb323916140fa87dff31abbcdb3fd26 WHIRLPOOL 8b65d64a04a73540aabbcbfb24904e037f25dee303e29a8a822dbe811f00f1614a7ac54c27408407907d751ff08c4f78791cf05e79e897fe5397fae77a7cf077
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0
 
-iQIcBAEBCAAGBQJT5RySAAoJEC7dUkA7aK9HXnQP/1GRdo8Abe4YPePPplST+WmX
-/LffhdxM7/JfP/aqfSmnLU2jw0vAtW52UoNeQ1oZKxIppLxILO5iTtnXwLswVgr+
-RdcTz0KJeCg+jeAUxQshZRuVqNJ6e8hH8oqS76erKjnW+CzrH4Ck43WIJGEPQD/b
-C6RC0lZMN04a4hvl7E8GZPUtzoK5kra1CA/LHCe69R7lK692QXLSVuLBqq6J3Cwi
-YwjKHAG5XtFSSKKgjtsaoXFM9Xi9y2nH+NoOI7cQF7u+oaNt1KzOMlI3NvS0XFUG
-t1u8PUsvPo9sSotBKFRbf7D1HLhgrKAbpAlhkzoj0yPV/zrMaK/nW7gnuFbYLQ5G
-ZK3+59PX0innd5rYggoqcSvUnD88djhqT7L/TSBiPb0RyzBszYklQTq6eOzla7nJ
-MBrUz1EwvtsYja/VEL6I6NDf9MLH5SiCtEsK61oJzJNREad8NH83ObsgyWGnJXuX
-qb1ysedMl+UHd+88/iAclnIaqqIKw0FwYWyR0xb5K6qmVZvlZX+26M4W0QLQ+4R3
-FgASrlZ1X8erBGgzsopoHQIdrYpb9PNIVmbS54teHwYIsoov1SapjtZXl5L7aUSt
-znh7FTYptMpZVlSJ3rMqbP4B5hnQtfTDMy1D19rkvLgHDSJJMXLTlg633mU2dVDU
-nMT5Zw9+PKnWpHdFoSmT
-=SIpw
+iQIcBAEBCAAGBQJT5nhnAAoJEC7dUkA7aK9Hn5cP/37WIHWZ1jkz4IXVH/RmtVmr
+zyFm1axHWd97Ea/ShPDAOkd9Fe9L9YUsf2cKZ09uyxu1H0gUFEnI/A3dbZ9PAs5d
+JbYoCwLN3Nz1X6azvPWHDAetzBkU3sDdwGg8zNfn9+qkHIZo6LtidjHC2yvwGlys
+m7A9vip1wo9/I2OFpqXFkUyVu4niSzvWek81HIC+giJb3EagcMspta0LMzfQbiRq
+1Uv8puKkqNy/SQLC74PkjbY9MQBBxoSK/BnsIG1+CF7lxj7u12v6IG9n3JASIEOs
+7UK2kNQJ6NR3mYHXKodke3tOg2ud5a8fu8whjnxSuf+Rf3BxgYx/bGi6zZGurP7U
+/ByaIu+4MZ+0A2LLezf+mOBzzWtTaJ8rpkDAFqa8fbDE51KxTNgwgulSgibZqzVR
+wbUYkvyPtySZeuhlMYRd7daXlsiDvGXwVR8QzxsKGM+JNqbIUIRtDKFjmbKpiOrd
+HRCUpAbBB1EiS9M1iGLm7hitknyMOqdRDkHepZfyQgYF1om49dIV9DglJN6mIu5T
+CZWFGwtlQHnnmSqVnKQfeUQzpdMSnrRDZQz6g71KWZDaTFYFjyY8CTvQ9aQ0pAz7
+j99mQu/u6AXiyvtjvxmtTahmdrG0uRhs4z9HrHUZnzw0PC79C6uCeSNAmqec1zIj
+/R6gnRAwJw3qoUts7kBa
+=WWbw
 -----END PGP SIGNATURE-----
diff --git a/sec-policy/selinux-radvd/selinux-radvd-2.20140311-r5.ebuild b/sec-policy/selinux-radvd/selinux-radvd-2.20140311-r5.ebuild
new file mode 100644
index 000000000000..c21c8dafd0e6
--- /dev/null
+++ b/sec-policy/selinux-radvd/selinux-radvd-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-radvd/selinux-radvd-2.20140311-r5.ebuild,v 1.1 2014/08/09 19:34:26 swift Exp $
+EAPI="5"
+
+IUSE=""
+MODS="radvd"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for radvd"
+
+KEYWORDS="~amd64 ~x86"
diff --git a/sec-policy/selinux-razor/ChangeLog b/sec-policy/selinux-razor/ChangeLog
index 5e43beaf860a..4e53c43585dd 100644
--- a/sec-policy/selinux-razor/ChangeLog
+++ b/sec-policy/selinux-razor/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sec-policy/selinux-razor
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-razor/ChangeLog,v 1.51 2014/08/08 18:49:33 swift Exp $
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-razor/ChangeLog,v 1.52 2014/08/09 19:34:32 swift Exp $
+
+*selinux-razor-2.20140311-r5 (09 Aug 2014)
+
+  09 Aug 2014; Sven Vermeulen <swift@gentoo.org>
+  +selinux-razor-2.20140311-r5.ebuild:
+  Bump towards r5 (fixes duplicate context for hiawatha)
 
   08 Aug 2014; Sven Vermeulen <swift@gentoo.org> selinux-razor-9999.ebuild:
   Make 9999 ebuilds EAPI=5 and transform to make master for version bumps
diff --git a/sec-policy/selinux-razor/Manifest b/sec-policy/selinux-razor/Manifest
index 8ca785c23477..f5987531aad9 100644
--- a/sec-policy/selinux-razor/Manifest
+++ b/sec-policy/selinux-razor/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-razor-2.20140311-r1.ebuild 383 SHA256 30772609d28dfaf84aa3f0c1245ef019a14b9d0d2ac58f9a5c2db4a14603cc86 SHA512 28c3856609b1b17abc18454adb44b0cf732249c9ae4cccf3883299a272c6a71ee6b1b4cdb9d3a92c29cb04a9138064b50f40ef5719901672616f81e332fddcdb WHIRLPOOL 843aaf959b5aa31bc59e99184e9d5fd3d8fd552484bf4a3d00bd30ca6b3c10023bb03d72e5c1824b99abcee8563286abdef2296ecccbabe0ea692a0dca945b4c
 EBUILD selinux-razor-2.20140311-r2.ebuild 383 SHA256 8665fe155b5053c8cd31559262139bbd90a1e19bcface6b4c3d92cf4556a20ce SHA512 53e01b24b8d13f371a519c91b99ffde3c02aff6afd072651ad9087382121ac29ac651aa448c25de4fc3d45cbb6fa7d829fa60eed50d18c2adcb6452005b1c069 WHIRLPOOL 716045d324465283909813e3d9f6fcfa22902ee6172ee76a8f7854a06fde491a74949183a0c9351c6182aa1f33fb06b22be3febb68f285d448a9413f91ee6589
 EBUILD selinux-razor-2.20140311-r3.ebuild 383 SHA256 9da54a2ebaff5fc6271688c53eab6a0a208ae61d155ecbab8f871dbc794cf5c7 SHA512 c9dfdea209460c52e5ea95652271710a39ec99d5331677744833895f12aeb96c80c09ff7680ce8991e12151e4d2aeea028b88f4a12fbb4c7a48b5235267866ad WHIRLPOOL 81523dba39fc3ea6847780281c14cfba755d88584e53cc4392cf1300b48adf64749697aaedb25d8d50fb58ea24d54a90308046a707e6eed7c1d407aee84194b9
 EBUILD selinux-razor-2.20140311-r4.ebuild 385 SHA256 4652caa07294bc8be4e9a141a4b4a2e1efb2ee9e01794a681a9c785f4e9f4aca SHA512 c23e43b57c884acdf4f5e48483250833b4499c7eaf068ad11028abd7207295bab57b623f0b8ffc550f55a45f506c8252f64cbc67ca520792d64f905d8ce66ea4 WHIRLPOOL 2435d9356cf306810aef88eb74ddf6dba29eb2cc20ca7756ccc29897e54c7407911e9a661fe05837d1a5c931ab3849cc1710d7ce7383ab2d3b19ca97d75d343c
+EBUILD selinux-razor-2.20140311-r5.ebuild 361 SHA256 e165629493a84710278aecddcd9fd65de59d4937a9cfae5cc0bfbd3ee84e6ef3 SHA512 b31d0d3ff60dab8981d1a41a5adfd26ede3598e02828cacf467381d0a1acb0bfb170d69853a36e444b4392f1ce76e772369c90765106b863a49ea6cd9c850b3e WHIRLPOOL 7adb88235247a99ddf9825e2d1b31355328f1c6fb71001a4e48b77dab9f07a1493f6f076e9e81d12a842f8c537cd25ba8b67d5a93ad939cddae6e6b30fc82c2c
 EBUILD selinux-razor-9999.ebuild 341 SHA256 65c9f24e3da157ce4f6519fb639631a726b06602c4ae41191b3f3e5c1d311093 SHA512 74b422b210bad9b67591d6be5ae7ff801fe522711799501dc89b36a85c1018a4f190382f848c77c21f945694b1bee62d64fc60f8ab3d6cf7aa3204c071dfb65d WHIRLPOOL a184cc6c7dd89a9e0bc056de398add841251fde1bd83e02de173e26b8f5b76e9b96aac3be8f88ff46a2b19492ad7c51e008e0a0a9b01e63b7bc63b021c326e3d
-MISC ChangeLog 7934 SHA256 79424322d53f563d989d77d51ca4988dfce9c02e1d5ea69db35de6854b09b191 SHA512 270ee9b484fbc02e72f95c0ee8015eff57729147783f0ef1ef0617100f08b69b1615f2ed8b15a66534e15276129da3ec7c0b6dfdeac952a28103d3d5cbb95834 WHIRLPOOL 5f8c94b9cc4800583d7633f9df13be6f220f3b8db22a7c1c72a35d35798c2ad554a7685d997b04dad55c04f9714feb7bb2b38ac72835715e3916df341c6dc32d
+MISC ChangeLog 8124 SHA256 b78ec92cc8cadc439f1efb48da121d8083b558f77d0d1d64678d357f7c258c35 SHA512 9ab3ed2eafa8d9b261a2730dba5a3d38fd05d16317667c9eed79011a152b2ab5d5aa5b6e7ee3a0ca3cf6bf141730f4ffb0f80d74446f8384e403509ee9c02f7c WHIRLPOOL ae4ec25a71928441a0a6287c3e2c4f60efcecdad7bd9b837e6f694e42765ec019f9c60f91fdf53980aad3d9e17fa67a79b622a6ea6faba4f35d59327f0114439
 MISC metadata.xml 229 SHA256 ce6c8ac3d492feda5f2dd6079644e4aa8509d2094ea37cbd7e881ae72581eca5 SHA512 bdd53fd3088cb59b3a493a8f0158f0b27bd913152e7c570e9ff6d9a152fca4fdeba7e94fae61285aa21f427e093511c211a4c6a6ab483cdeb561d12005500b33 WHIRLPOOL 86c10afa90a3c70e271537928d3cca7510d42cffc480a31929ae597b3a53e5f3a66f8a0524c12ca704e19d6e9967a47ff8f630d8416c47a6c8ac8c98723f8e03
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0
 
-iQIcBAEBCAAGBQJT5RyTAAoJEC7dUkA7aK9HGLcP/3+Exb49ABgcUChdBxQ9IM2a
-BrEM/rNncygjdWljvrncVb0iJ1kuht6QOMbXVH/McW6zJgGLCt8p9vM6eBmbTIUK
-Ht5rfMCv/VKTBQi/JDBGXwx5vX1cjJ50mQG/XMhVfE4MKJAVEjjqgOlepENnkPQh
-A8hANCxM30cwuc4fE97eDTof7hvrhN/lbE8aGBkG5jsbzXCKVPZeNkubC20N3C01
-b00KPplnY1Aj2GF8WN7f6umKy3A3F9RdlREaOIKDZpZE9jVoo01XSjWAhAVMKKjS
-ohvRhY6gVCbaAmburlOHmCMG7ILL/r9lFbh0HsyoMQye3xztjvif1cUsuQ88mIMA
-LY+Qr1fmL9XJpfuu1B4fq+xjVWI/WXN+9LLuJ3vEnzdFap2c8P65eGa9bOQpqJ/X
-+1s/07gwlyFhiu7l2kETZICU2PDmqjtLPzHU+0nkI6P4+v/2pzX/+qucr+ds9hro
-PSasBxwI/3pCtjydXuyEnDk0V+HtGD35sLF4G1R/s6eFmBCJjo5+GJwV4v516GUi
-5BoCzVf/cX0gY2SCnpBUuGZCa1FsrmtFb+4ZO41J016GRR58Z/dyGhZtpHo5Zm9I
-DMh+z95LAIXT/dlJ6HZofModx6dJVvvxT6MHUsFhc59XksSEMEu0maLaJtupPsmz
-bE243s9cutBjcJoUgsyp
-=nvHc
+iQIcBAEBCAAGBQJT5nhoAAoJEC7dUkA7aK9HdY0P/3ULVqGlnS9fa/jjt9XyNEP4
+jlYiqGu4xsjL+HcRp/MZ6nYkjJgDVI3H38BjL52DrI/nv42b3mjf9+XQT8JXkzqP
+MHvFICtXyoJ8iL6qtSrX8GBoVnL2E/uXGmyHGsx89f7aWo5ugHAOcGkqg/UwpsUb
+tBEzLgEqku/Q6E3gloBPwcq0KFspQgz5cmtVslNJeHCH7JUAgeW5t1s/o/Gsw2/0
+hb/Hv4Ya+MbjRZQUuhQGM6Zqx9yE3fyU5x+h7hB5G/4DEjFNrDCw/TmNQTmFMUJP
++mbel79KxEk8Fap6zMtP2XSC4tyeoPePp25E3JTuJLD9ZkalBjUY2ko5hxXKgFT2
+mi6uF5fE/iyude3Fg2paFXgKtPMgXqsqjjPt4OnB6L8sTvTfCJwFtcjj/P+ZZfbC
+T7/XCkiZcWMDfV5xig5p4VllKm653/AyLjU5z2W1eDmS42Qrx2sJHBkuB2+/Kn09
+eQNjo/14fFkkP6AuDjG1ZTSWSdnSkr0NIg1zyd6uVjnAEBVIzWZDN+FOhOwpbuq6
+vmGKiixMhroEhFPWI1hQ7x7OTr+yMK2dIHKgmvFmfvWY4GbECzXJjzYhaZjTmSN0
+GcbwotuVeG/2hxlEf7++pfizg/T65Dcf35PYtANK+lq54/Z64hsBF82jf5Wq5nfx
+VXEgdQWXiJy21wZb/Mku
+=qAJz
 -----END PGP SIGNATURE-----
diff --git a/sec-policy/selinux-razor/selinux-razor-2.20140311-r5.ebuild b/sec-policy/selinux-razor/selinux-razor-2.20140311-r5.ebuild
new file mode 100644
index 000000000000..a7fb0b247097
--- /dev/null
+++ b/sec-policy/selinux-razor/selinux-razor-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-razor/selinux-razor-2.20140311-r5.ebuild,v 1.1 2014/08/09 19:34:32 swift Exp $
+EAPI="5"
+
+IUSE=""
+MODS="razor"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for razor"
+
+KEYWORDS="~amd64 ~x86"
diff --git a/sec-policy/selinux-remotelogin/ChangeLog b/sec-policy/selinux-remotelogin/ChangeLog
index 6e30d5d81293..828602c4a8c3 100644
--- a/sec-policy/selinux-remotelogin/ChangeLog
+++ b/sec-policy/selinux-remotelogin/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sec-policy/selinux-remotelogin
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-remotelogin/ChangeLog,v 1.40 2014/08/08 18:50:00 swift Exp $
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-remotelogin/ChangeLog,v 1.41 2014/08/09 19:34:18 swift Exp $
+
+*selinux-remotelogin-2.20140311-r5 (09 Aug 2014)
+
+  09 Aug 2014; Sven Vermeulen <swift@gentoo.org>
+  +selinux-remotelogin-2.20140311-r5.ebuild:
+  Bump towards r5 (fixes duplicate context for hiawatha)
 
   08 Aug 2014; Sven Vermeulen <swift@gentoo.org>
   selinux-remotelogin-9999.ebuild:
diff --git a/sec-policy/selinux-remotelogin/Manifest b/sec-policy/selinux-remotelogin/Manifest
index 41b78d9c5543..db707b0a8a87 100644
--- a/sec-policy/selinux-remotelogin/Manifest
+++ b/sec-policy/selinux-remotelogin/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-remotelogin-2.20140311-r1.ebuild 407 SHA256 93c239775c12bd1cb35a767af54d82be04e81e27d3db64d11830f5eb75d9ddb1 SHA512 311a690e513812181255daef4ab9e1ddc53e83cc00ab7b8a2ba8919350e6ac1d3f52ad02e4d988cfaa2d4c598e5a86f7eb5fa6e21a440948b430613719fe630c WHIRLPOOL 0dfd6dc81bb97ec25d69b3bd4a8b0ebbf858831a9196c41d5d7e4e8a6600191d8e890387e3a01e93b00b9349d233af9eb8a4402f7d57e459e51959823fe37468
 EBUILD selinux-remotelogin-2.20140311-r2.ebuild 407 SHA256 b350ac7342da96518086e477114e3faaa82bfca97574ee27555d48d68343106c SHA512 789ff16126efe210cbe0aa178ce45c8451690c5e65b6157d12cff6d6ec5598c1dce63946b9757fd3e376a472e616895dec1038e9e6575fbb713178efd9b0140b WHIRLPOOL a2c2101192bd02c1ca083126598fb07e3daf7c576f9e50d2f89ee7ec647d10b369fa112c2bb3c9604014a3b4031c1b0b836460e73395da6bfd966ff6a0888172
 EBUILD selinux-remotelogin-2.20140311-r3.ebuild 407 SHA256 ef08818bbdd1e412ee470263b82adf267dabddf9de5f909f46b5ef9c0bbe96c5 SHA512 efbb73a36e998b1a38885cb73017074dbb43fd974d5bb1f564780af2dd1321e1e5916ae3223a9ce4a1a9bae5df533fdb5fe004bb9d81b9f9858d5e3e564aa562 WHIRLPOOL c179c9ffcf85278e79158f48c6438b8cf1d5a96524f8f59c16a3fe19727985ec92d1ae09ddcd3d2118e25831c4a90611767c81db1fb2754e6f58655258647065
 EBUILD selinux-remotelogin-2.20140311-r4.ebuild 409 SHA256 49cef1756c90cd4754b445498ce854e767e36a1c2cd06e16f6e0c0dff1f4962d SHA512 ab1ee2a2e7eff14fafbb43e26d3e63d36b38089894e3765834aa022ec6bbbfbe95fa60766c8a448a243289b9c4edac84ec5b38d9c588eee4216376437f2cf0bf WHIRLPOOL 0ef26f39dc8599fc843f758fb879ddb2d0b7b17d0d9391bc1897d9c2ad1435af464a1818a8989ae83e321c72172a2d0f7e42ccc556e25405d03e680532340426
+EBUILD selinux-remotelogin-2.20140311-r5.ebuild 385 SHA256 a66f774e2808eac7f5b2e45b8b4d83c2fe826b57257d3645202f0f433f472d9a SHA512 16fc8b809ea08dae46bd9f70d4c00cb70dda94711de92f618a6dcfe6379f4b4a8f932474f0256bca38702df6c545bc9068ec2dc0f8359c1a8002e8cfe3978ec3 WHIRLPOOL cb55a38aae597d3af3a21857f4365a12c97e52c3d64445fe39eccedf6e6a9c8c4cc9220ce36ffaf5c46f5995ae8523ae2cf2a403bd5780658ec5c0f298ac27fa
 EBUILD selinux-remotelogin-9999.ebuild 365 SHA256 5075ab3099c057b6e8f6ceb32f85daf3446df64b7dd380c559d81a13092a5e70 SHA512 fc55a416e2687ea3fc923fbbb35fd6d0ada91a975b737669b7cbe8fa659135bb79d19d216efd372fb804bce95ecb2b9a02b977062e8674236fa56245d75a1c4a WHIRLPOOL c0d26abfd0436cf6af8740fdc5015297e85e2632345badcd1a378f1fe8cf8911a19d0d301ce4259ba04c50a311f052a6f53a099a7b01a472f5a84db947a83e2a
-MISC ChangeLog 6641 SHA256 4986ab6fca5e2cbaca2806baf7c64ce23d106aef2e2c5142ca67ecdb3b360673 SHA512 8e872c75d2f31bf43ecc13c37f9d9b08d4719008e92588f75ea1f51e9b6edd97e97646956fe703735335585c416a95608e48f2d94ca86eac3bec5af0eb9cb30b WHIRLPOOL 6e3aa94d39359503b2de679fc4fa4bbf38bb8ccb5cbbdb720669f1f8734240ed89266cf6840a25bc2d5e019fbb7c4daa19e840cf5a61a23cefe7a497594d7a71
+MISC ChangeLog 6843 SHA256 581faaecf79d7d9bccb1cd8096620a34fc1927fc297f34eacd353f791dee1511 SHA512 be90797e46a5a1f8abe85783f945a10f405d73320bfc04bdb18d6008023761b3fb30f25688de475ea9e82eda9500d49b54c8af819112f432c809829081857536 WHIRLPOOL bcc01e7c5dc9f3d8b750e3deb4069632da28411f9c905ff18155b639f9ada42e9f57d4a487370633e7efe02c401753ba46412d13be5d138ccc9840d98aaddcb6
 MISC metadata.xml 235 SHA256 4eee9612ff2b7a2e728de3b61db1c9b37d15c3c6066b16ee0e98de965582baa5 SHA512 b4bbd1da57b98d713caab0e5e77d6ee9bfb9d787f39e5d514e64bee2cc6854a2328b22d8d8eb2f266482a49a588bb9b55e588f1c261390f08716e2fbbfb40b75 WHIRLPOOL 23fdb4216e49f8b1ccb34c604b16ab84679504f7a89e4f40b02e08e5eb382e141f00f906fb9697422d65518b67ebb2fcd765cb5457f9bf686fff58faffb3f4c9
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0
 
-iQIcBAEBCAAGBQJT5RyTAAoJEC7dUkA7aK9HCoEP/iHX/9VAl1LngsBXtARj94+4
-9/IVD29yZNHvou/nRIyrWWOh/BvXjQxESjCILH4B4v+AYedHWKvR7qVe4c7RGDMv
-3hhT+g43l483FVor8I7+HYoPvJTsHwkkQeWi4whEVTfSRmlGjigwFyKxEJVrbLjK
-L39E0sf+u0IiUNWp9CnFaRGry6t6UtvFHX3j9QiUSNcx4pW87nDpHIR02qDF2yM6
-xBerJJlQzqj88iq2iNZ4M8S/G43SUd4U4wwos5yHYavpv6tPiyuJlXA5S6AGMMcA
-eOb0SPTBIajE0Hf7pJ2FJFwLcPlG8X+Rk2Hw1kQ7aft/gpWDQqikZ54qBL8WSvZa
-5V8bxZUrpyobLf3k2Hxy56gdZE3MzB4fnsst9jrl1nwQ4O/Hvj690Hox6eaK+7TH
-4H/Oz/QDLZjhMPziQ4x6xhwnrX07S1DGyxpq7zg5UmPfuvHstodkwguE7naoML8n
-l2ss6jnIbTVPhvPJqyflMPUvl1AxZGUZ0SycTIjNGDD5QiVyCDdtlJWZBZ9dRORk
-M7XUHkbhe323wlevWg1HIq76Nc61qtWhL4hxB6vsleOnk1gD3XSM4ctptfnFXoSm
-WxLCxbX7avugwwL32OEXC4xK2pAh8TK/famg05hRH/xp85Y314COCdsmoN29RcMY
-mnSDV+rTU0uYwlO1nPn8
-=H1be
+iQIcBAEBCAAGBQJT5nhoAAoJEC7dUkA7aK9HWEgP/3LPhAlrXPOTjnLoUiP8PsBR
+LgRe1ObC8JO2pCQDMhDWjvBEkIjMd85I3yL3wVWsSngfKkXw3cSs1LFNQFDzxhQ+
+Enp+/oO6dPeCNjZyLCdKxo33ipb8bM6JCIJ3rA3R9rmDYMY/XR5j5w8BCxlAsoSb
+jJG5sPOZvmJ8P9HU1YgsQBDhqZQ04jQUhRAAS0y3izs5IUvyQ0dgme2R2wbSZXBy
+B7OeiGVfw5nKm2q0Yr6A9fC5gVyDI6JB7wrzKlouQqDEqs0879x6FII813t5FP1g
+7c6GTNiiDWRfDQJ6qwOwJ1JRScXPOk8r9z637mJBHCAbKifs434jFDDAktZGySEH
+TreSTONiu1WXwt10mjdSfQLOwcXZ3G6RDU1vpdV1P4VW5kLHOCLp+2BIJGrSnM+R
+ObM/QtCurJI2HqiTKAcWlYxFX1P91szDDQJN0n81cAx7D0GRoxeXpy2imguR69p5
+xp2L0UdgouZhuUih5tjEB6cUmQ/jcP0BBDdArOjSEtfBdsKsC7jm11L7SFDce5Zi
+N9hEzpKp0KCfusqN3QaGpkKIINm7FrOYCo62wct2duznGLVzntsdIKTJfPwGSv2c
+wI7dWoTty0daEP8udJpwZxfb45Ct+3Ni5y3/9yaN4W/JCm9dtWPsBYSG/icxXivS
+gEOBDQ3FUCsaYFR8wCFg
+=zvjG
 -----END PGP SIGNATURE-----
diff --git a/sec-policy/selinux-remotelogin/selinux-remotelogin-2.20140311-r5.ebuild b/sec-policy/selinux-remotelogin/selinux-remotelogin-2.20140311-r5.ebuild
new file mode 100644
index 000000000000..20a74629321e
--- /dev/null
+++ b/sec-policy/selinux-remotelogin/selinux-remotelogin-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-remotelogin/selinux-remotelogin-2.20140311-r5.ebuild,v 1.1 2014/08/09 19:34:18 swift Exp $
+EAPI="5"
+
+IUSE=""
+MODS="remotelogin"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for remotelogin"
+
+KEYWORDS="~amd64 ~x86"
diff --git a/sec-policy/selinux-resolvconf/ChangeLog b/sec-policy/selinux-resolvconf/ChangeLog
index 39eb577c0f55..25b51d1319dd 100644
--- a/sec-policy/selinux-resolvconf/ChangeLog
+++ b/sec-policy/selinux-resolvconf/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sec-policy/selinux-resolvconf
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-resolvconf/ChangeLog,v 1.3 2014/08/08 18:49:47 swift Exp $
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-resolvconf/ChangeLog,v 1.4 2014/08/09 19:34:16 swift Exp $
+
+*selinux-resolvconf-2.20140311-r5 (09 Aug 2014)
+
+  09 Aug 2014; Sven Vermeulen <swift@gentoo.org>
+  +selinux-resolvconf-2.20140311-r5.ebuild:
+  Bump towards r5 (fixes duplicate context for hiawatha)
 
   08 Aug 2014; Sven Vermeulen <swift@gentoo.org> selinux-resolvconf-9999.ebuild:
   Make 9999 ebuilds EAPI=5 and transform to make master for version bumps
diff --git a/sec-policy/selinux-resolvconf/Manifest b/sec-policy/selinux-resolvconf/Manifest
index b562788ce14a..ac3c20a4710e 100644
--- a/sec-policy/selinux-resolvconf/Manifest
+++ b/sec-policy/selinux-resolvconf/Manifest
@@ -2,25 +2,27 @@
 Hash: SHA256
 
 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-resolvconf-2.20140311-r4.ebuild 405 SHA256 06e2f52b430aff193eb62c425bd3c25fa03957ac50c686686ff57cefeb128f78 SHA512 88eee525018fb6cc9f7453e329c8b09665fa624e215dafff934bb774f5d8e934d4743db75f83a5f89495b7814294d4ed079573dad1902e6be463ac34f10f52cd WHIRLPOOL eccc4daf7c5251be2fe4b98670056931c11a168cdbfd9e3ecd94860edeefa4fb2339bd2a394b475daeb23379b916bf23604fdd75fa5f0c2d1454341f06cf6bc8
+EBUILD selinux-resolvconf-2.20140311-r5.ebuild 381 SHA256 4cda3a2e91852ea4b3e63a4592dd3c39c590f0d3e580f86c2bad78cd6302a4f3 SHA512 6765c7c52050bec0e25a3da616b15b3ea924453d33b14edfe89126a97ea14c2645c8eadfd177683d58f50eb764a92ea04a25271674ad0dbc6db21a74b45a6aa8 WHIRLPOOL 419623424c5dcf99f76df59f03f4161f23de77cc605e8e944d05f3f7004acf37a42ac0b73c955e1d0536d6566b6eb7180ea0ddca13b1d39a10a6cd80c4735305
 EBUILD selinux-resolvconf-9999.ebuild 361 SHA256 ba4b6ace5c9073ef99870dbb8001032a781ba07d3b8e15843310cc55105c865b SHA512 411739a17d9bd8538e12769c8a287d03cb75b9e6fd621842237f2408b253f3ef56f2e67810ee0559a0d76597f220c9c9e3b7e871d7a8f0d5efe004eb602e5c21 WHIRLPOOL 9be21983f9c11a1365931aada300be8aace4d6808f141cd5be5252084b7f2cd1e3e01ab52f3ff73ef60f541200840ae35365d3a5aae062bc995955dbc9603d2b
-MISC ChangeLog 793 SHA256 88a8736b63911816beb60933203fe4ebfec513efbff8860e5c6c03c14e528c2f SHA512 5d12f70187a0146e107115d67eb0c1a0403932e0714b50ddda601eb8893c6bf0907c8804d879e78a738cf93ae749a11e3f3799f84d7d61c9dd3e9ca3cd34a647 WHIRLPOOL bd7afb409447d3f8752ea7cd590dfa83dc3ca283d389f59041f986f9e96cbc2b1e709ee6abdeed03d89f868c9f682fe285055399a0e5718f863605017ce77e7e
+MISC ChangeLog 993 SHA256 4b9934b3d4329f49ca94d0ad2a3ec73744865cf3ea19f56d5627723192b3ffff SHA512 9e0c9b64998fe58ca726bda6918c29fcb5027e0364abd07f0a65c269bb0d09961872cb870030fa5f5d7231c4c8c5931781f7fb9f37aa13651448138876265ec2 WHIRLPOOL 420ba3d96903253e707bd436d1bc4388724d42c4147d9c192aacbac571ddc47ac296a430fcbfbed97821bbd1d61c79600fa9626c82ebae07fd80f1fdfe19222a
 MISC metadata.xml 234 SHA256 f8ce9f4a99e94daeba4ac0ac33b9bbe16160cddf2f7bfbd8f856787f75b3b3f2 SHA512 1958455049a2343698bb0f8b2e91882300a135fd4fe9776ba5e68b1e05c52b0b4f808d8ecb0f221110349e07d495e06c96521b05af1424a501f0e7f9759b5c35 WHIRLPOOL 0325adb91f269f8d99c9fb1e216d438983014cd86d989d45c15c7be9b39504bc46f8dc0c2a3bbeef919c6da39a217745b86a367a7c51ca84829867c734727984
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0
 
-iQIcBAEBCAAGBQJT5RyTAAoJEC7dUkA7aK9HjzMQAKQ0GLhJ+9GQpcdm8WI2PaTP
-FLGjUvdfzGO9D2ScnAXt2OkzdJOSCHB51AFlXvO5Jd7QF9rBW4t2tnA6+dHZMF/A
-I7z27WDLK9i78VzCK6fgIvOHl95CfWa9r7n6gawgByeBERvNN/NuF1kC5WI4n1g1
-X5VEbZX0Cm7M9tHNJVI5QHuXpcgjR6XesomHqmUedDqTGXYgBQK/QtZd99jJ2ZvE
-SA/ejI9+VD12bqVuYxWKLnYx2PQGwLc9er0ooDCrgxR0XWVJ/zpxQmX2uJBouIk2
-JZXusv/SyP60mbcbGjIeEXpjEQrU6BvHwQxrPlVvR1jcl7cQnXzetOlYzjqjhRAe
-WvCrdHJkTrIFZpWj9P94a6rH8cy0ek/+7N1Efx+RSDvtk+JBPPOBHlJt1qJRLs7Z
-Nt/VUscqdcrcg5Bw3SnVtMWSPM7OXT/m//AK31S81ebvkEdHmR6+BNjX+X3zJ786
-DhgYlBW4kLJo/KbfahlYYlZlbx5MiLJMwobecIo7Fo7y+NnayVOLX24nFv0zcCHR
-rQGMHMRp3SCnxr3p8s7tY8bcr7m4NkP3OQZNm/LSvPFEjbE4Jui0PZJWDsgtUnXh
-uXs06yGQ46t527mA2jsrWCv+bmbE31R/eqqhAXNC7WShYnXM/UEHEfcxjhH/x04N
-jPz8oHAM/rLr470qvOPn
-=pdHt
+iQIcBAEBCAAGBQJT5nhpAAoJEC7dUkA7aK9H00cP+QH3qTyomkbDOnl3ni0sFkQ1
+end13NKlEFcUf/6L/uYFeIHneOgGOu1ij46WoVRPQ9GrCT97IMFYkIeGTHButgIh
+FPMOUdkpuFzbRJTHZzOW7dFKt2hIgB8v+m7tyVY3SICuBjM01o/3hZLObPLh4A9w
+7OXrkNSqhfVWupc3pyiTp/7kfuHlojX2Vimo+qOGhTFVuJrbrjM2Tx/kAiqdiH/I
+HKmnqvB0+jW5KOfIauaW5m7fXowjpnX/euIVNVkCt7bwxA04BB0oShIxtbJ0k7Wk
+q2/5MJd6RnBU1ydIVn9jIPgLVsYajnLIIATETqUDCNtPUfk0Zsj9n+H1HqUa4Zde
+Pp33qbIda1fnPi+UNZtSXVACrsw+BCi2jZ8CCed9MIHJXuVv7rRhI4TrJLKiMjED
+3xwS6lVOay6O/sgQAfRPIUVFmnb7K+LIxKEuTnMFPsvo121FG5X1qLKcG7yHbwwC
+sFcVOxx8Ll8TwolumnDVH0k2eq4vofjMroFYZ3FiRiPnIZHqiLRLckwthiWAT4HN
+WxQckktNfSBDwX1wv7vaD12JhAjQOxqpuIDJD0FPrk8XGZKgQB115TvQroxg1dtV
+r2ig4d7nIAH7maDPl84IxvU79jZXp932O4PQUnMoCxqk+ZFWxAsHhQIvYC6iKHBz
+nu2cGNIcFRFz6B+M3sE+
+=hZQ8
 -----END PGP SIGNATURE-----
diff --git a/sec-policy/selinux-resolvconf/selinux-resolvconf-2.20140311-r5.ebuild b/sec-policy/selinux-resolvconf/selinux-resolvconf-2.20140311-r5.ebuild
new file mode 100644
index 000000000000..926bb01d7125
--- /dev/null
+++ b/sec-policy/selinux-resolvconf/selinux-resolvconf-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-resolvconf/selinux-resolvconf-2.20140311-r5.ebuild,v 1.1 2014/08/09 19:34:16 swift Exp $
+EAPI="5"
+
+IUSE=""
+MODS="resolvconf"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for resolvconf"
+
+KEYWORDS="~amd64 ~x86"
diff --git a/sec-policy/selinux-rgmanager/ChangeLog b/sec-policy/selinux-rgmanager/ChangeLog
index 355c70fa43c9..535ae790b383 100644
--- a/sec-policy/selinux-rgmanager/ChangeLog
+++ b/sec-policy/selinux-rgmanager/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sec-policy/selinux-rgmanager
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-rgmanager/ChangeLog,v 1.43 2014/08/08 18:49:32 swift Exp $
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-rgmanager/ChangeLog,v 1.44 2014/08/09 19:34:28 swift Exp $
+
+*selinux-rgmanager-2.20140311-r5 (09 Aug 2014)
+
+  09 Aug 2014; Sven Vermeulen <swift@gentoo.org>
+  +selinux-rgmanager-2.20140311-r5.ebuild:
+  Bump towards r5 (fixes duplicate context for hiawatha)
 
   08 Aug 2014; Sven Vermeulen <swift@gentoo.org> selinux-rgmanager-9999.ebuild:
   Make 9999 ebuilds EAPI=5 and transform to make master for version bumps
diff --git a/sec-policy/selinux-rgmanager/Manifest b/sec-policy/selinux-rgmanager/Manifest
index ff0871c2104a..407b5e42b1ec 100644
--- a/sec-policy/selinux-rgmanager/Manifest
+++ b/sec-policy/selinux-rgmanager/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-rgmanager-2.20140311-r1.ebuild 399 SHA256 f62ff92432e020151f4c3baecdf46bbcc8c3ef71ad6a94a16f1b60399de87885 SHA512 83344a9b19520fde7da28dd85f5208a9f253b2e32cde8c780a37734a4eef7eb1f0ac457877a48faeebfb25a0bb61d6c16caf950e300ee464d953bbd63bcc7845 WHIRLPOOL f6148a9d090f837b566120adf914093edd4b1fa27b3da4685d974275df06a30c8153bd5d3048dc6dcd64453017ea668e154e280ac1e348dcef2cfb1829f557be
 EBUILD selinux-rgmanager-2.20140311-r2.ebuild 399 SHA256 b92d3fa082fc7e66c65302c131b167debf0904ddbe2438139d2687fb71705acb SHA512 90750deaca750b4292eb36743536cffe662fd056e309e7c9d9aae8b5280b629899da20c51ad439a4603424f6fa0827afff045780336e79fcb616b9c40eccc451 WHIRLPOOL c6e75302c752f4535bf85ab50151aca8ebb342542d15b905bf247d755802a3fa0e99bc3e80dcc5a8a7a3201e72407a39ca69003ffbbd09c5442aa3c99283621d
 EBUILD selinux-rgmanager-2.20140311-r3.ebuild 399 SHA256 b8f8e4cd2127b5817e674dff2fa9913d601355a91bd6b49a26ec6117dae085c1 SHA512 b042522457edf3bb746ab28ab85179ff5a112b3e176f29e66af4f26d432af7be14edfd90162b4428987e1344b4e1910d621d86ca6fd78b5437f56357b5a3c59a WHIRLPOOL b9678cda51b3c0195093931bb12df4f2cacd1e2e3d6761b00be6124fa6e07b9e5e00a1a8bd8cb008a0b8ffc9bf859cb17ff562e287369aca7346f1c3e9813ee4
 EBUILD selinux-rgmanager-2.20140311-r4.ebuild 401 SHA256 cabdaea08c30d3c9bfb3269f036d1bdf101b6c3abc3bf3e590f74d2a21e84f3d SHA512 a2d21987e37e689a27047547efa9428d51fa651b8891586a5d092b6e30594a3bcc0327b4c8d0abcf3271020421ac8fa6bd3ffcc5e00dc204f95d5e13976bc4ce WHIRLPOOL de416685a9f4c80cc7ee0aeda3dc19f0a95b8869774d6fbdf92d125425a7e42c22bf0233441a9841c56b6a045d154e0ad34734b060bd7eb0a21dab6899b10a08
+EBUILD selinux-rgmanager-2.20140311-r5.ebuild 377 SHA256 3df58100bd7460e77e7d78fea3314a7ba6715a8cc7800326954e723319527fe6 SHA512 85eea5a00b4af4d6763e42131e42f6440c38cfb76c0c8372f9995287993ab07c018c103adc6d677b6c61c499eea4843d84093538b770fb3223d47cdb5fa5a56f WHIRLPOOL 1212fa8d5c7a722b6c61bc4311597e13729d8c0983999e1abc60d9c100808e6c8e46d36e75631c559ea48806744bfb545d9c8e6d4e22addb5c092918f47c1499
 EBUILD selinux-rgmanager-9999.ebuild 357 SHA256 84356152d6a9000f55c4d82763fa5c07ee2697b70d00a735a4adc48821137af1 SHA512 728e5495565042f8824f019c24d6ecfc5bea748ed3054b3006542a72e96872b95b7b17535d65f6dc51f0ef760b930b9590d5e197f7ad326a3f10ea41f6a85aee WHIRLPOOL 16594f0fa111b5cdc54b69530ce2e1f5759ecb5a111f25e3ee235d62b0e712ac78bbcd9ddccad00ec4c370e317dea388e264a755eafe2dbf939f61f80e8e3eda
-MISC ChangeLog 6949 SHA256 273210586995857add7140f7fbd30498fb19edda6f052cf7aebcaf1a61e7be60 SHA512 58f6f6d336b2716bf2fa1df8a672ec60d78640eb7fee8e69d01388b467be11a3eece79cd33a8d026f91ef5aa8660330bf43fc04b83c8d37d1e004db4d8d83833 WHIRLPOOL 55331637d39d28c2c13de2f7a776fc79a88fb81b744cc32fe8d5bfdfec3e89a903dfdd0753b1d53bba66c8b8f7cf278a513b3bdf4e2382ee061378965bfdb72e
+MISC ChangeLog 7147 SHA256 ec13ad66dbe8e7d4d4e5bbaddc09486d1413ea2638d8bf87ca331db07ff12f00 SHA512 121af18a1bfb8f84f29e05cd16d0610ca2fbe98136a9b31f5539bf18f35c7e09e9bf7b40b350d16f7e72ded8e98300317463ca4836fe0d3a91190d3d9c7b57f8 WHIRLPOOL 863ea714c996acf49751d957fc225ab354f5d5a99932a54fb2cdda95264680d55a3e555885f754666fc40bd56135feadf73fad03e97f61226f9d498b858c3729
 MISC metadata.xml 233 SHA256 53a372db7c97db353b4d1f756ba4bb9ef3c0c185226b1b5ab55d2bab1503a16d SHA512 521381e31eef0cf886ee749d99b74c533097036ff9d30d36d654bf083a11153b9c41a81ae263d9f00c0bc9c757773939418c662991022a81d4525f856f812722 WHIRLPOOL 2f8118497299efe2d2a1f140cc819dbb55c2d7c9ea7fd380154129bf1f8e39f19abb8b48b16445d6bf5f1711e598fcc1164e38684fc20c444c835b0f54a80e9b
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0
 
-iQIcBAEBCAAGBQJT5RyUAAoJEC7dUkA7aK9H94IQAIAkkjWiSC19JducOljxcMAg
-RxWaageoeBiacA7HdoBsoOyi1GpVa4zKIIYZX/ShGCR67QpY3TDnRdhbvF5n8a7w
-hRjoETj2zltWOwRECAQoZy7xnR946wgHQSB9lI2JCXltu5cDCIkKY4fxmLExwo9W
-NV/1BC5V5Do0f9m+4ED13uB4RmDUK12xxJcEAFC130xYFtFObcymchjWJAsSJNMi
-slrXgqU91U4ZzTHszCngTxhsKcuIQqwRXX9sFN33HGp+G0WSiGAzu5gj3YR8RYky
-yl/FZtu3NmbbYS8W/cZUI4sQ3Bd5NUX1W/DhKVkxBzMbhWoJdlxKCKnMFVB3R/nt
-3cDf4JrOg6MFjlgNF27dtxUmpPGgO/CYwhuEX4cLsWH0BRgjV/F/gsMQdAZw2VR9
-64l9vElMlNVIooBLnMFto71yx0XuGm1UWpeTCLH3yMQGsZaBbj56NbEN41koddLb
-jzsLoJlUXWq9n7No1tuDa4YCCx8e6DeO+vEW0ve91+Vprk1kSEh+yGOTWBYFfOCe
-xqcrPh701Hl8FQHDbLBcipuzYE6UTsQEZiXVQYRZKU7GK8x96tuGDzz8mXaWp2Yj
-Dd1eYfZG3gpOgy64b/U1Zb/CzBRQYKmBcT7bagqRiG9Z2vqYez5fa9UZ3VqD87tF
-CrM5LZUO8Jgqc6DEBnXS
-=dbOs
+iQIcBAEBCAAGBQJT5nhpAAoJEC7dUkA7aK9HKYwP/jC1wJuhJr7zrkz8gZK3Ccfr
+b7xaejungN6Hcl730mhVqtjeIr1MsqMYXM0aX4HC/Y8qqrU3B25BelhQjvf4qeQK
+SkZevGVA0H0BJLTQXQ551kPLejgXDAsY9cC6Kjad30yZ93aQbAwRuvjjq65Qa3PV
+XJTEq1FrYvV1uxclwE4cXZFmO95fJcafYoGFuomLOiMfs1f9HzEPcrjYOac3qUu2
+417hfKVln7Yp1zxCmlBVtUKvACHTkvCsT/piVD8PBBHIiquLeEICW4ohjqgx4AVz
+Ehn+zxcCuOz2kJ0FnqzWaRQHO5PPTYJG9GGP4eCH687shDebbgGx7FIwoC3lxrkx
+yZE9kW8p6W/HsCczHRpWiWnfoCVRgyz3Y/OikUy6gxux6SgSoXW/H6T7jiSJaHaQ
+mVJAlLKi7OjF/xyMvQrZ7yhj8K83gErG4gvvIKVv5fVbLTO4iu1HxckAU339Saxw
+V7RGAlS0iKTTFPnkIgDuZVp6En5qkiO824N8DKo9mppjkiTHEj++8UoqHdt90XE3
+nPJ1WTNB5jaQIxTzKfmEQlepPotTJsLTiadXn/7U5KfYs0yD2TJpApyst21FEb6z
+Lk0YitRLp7lTESJs8/BGZQH4Uiq6Xn2VZCqgfmZIk5+fA9NOTk1BSwh7IQBtCKvb
+ivsyu+wN9XwzZ7lvpDVb
+=C1/X
 -----END PGP SIGNATURE-----
diff --git a/sec-policy/selinux-rgmanager/selinux-rgmanager-2.20140311-r5.ebuild b/sec-policy/selinux-rgmanager/selinux-rgmanager-2.20140311-r5.ebuild
new file mode 100644
index 000000000000..e5c62bdab670
--- /dev/null
+++ b/sec-policy/selinux-rgmanager/selinux-rgmanager-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-rgmanager/selinux-rgmanager-2.20140311-r5.ebuild,v 1.1 2014/08/09 19:34:28 swift Exp $
+EAPI="5"
+
+IUSE=""
+MODS="rgmanager"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for rgmanager"
+
+KEYWORDS="~amd64 ~x86"
diff --git a/sec-policy/selinux-rngd/ChangeLog b/sec-policy/selinux-rngd/ChangeLog
index e9e2df3ece13..b31f25e9da94 100644
--- a/sec-policy/selinux-rngd/ChangeLog
+++ b/sec-policy/selinux-rngd/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sec-policy/selinux-rngd
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-rngd/ChangeLog,v 1.10 2014/08/08 18:49:55 swift Exp $
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-rngd/ChangeLog,v 1.11 2014/08/09 19:34:39 swift Exp $
+
+*selinux-rngd-2.20140311-r5 (09 Aug 2014)
+
+  09 Aug 2014; Sven Vermeulen <swift@gentoo.org>
+  +selinux-rngd-2.20140311-r5.ebuild:
+  Bump towards r5 (fixes duplicate context for hiawatha)
 
   08 Aug 2014; Sven Vermeulen <swift@gentoo.org> selinux-rngd-9999.ebuild:
   Make 9999 ebuilds EAPI=5 and transform to make master for version bumps
diff --git a/sec-policy/selinux-rngd/Manifest b/sec-policy/selinux-rngd/Manifest
index fed0c52ae1ff..617804d73e61 100644
--- a/sec-policy/selinux-rngd/Manifest
+++ b/sec-policy/selinux-rngd/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-rngd-2.20140311-r1.ebuild 379 SHA256 177286d5d5c8d07d88b7894d795487d9526be71ba4fafd26dab159bd4441e904 SHA512 fd583cb7274d3e96a3d30e0b7aa2f634ab85f35a8fc8011f70fe7b91ea8c76b5a9511b10bfe63c695278e827dc6efe0caad3092d1799d61de40f6d0dbd7cf54d WHIRLPOOL d6025b3ff4cf2a60786d5b7f3310f227644470fcebb9feac998c1a79656cd330c97dbd23ce37cadf169544b1a4cda5ac940ea7d75ce01f51d3aa0372abffb9b1
 EBUILD selinux-rngd-2.20140311-r2.ebuild 379 SHA256 4ac184ffcaecf66b737a4a493357d08eff432a342b0ef2af6f015cbd9ccb3e72 SHA512 d177951447084ca2ea86f8047c2bb58c3c034ea648859102abd4b3fb33abadc6b5c30da771c6f829fb8cf50adf15e52bf00a41cf73e327418a49fad76d621ff0 WHIRLPOOL 95d0d01825396931b27c6a64fc94260a552b50392237e0bbb93e69238c4442d2bd08083ada16cf4ce0f4d578c291a7601289d56bfd3355d73abafb64f86d277e
 EBUILD selinux-rngd-2.20140311-r3.ebuild 379 SHA256 a56e02a408e30a021029e18ba5de7ae1d0a045bab0f2e74e877bb752561d57cc SHA512 db84e17b425734ec879741c168248c4c1ed794d7a267359616827e378a21c2292300bd623aade4ce37c42d26516234183532649723afb95f4e8ba707b8b030ff WHIRLPOOL 9021bda867be86d04eb8acfec2d7ecaf5d59ce7652f06ce3c0270665469105e9b0cfb8e3c07c20d0a69735fdf63e1c588da056c416ef5f9e084c51a2ae672dec
 EBUILD selinux-rngd-2.20140311-r4.ebuild 381 SHA256 0f85f297ffd766a8b3de73c9cd1bb7977590e151eaba33694a7b4bd81810414d SHA512 e1d9ab37ea0dda830ef9e51110dbe77080fedf45082431fa79cfab82d20b92244d03f9b66ef841c307402bc346b5477ab214f4bedb94f458356a40b1f48b22ea WHIRLPOOL 7cf19fc429bb766a156a59b9d0b08e992e1671ba7e2450d05a83c5c374fb56db9f8482ea4046b81e22346b96b2ebbfb204ed51eadc4f00565dc288ae64666c2c
+EBUILD selinux-rngd-2.20140311-r5.ebuild 357 SHA256 40c593ed6e7d6476c15bbfe763a4648ee005ceafd21322943d7aa4fe3bd5f3b0 SHA512 e577fe30672c09cfe84e95d4b8c10c2bae93feb66f11ffaddcee71cf08b5a129ddf6703e5da06fe514c178abbda36b00ff5c885f8e32d2c71cf691112e75c76a WHIRLPOOL 6e557425901d53c814b50a2607ffa5fc6c47e224dce5602ceececfe0a12407b1a3da10732e26e78f6131f0c9ccd7465dbfd8af287df952a82fd845fcf6df540b
 EBUILD selinux-rngd-9999.ebuild 337 SHA256 2e22c9b013daf45ae1b28914e1da8692f50e244c2d99e841f68913e9db6bbc68 SHA512 03a6633b48a865439a6b668cfd49e5b23470e7749b8ad1808c253cd7b5dd0b6c55eb6ad057ad33e901020032bc4e7c3b47cfc2726f55d9a7adb144bcf4db9f71 WHIRLPOOL 6b85e551aecb0ef7d040a23c0ce37c3baf8e8883bb09972ef8cc5134cbd0eadee407c64e99c213c0780818f76dea4b115226c24f5f4dc964ebeef843428463ef
-MISC ChangeLog 1878 SHA256 c2c95d10c0ac2c4ac27f99bcecd26f59958b917d93f5774ce9402d1464d58f42 SHA512 f47df582e6877006c879b6ae8a29ca56b24ae842b46f0a3ade7091c8932afebde89622790cc26f0ade70ee36fc97156f691e4a594ce58c9746b2b88ed6cb235d WHIRLPOOL ed9677604bffe14324f4ebf195648f5f855f185b26ad051b775cc6bba49a10bb4ee234eb6dd60784259bf9c6ae6bfedd580e80381e29e4a35f0f3ddc85a1af88
+MISC ChangeLog 2066 SHA256 d8c21b40a99a03b5329ed8bd9c934a3af1adae2e4de1c35a9d11f4ec75849952 SHA512 5f27213d156c2c7ac819c93adcbd66d7fc1d9000f5e31b65aa1fae9f09fbd3673673e8735272666515bcf86973ccc13f4bbb974ddb28cf9eaabff73679a3447e WHIRLPOOL 8d3217db0dedef6a7b9c57e7532265dde7cf1c25bb9fb716fed452fef2605eb797ee7133fe2aca6b895411029edc01907f80685f27b830051f8f69e1ba5f8b48
 MISC metadata.xml 228 SHA256 ea176fda36246cf6f9cc3687f48cc17b3704effa6e0ebe9c52b12681445c8262 SHA512 fb1671753bf634740506ae6b841781e60f41023b23f087a96391eef85335d5f0801241883faec25e3a8bf36fd5012be3a431a08107ec51e256907abbf120f543 WHIRLPOOL 75a70fd9bef117d16cfa5f3e664ef0e19df2db9f44e653afeca511e0b9e16c594f6d4120e3a3c1cbc9d30a3c483aaba5ca776b9333a1633901511c2c64716a4f
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0
 
-iQIcBAEBCAAGBQJT5RyUAAoJEC7dUkA7aK9HSMAP/3Y0L0rr03c0lFMBOm1lule/
-nZDDdLo4rxNrjV86L9zdUkBu0BrWC3mzAejiJfnwZ3MWCCrHvYByYZRpYR0JSk8Q
-uAjKiZblVKbD5+ld7qImVDv/gIQFaB6ULQ2xXFR8lmyGdQq5OXuTOr1S9ddba7U5
-gT0SNn1jgrYjvG7y4sICvSj9lA194tnMvE4SFHr6VDZFkK5YTkC2DqIQD9e7/m+7
-4u7nQOU00zHpkRQdDkKxH2+Azscnwv9xGqW41v4BC7iJCtNGEhDpkl8KhKD4ort+
-Yb8xSQck29Hui4Cd6qjolqXBQg2WnB226vtBqsspBj5NCbaHgX7daL0CaOvUX1Xk
-cqOcW1CBTfUrPzLprubfgUobJf7hPTsb15f98PTpaylRuYXXRVlHPxILyIQtXdr7
-klGztnd7qQHMYVTqFRkKZI678KXGeWp508tBW34PHL83lAz8WJe4KF7d+oB9xjRB
-OHC4hz+PPZbXDykVvu+Y7Wqf6AoZmYe7IG6lrttnYldBI5Bs79yzP6LHy8vPnAi2
-+wjrjeLg7mSv/P9HrWMgqiNUqzkX+XOb7QcCU/XLm5A7Jw8KXPX/FEvSj5nB5KOY
-69tQAg5Z53onpNK5nPGbY/KFdXnqJgudSaZmGrblry3NPnP1ctsyko04q788PYCB
-4I+s37QgDB7HZIfVi7Sd
-=dAMf
+iQIcBAEBCAAGBQJT5nhpAAoJEC7dUkA7aK9H0ucP/iaX8pD/qMHhCnmrvdTdPYDi
+AOIteoFCEcDi31hNIv8D7QdORFrR9PP05TPXlVXhBlGOaJHX67wl4l1FKY4TMMRB
+XAOm81otUnfykWk0s1cUfQfXq8jSlDQAeBcCFb8s8nFjynLBZIqbLKRuqCbdZmC/
+mmaug+a8pq+PFpKwipb2iatUatsFAOpnuGCScBWLAa1C7jSbZB1fMDY+cfoSlTcz
+YOHTGkKgCL1lnIUy8VTsb1m98t8SZzLytSl8S2cUY25vf+4OrfGGU1c3DEQnMAMr
+Tlb28iV8qnCD26YdLDWTUiQx3/+7iOLfDCVJpJRVBpZbp47jevN3xfRe4Jv+36HF
+6KgWaZWL7HZDCecNZ3X8y9YF+yvXyYDBaj9Olkh+2PCF9jiLdUtYMbMIEznAFhrT
+wMP7Ds0dUh9sHr+bnhbKZrL0FwCCaQpNdbHhAgsCYT18vuYJu+k/25UlLKQEmz+5
+GQOTysMka6ujysJgKeM2TUP/J99YImBd6B7fq8ik55yGkCPTVgdb/m+RVdddrenl
+nmYsyI1IxQ7jgOMphXff/UrYPLPczywDyaYavGlQ70aBKINUeTaIoRb+7ZZaYbl/
+sLIJC+1UCsDHaI+DandzckBDRXKusFqh4w1rS8SUUbDmiWHeb9+w/NIiLrtFx5rE
+qrj1vxZcbaZ3AwRy5oQy
+=3PaM
 -----END PGP SIGNATURE-----
diff --git a/sec-policy/selinux-rngd/selinux-rngd-2.20140311-r5.ebuild b/sec-policy/selinux-rngd/selinux-rngd-2.20140311-r5.ebuild
new file mode 100644
index 000000000000..3bf958b3ec60
--- /dev/null
+++ b/sec-policy/selinux-rngd/selinux-rngd-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-rngd/selinux-rngd-2.20140311-r5.ebuild,v 1.1 2014/08/09 19:34:39 swift Exp $
+EAPI="5"
+
+IUSE=""
+MODS="rngd"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for rngd"
+
+KEYWORDS="~amd64 ~x86"
diff --git a/sec-policy/selinux-roundup/ChangeLog b/sec-policy/selinux-roundup/ChangeLog
index 07f23a289bb4..932ff167b465 100644
--- a/sec-policy/selinux-roundup/ChangeLog
+++ b/sec-policy/selinux-roundup/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sec-policy/selinux-roundup
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-roundup/ChangeLog,v 1.42 2014/08/08 18:49:37 swift Exp $
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-roundup/ChangeLog,v 1.43 2014/08/09 19:34:19 swift Exp $
+
+*selinux-roundup-2.20140311-r5 (09 Aug 2014)
+
+  09 Aug 2014; Sven Vermeulen <swift@gentoo.org>
+  +selinux-roundup-2.20140311-r5.ebuild:
+  Bump towards r5 (fixes duplicate context for hiawatha)
 
   08 Aug 2014; Sven Vermeulen <swift@gentoo.org> selinux-roundup-9999.ebuild:
   Make 9999 ebuilds EAPI=5 and transform to make master for version bumps
diff --git a/sec-policy/selinux-roundup/Manifest b/sec-policy/selinux-roundup/Manifest
index 48888668b361..b3cab19e8b65 100644
--- a/sec-policy/selinux-roundup/Manifest
+++ b/sec-policy/selinux-roundup/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-roundup-2.20140311-r1.ebuild 391 SHA256 15f99bdd3ee3d5fbe7e59d4cb7c32d9557077234d7dd154b426f7b2be440679b SHA512 3f3d1cb33fc5953b2bdc0b1f95472989297eaf5e7de6fae214790af794f9da5f1c33212c5677e8a8e081dc80cd2e7380d514e66d25477e8a698b009812b15d6b WHIRLPOOL 23f64263737000986954004218021ca8bda0b03be81fba0b639ad8c70ba79381282a716085ab73a204e51c2fa8e79ab79ea1526eadd71d65f1db1a095a365c60
 EBUILD selinux-roundup-2.20140311-r2.ebuild 391 SHA256 70274e379557ed9618e0fc8a6fb06cc37168f7a6107f402d0beddfbb75363c3b SHA512 79ec52149e29fb4b6d901125b2f8210211f3c710484e513645bba5cb191185f70df1dd1f79c530dce63f7b646cba697c0982c01f3e4cf6ab48264d8f836ab7dd WHIRLPOOL d77a5f59a1036d63a2428e1f58692fc8c261d1292939b9cb68aa9aa4fbd6a8383bc8599ebe3e133525ba36e30ffcce5f8438888f97b4a1ae6b32a3963f5172fa
 EBUILD selinux-roundup-2.20140311-r3.ebuild 391 SHA256 2e2246f8656ccd9f18707d4e59b0135b5e348f0af4567e477b9b5026c8ebd2fe SHA512 48630055e09bec0687af8c69ea84206ab4ce2f81d0b6337fd198f6430431bd025a6dcb4acfe36853a69296d38625c9248d6515ac0ffe3ae631b409505c402c1b WHIRLPOOL b1c4930eaf4edfca91b49d8c3a6c6b25450643af1bd787e29fbccfd6f7d57a637d06563867907a28d8a476c3c35947cb1d1d0fdc4d72b74fcf14af9a01f89536
 EBUILD selinux-roundup-2.20140311-r4.ebuild 393 SHA256 fa3278ddbee7e97dd5c798d424fe072566ae5d5e9bfc36743c86d9e4ec9ac575 SHA512 1fd90cfe7c84d601a769f810f3fc89c15be8c182cda45f92b4c02f833d2bdeb8dbc6afcfa9d9613482f79f83c7f5e6e26cd9696eaa1e84499fe109e79ff8bdc8 WHIRLPOOL 79494d99f6af80a7fedee30ac74b91a03eff97ba5011610cee355907f7dde81c1b4afb32bb4e5930a233557b8ccd8d8a5348afa4b5fbcec2558452f1913acf89
+EBUILD selinux-roundup-2.20140311-r5.ebuild 369 SHA256 75ff013d05f258d85bacbf59f2b78ad91d8ef4b343764dd26b5ce0c0cbf74cda SHA512 649f84dc4ec54815cfa51f8e7923e59bf5926221b04b557c70334161f6a0015140d1cc1db11768ebc5c5cee328be792f97ce3947e1e0aacc963b00546c1f760f WHIRLPOOL 4427e08a4fca49a79446093f4f22f6049a60a25debd1e33b0365eecfaddece2dca60cd43655e7cbff20bc76dafb0f4af2b54d495f509256fe90510f58de5628d
 EBUILD selinux-roundup-9999.ebuild 349 SHA256 b3c967af70079f99931e40329d174f677e2c40a34dad7c03af5733dfc9dda872 SHA512 ec891ccaf0f19ee61cad032b953f9c5e19263b389b2bc0a5915ecac9de0d447cb83269c3bce5c27a2d58824c2e36cbf42b3b72c8d5332b0acc40f4a4ed8c5c50 WHIRLPOOL 2b6af128438643bdb70deda867e0295e7e7727491897d8c885d828fb8a975dbf98dac317347c9715d5e71cf4d4b7e887ae43b4edb146b93aa4c068d4e7bb062e
-MISC ChangeLog 6588 SHA256 25e4c981f3f7311f887de0d58bb05397177a36cb9a1b9851dfd1df1677a2ffe7 SHA512 be6dbce166ea6486f1abf3d2e93199a7ebf4f332f9f2a4925319b56e5348424ca91fbdaa909e563b2e8222ae7b579d12947a313452db8e185397a02161c8e1db WHIRLPOOL ca177cfe896b5d94dcea08db9ee591856a0cad0b5446e904c955ad46647e19b565b994c0153f1812b4a99ed0241a58da5011870620e71e4ad34844c1795ef100
+MISC ChangeLog 6782 SHA256 a21e962a50bfc4a925dc6cbbb84f2650ef6d64aa82ad45c16614a24d4d0aae58 SHA512 5f16ca893ea953e252dd2ca65baaf7f0cd7754b64b9ef15c941f2da0045be568eef59a355e959536e716608f2b4c3ec873efa523bb0374e6e074b7fc60a9e59b WHIRLPOOL e1868b20fbce32244a78985c31a843d069bdf4a8ceddcf2d866d3d652f525404b6223b87fdf1a82eafac883b5b1d2a5c767492e2eec1dbe5d35bc402da311f0e
 MISC metadata.xml 231 SHA256 e1a189ecbd18f1ed59335e122f61c9afccb69d2370deab838e23ea614be974b3 SHA512 0a85bb328734e5f1e096b8cd1c94e85e5c482bd4efe23107244c2ad5ecddcbb3a8e9d7c6c771710aad09fe03c5c3bb2012960fa319f87954b12baf2c7a5e4b9e WHIRLPOOL 5a24eac757ee5527b44e44a9844859cf39ee41e8acf82e649873afdfdf5cc4ef87c5404ac0fd420beffbea033c1a4739984f06b9a8c4f1d06d9aefd4e0179c96
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0
 
-iQIcBAEBCAAGBQJT5RyUAAoJEC7dUkA7aK9Hnh0QAKEhZn5b5rYphpA47szkck/r
-1d/WTacLmC2elZMVBpI3FEjo/3pLzEFs7dnAm/3Ddz/DtkkDw0cvcv/aegjFCh3o
-CXJJYVU7pIw6KdWpOy50sz6+YLToh1IYiPZf20MY/45+9+3ztCbS7ki1J4irEcad
-aTcXzybqWUaMprX4JLYrCwKnNKsl3SZKCpv+JXWoe7mdAhhDjs21LG8mkuxAvQmk
-fjRgDB8FYLPp8tdBkys6ZWItATzrbMmtzQkcWfNfnPy8Gb1uBfcdq6LxKQk3oFcY
-W2nMYyO+Ua88ykfBNKCbmai9VphCHmTizjqYDsMHgl6YA2urt6PNhc//NKJtejIf
-aY4cs7dDWEZHHsVDs/1VVZ/I8Rw0N5Yj5Buy0PLjghqjFMO6t/0zOxKgPY7BzShV
-hKH2dTJ3pGkGLyL4958kn1PIwxJeMF3YsGMDDEoFgruPc4MDJv26yP4FSwQR76Bi
-iX0Sw0KPHjLG1/TfJWwZKeDRj7WTSIu8e+7cynsTCWOTietgdtQqQ6fVaZqgwl33
-0nCswtq2CzqnBLMtamsqRSug9la927cZpLtZdX8x8cq2PhIFupeq2VZJjAosrMnO
-dT6D1ZqxtSGzIfZx6BvGMUdfjgr2NZWDUlYj23o9CGPM1A2brqVlRezPJtBnFX1e
-PIWPmws8IbhM7+wDm4Si
-=bjRP
+iQIcBAEBCAAGBQJT5nhqAAoJEC7dUkA7aK9HpIgP/i2TS0O1QKyLzYwQKv/Oip9b
+ndJCZCdbWlknPnXdrgv0EinWOoqE/iP+6xJrn3gpPxaEM0RwTnrs+Mn0EnW47wH3
+SrUp+J7Bcfru5Y3eVyd5tA8k/+V55XLcpy9zMPcIOKX9qKQmci610Ay3GSj7LoeA
+1VTk46xW8Os+NhgV8GOd5pGK+Q8KjFwqEiIVG4eUJjA30Ml+tXzjMo2ishHkAMw7
+L13yerah92P7UotpgzYXihuBtFMbFeReTb/oIiDya0GRGSO5+HHV9e5nzFUFb7Bz
+IogLNum6BPdiSjaP4gDwLMyxafg3kP+n1pnn3QiKUzYtjU5ropCUy2fkY5pFL4LM
+4axvi2jDcrUHbx4ihhvUWx/ycAzBE/evG8daE2L2UMxZ6pP/tRU1fWfmdn9ATct6
+2vJRNea0IbCL/HWOwxnNdP4F/OVQ0qzP7ZpgzzAbhsSv0yAXZLEqpZgzq7MCsqU2
+8hx0wyMCsFwPXZAujSQs1oiLEHmIYj6CUQze0Q6VBryt2TMFRHGt7bE3GAjqXe1Z
+K6MC0Pja43q+xFuGhPOKRFN2u1qw6OObTn01yTt2jFs3fzIX6Cwo5nzG3dD+KgY6
+V73TbTcBW0FmbN461MhQNFfnZ6PjZrPMD0LehxzcEKlqUXs8jmXnCr6/NTVGDJ/P
+a6GMwZrDebYA+lVDvP7g
+=K6KO
 -----END PGP SIGNATURE-----
diff --git a/sec-policy/selinux-roundup/selinux-roundup-2.20140311-r5.ebuild b/sec-policy/selinux-roundup/selinux-roundup-2.20140311-r5.ebuild
new file mode 100644
index 000000000000..c4619c190682
--- /dev/null
+++ b/sec-policy/selinux-roundup/selinux-roundup-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-roundup/selinux-roundup-2.20140311-r5.ebuild,v 1.1 2014/08/09 19:34:19 swift Exp $
+EAPI="5"
+
+IUSE=""
+MODS="roundup"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for roundup"
+
+KEYWORDS="~amd64 ~x86"
diff --git a/sec-policy/selinux-rpc/ChangeLog b/sec-policy/selinux-rpc/ChangeLog
index d892ed0e85c2..f1e786b467da 100644
--- a/sec-policy/selinux-rpc/ChangeLog
+++ b/sec-policy/selinux-rpc/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sec-policy/selinux-rpc
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-rpc/ChangeLog,v 1.46 2014/08/08 18:49:26 swift Exp $
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-rpc/ChangeLog,v 1.47 2014/08/09 19:34:29 swift Exp $
+
+*selinux-rpc-2.20140311-r5 (09 Aug 2014)
+
+  09 Aug 2014; Sven Vermeulen <swift@gentoo.org>
+  +selinux-rpc-2.20140311-r5.ebuild:
+  Bump towards r5 (fixes duplicate context for hiawatha)
 
   08 Aug 2014; Sven Vermeulen <swift@gentoo.org> selinux-rpc-9999.ebuild:
   Make 9999 ebuilds EAPI=5 and transform to make master for version bumps
diff --git a/sec-policy/selinux-rpc/Manifest b/sec-policy/selinux-rpc/Manifest
index 1689af4f6833..1a4f30599f89 100644
--- a/sec-policy/selinux-rpc/Manifest
+++ b/sec-policy/selinux-rpc/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-rpc-2.20140311-r1.ebuild 375 SHA256 1f5010c4f73db882fd9bcb6bab0dbff1538e99423ec6985e95e11683bfaecd37 SHA512 20d6d1f6f984ac233d34371976fde674a156524ad370d2105ba1261ea36416389b2587384e4b049df390ffefc1fac88eb07fc9ca0444c81bf5a48e5a52a0d0cb WHIRLPOOL 9bc7c25997b375087c1e88d38c4a6a08beb3c3a3a695f984e092ba2da1bdde936001ffd0851121e7f18a6c1a936e9f9a4bd7f8daed93c8e74209e4b6bafd2f7f
 EBUILD selinux-rpc-2.20140311-r2.ebuild 375 SHA256 89ccb382813efd1c98f1f91bb1338659565a3bcbaeeea49dfb3d75e37985c9a5 SHA512 83c0ee70b0b6bd9de103eef078e1105c5b85c86b19198659992297846ebd5a7a16dc26263492faf635ae5404b53e42acb42051b0e65830fb0f2306c2691585da WHIRLPOOL 44453a8d01bbba49ac03f025344834e6f94de8907b8da492b0b082c61f78950b40597301c6502d41905efea667e683875757ee30d821131e7c2fb93f659ce9e0
 EBUILD selinux-rpc-2.20140311-r3.ebuild 375 SHA256 f8d3c50f829095a4e00dfa6e5828069676c6c1da63dda4c1427fd8e9db79340b SHA512 7174e2d034a228546cf744f1e58d8c2662ac5c0b3b85a940cc617ff19fae091b16c0c92dc9b7f8e4e5d225dddeb8c24ab45cb89d855bba497f8ed642eedc50ad WHIRLPOOL 71063bbe7b671d395e8b4508d0dfd4bfadd8b9673ba9621e3cead2ba6b022a98343618416d2024ae564a6afed80fbb0b097ed10ce6cab037fd0638b81a2b0f8e
 EBUILD selinux-rpc-2.20140311-r4.ebuild 377 SHA256 d6a26239c92d65dc360a3de570822849bd48ee1a9de63346399c2350dd5792da SHA512 91a35df1255aab7e8ba15f38636cbf23ef1358ce24e549c5f4b8719b22b10c6d3ca25833f7f83d1e2c1bbbfeba5b72552fda3df641b2e50c768ff81103dc0c90 WHIRLPOOL ff01b1de6ed98877dd7ae0f004286f8966538b6c0a31fd9f9f0182cc8e5f3939a98b6501da5b55c1b9269d62d8a94dde94072e065444a9520f73876d33e8b8a9
+EBUILD selinux-rpc-2.20140311-r5.ebuild 353 SHA256 e9961a82239c9e09d914f75e4e3794c61ca5b1df1d261f325cc03da95132e7f1 SHA512 26689b264b054648ab6dd19b95be7893852e8c2e5ba027d87fd1cd7cacc2dca075f464fd177934e66181963a4f8ef0cb21aa958bd2373589fe3f53595d9a4e71 WHIRLPOOL 3d71ef1666f7cc0d12ae4383dc3de47528bcbdf2d7991d0d9c17748a4b671a7e8cee54232a9fc59b15dc3fa02926885ec8be123133cd298ffed616a47bac4337
 EBUILD selinux-rpc-9999.ebuild 333 SHA256 74a6d5b776c61eebeac2838caf1cf9efba807f0503b441e44f2e3923b175cff6 SHA512 650281b68d00bbb6a80260602a52a1e625faa805381e83d0fcba85326f256574d8be252d03fb989adcff06eb856387c363ab91edae13e8b3c74bafd6018a8ea2 WHIRLPOOL 02a53afc135491a47d755b677d178bd3c51b3d98b65c4b4ca173960c12116064be79e139b6f3594f867a3a569bfa46303c17c5e34e3bfecff67b57f1321123f6
-MISC ChangeLog 7285 SHA256 7a247a9083e707f3f8bfc42db72b9f22885957f1e9a01a1c8ea2ec03f5314875 SHA512 88282831aea55dbce65098e71b6331906ce40694f5d864f3611bc94ccbe5e7a59351d8e28ee90329cb0270cdd5c8fbb7e902606f280a67d1d67a1572829dee05 WHIRLPOOL 256674b8cbbf46730e603861db7f6a7249cd96dd68cd1e836aff68694d9bd59426ee6dd09ba2c83ba0aef4c4899cc587ff156ab4a4a8cad7398c28d2b786d4de
+MISC ChangeLog 7471 SHA256 aea0abefe2050c2911fe3e993127507d1d17b063a69407d29508e1fa94fefdc3 SHA512 edaca4490fcdf91b93c166f041d44f6ace750c7061ddf8f8f8a2fcc0756a08c434dee0573b10ad2dfefaa1c723273de2c19af088881a1b058277dc4e0335e1a4 WHIRLPOOL 1a37e845c2bbbc84e8582b9684ad3f3a6974f2a70ceef63c488feabf1658bd8963ffd40aa9caa6381142cf4ed1f8e47f97363a26929c3722009a16f582ba22e6
 MISC metadata.xml 227 SHA256 95b91861ac1519b5e8c55a6623380479181f07c58c6ea6091761c45c65028f36 SHA512 61c10c13f81d1d7047a3a7ae30ebcf146e174ac4d8f8833f71ed0c96b9ca6fb2c84dee76e584ee0b7969c2cd53753e786c831162f25dc6a8c8da9318a6f21bee WHIRLPOOL 30c503a8546bb780d46f8514f3973a0c1915e655595ece2864f5598c996facae4f5e593e5408769dba0e67f47aecb21e2a829fc5d6bce8655c1cd75ba2c0507d
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0
 
-iQIcBAEBCAAGBQJT5RyVAAoJEC7dUkA7aK9HbigP/j0GGQzS86HbkLdFf8e6LeL2
-Ce5ph5wXc79iy+4bTVP3lIJQ6QI6ChnlB2bYMdu7RCzbAiXxM2Vs/e4tn+myppe/
-f6smk7kuyL5C/HNkfBfrq2+l/S7f28G7HnpWEDFmIp3KwqsYQPThTYFv+ynmvrA2
-REvwmSeZTbaFgmqazOgFNXIXjiCozX59uw9XGE8TgsvLeIaJZo4DIA5N/wKBWvLn
-0OqDG483pW7U3DWV+hxwuchFrLXkuvoHkm9FLhYyyvH4ptd8JP0PD8vqNJkjf2EJ
-thfVsIaoYnwF4dSXNmJo7in4RIi2lOqNGs769NMFfW63MBbgtrYl+TKbAgqrip4V
-2QEz5U6/K9mnlKLWKB3557tMKBVCmKXMNW0RHqkaW+ujWH0nP1OtQ2rZqL64DQzk
-9d3vXcWLj74WXM2VFoTUJRe8tTMN/olJbSFpzkWBQu/w8xCBejY6VGZwtkKEctNx
-IPnBtXa+9xOvGLGx1w74scWS1jxwaNU1DepmXlzZ52mYVLzTLEOkMZ7hDxYpayqD
-xNZjQRYErbyY+sNmUFuF9jP3L4Nu4iPZ2/WgCNXiBys+ZZG1RXxRgDchidZxJ2OA
-iJ71oq6U6CFOdkq7ZTT8Jogbfx9Ap/atgtj8dKn2m77zP9NdM0UZva5sQX49xZWW
-ruFg3Qu8F9AUd9SHW0VC
-=E9Zk
+iQIcBAEBCAAGBQJT5nhqAAoJEC7dUkA7aK9HRvsP/RbTlaM5etdWbHWstX1x6HVl
+HLtIeHNEBgASQMkCRuzxobeJrVhMNYwgaJhAyqKQhyEdc1sGCrT96kwb/S+ELXqT
+njCfqQWMmPtapJnwq8uoc/hgvChUpY1zm/pQuD8xPEVJ8wtxWvRhaO0abCrShI44
+WWnBIq8Xcv6FiE9e6XFbhpxkwvanVY1ucpvnM1JhSfyk7ecLh9BJeTDKVQhJdU47
+Ykoqfoob90kk0AFqHsQ4TswxgovhGcXU9hlY7fyIstDq623Fe6uQ4xosF7HjjG3Y
+dDc89ytIXi604x0Oc1nCJ4NCX3D609OdjvxEr6glk+gSGq3VyY3l3Jz0+NDNA66T
+C6asNh6wM3Sw7Hccxys5f+JcHtSayoZl4uk1zwA0RPavHDBgEbnUw2hc1hZf5Atj
+ptTmm7dLr13uvLEeYjRTL/vsrec3RWqx86WoDdd1uyMK5JmxbhaefEFFgSQ4vQDo
+gCP0ajQizag5I974gjDyLoXn2Xe7i2qbpLOsoyMBvYS8ZkoRYE0AKTm+z9QwnXGd
+Azy2ovGmDp/6hJLiY3zCOQWEgH6hGPmPvA8ZWM680ZkeNOWDUUNKPJD9hfgEgdXR
+zJmcjIe6TgrdWtMBvcqT3BfZtD5v7+hpf9uLx0S2qlxYJvEnImmpbypsj1iMX0DD
+qXR83xMJr/07ChtzQC4u
+=p7co
 -----END PGP SIGNATURE-----
diff --git a/sec-policy/selinux-rpc/selinux-rpc-2.20140311-r5.ebuild b/sec-policy/selinux-rpc/selinux-rpc-2.20140311-r5.ebuild
new file mode 100644
index 000000000000..e58bf32a5538
--- /dev/null
+++ b/sec-policy/selinux-rpc/selinux-rpc-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-rpc/selinux-rpc-2.20140311-r5.ebuild,v 1.1 2014/08/09 19:34:29 swift Exp $
+EAPI="5"
+
+IUSE=""
+MODS="rpc"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for rpc"
+
+KEYWORDS="~amd64 ~x86"
diff --git a/sec-policy/selinux-rpcbind/ChangeLog b/sec-policy/selinux-rpcbind/ChangeLog
index 3fcb2f91db70..5d38792c9dcf 100644
--- a/sec-policy/selinux-rpcbind/ChangeLog
+++ b/sec-policy/selinux-rpcbind/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sec-policy/selinux-rpcbind
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-rpcbind/ChangeLog,v 1.42 2014/08/08 18:49:58 swift Exp $
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-rpcbind/ChangeLog,v 1.43 2014/08/09 19:34:25 swift Exp $
+
+*selinux-rpcbind-2.20140311-r5 (09 Aug 2014)
+
+  09 Aug 2014; Sven Vermeulen <swift@gentoo.org>
+  +selinux-rpcbind-2.20140311-r5.ebuild:
+  Bump towards r5 (fixes duplicate context for hiawatha)
 
   08 Aug 2014; Sven Vermeulen <swift@gentoo.org> selinux-rpcbind-9999.ebuild:
   Make 9999 ebuilds EAPI=5 and transform to make master for version bumps
diff --git a/sec-policy/selinux-rpcbind/Manifest b/sec-policy/selinux-rpcbind/Manifest
index e073c3cff515..df3e1ea22a0a 100644
--- a/sec-policy/selinux-rpcbind/Manifest
+++ b/sec-policy/selinux-rpcbind/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-rpcbind-2.20140311-r1.ebuild 391 SHA256 9ef5bf4295183a782b97ec63c237eb0df4e74b55f09bb5ef6ce80b968cb50daa SHA512 2baec746782edcc92d248326b2b7d5766f881ed846a1a63de282c2cc916926b34c6332f86b90fa7bf89a290878f3eef78fb59c66b1706125bcd43c0b11d5b389 WHIRLPOOL cee0c8fa2e4c7eb2afb2e5d9e7fe5c1afc5d1ed1df7c32962b38b3e3ff9e254f831694c37afc3edb1785a79ed78107a8c8b3a26724233f1c6c08ca72daa7ca08
 EBUILD selinux-rpcbind-2.20140311-r2.ebuild 391 SHA256 92fc0adaabc2d5e1195f2894c058d93f9b383539859a3a78e10527d401e638c5 SHA512 c804ff58fc647e8396ce57de997609d1ceb59bd40070adc6e668362f31a0360771e6ef636f3e6bdf96efa9b4f80f7ac2bf04fadec11b89daeeaf465ad5588ae4 WHIRLPOOL 3bed9b1366679e1b1d96450f479cef9753df4240cb148713e07986e3a34ca0dfd33af7f7ad9ee1016941638b8c90fb5fea5cd136abbd113abf841791c36bea29
 EBUILD selinux-rpcbind-2.20140311-r3.ebuild 391 SHA256 624b3ee3a273978c0de6d4b72626571dce6a29b3a1c3c69c72d3f6dc696ca825 SHA512 a9f3683e064f48c169aab69aa26a6f87147f0bb4f07e4f45c028b934b7c5f95965f292afff33e01294fdfdfa1d75c61ebde97d2e35eea83171d0d91e5a0eae9c WHIRLPOOL 7dcc49130ebbf82bc0356a2dd47d97f7d1a5750b642e1935c5b7ebbb119742157c3358fbfbfe71f08668191c6662cb331c516f77a90db1f577ca2e98885e6742
 EBUILD selinux-rpcbind-2.20140311-r4.ebuild 393 SHA256 4d80a11c4a62b9b3a2330e9270835f6c51a20d51799699143b88d7e37e57141c SHA512 7e8cc3a2d964511f919c7e84d57e43025de410db371407f402e21e45d22a77186ac86ac7cfaa43c2d8bb145d7f9a40b249e2fd11db929bf6adc4f95bf842db03 WHIRLPOOL 1583930946bb9557d70da7d14510a55560717454e3b2d2f9a13c373ba390ea756b0a77dc5df1e51c1a5aa6a87b4be3bf22e9496e9a150433382d5d3068594fe4
+EBUILD selinux-rpcbind-2.20140311-r5.ebuild 369 SHA256 f65366faa83a256a22e849cf2049ab499ddf00c5be12491ffccf97739710eab1 SHA512 1d2bac76467e6d8c666fd3750192fcc9d9b110da2ce84d520d1ec77c6a9417bc917b672502e5ac6198c781d35274fb9072d4d4dda7fa3ea7c4f8b6db6e7c0f93 WHIRLPOOL 1c97279e6524b4695a8dbb3b1e02a25f362f903fc5a363651309047c8d1a639f0f896c7f58384001fde98dff84756411be547ac4957e37be3073a44c0db6f76f
 EBUILD selinux-rpcbind-9999.ebuild 349 SHA256 ba9224dcd0b996e7af2cb0e51753d559648c02f70dc66bc7b7ddf98311fdddf5 SHA512 81bbdf7abf1ad694863d3cfbc091620cf427b269a45d9ea748840d64a90dac90d28746e877029dc20f8f1bc07515d9c13b350a9ad0bfde50478e192e8384e401 WHIRLPOOL 68a71ae38736b25799a8998bd6c747733fd093f3b0edc88059c858e461aaef11cd4fdfbb55af5210946f9c7bc6aa4d6f6767bbc889d06ebfb10eeabb1ae16fa2
-MISC ChangeLog 6588 SHA256 05b3b7445f84f67eae7b1101ec4f977fd5491f7f8e2fd5fe0ff0cbc41b191b84 SHA512 567a06375d04880c74a81ec689cf69a3f57c1affc167f2dad49f8118045580cd27a5489ebf680f16f0860e0675657bdf0318071d53e9d044235bb50622c41a49 WHIRLPOOL 6ca8c311c7e2803f0544a3e7c66cd684ad465d6b77d05503a340f8ce7617698e2afb7527870142c07db6e6342684c807b2d772fae17e34c4c84efa5869ebbe52
+MISC ChangeLog 6782 SHA256 7ee6cea3f39cb7284e29d17687c60c1fcd897dfc0eeecf5edb9bf588c344dd43 SHA512 4bf8cea0c12774d1bbcc487f845132ff4cb154b25a2a25478b2a21595676cdfa57371c37698881e21edef41e98cbfa05655386f27c1b25e09350537d999432de WHIRLPOOL c7ffd9656370ac456f261d05153eb1711df788e7b0a170fee53de8ce383705f2c4e1cdcd6d2af1ac5de2c17099954885e70629fdc32d890c146552a674431457
 MISC metadata.xml 231 SHA256 66ccef32ab585bae4b1b2902b94cd8e28f660a3f475d0e18ce10e28106378071 SHA512 40203aa4b9992a651a953eb443baa0181b98e8506a17b29e8d0412933c880debf954dcf5af0d4ea5459f7b72c87a886dc9dd288dcbc5f7ff488e2e4ce10d12d1 WHIRLPOOL 46a1625934a79430fdce611ccd95b48d02356aba7099832f791eab35148170dd2fb515c0210d3bdce7ccab51852a08c3b4a9a097f49f3467f470eac85cfec5b9
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0
 
-iQIcBAEBCAAGBQJT5RyVAAoJEC7dUkA7aK9HpAcP/i3xqxQ0cfhLcOtAObgSZJ18
-Q3uNkomflVwRvbFOzxjekrpieO3v2c/BAkKS/0MmIbFISwNCWneuQ7jhbZLaD8qU
-eOFk1fFIJ3TW7JUKZ2v7lQal5gc2R/zXpe709U16AwvKPSmUVcfG8rrT9z+WfnOX
-qWSC5C8pa88RpfFnBPU5yAljDE63zeQ46osFULdaLNj39HW1GLbAp1CWj+MkhKXH
-K6L5Der2JLt4iBQy1bEbUMWGe+gXeLNLULnTiZOZMI2cXAFzZgqmybAmOeHD/G2Q
-kHBKwIxMCHtx9GI+qTSi5bzAffd9YgyFGIfmD5ITpYFfe0D2yzlZSPHNT5JpR+oi
-gWgqz5QkNDieSPoagRaaSxte7UWUgGZWKlEXsQfvq2hIv6Pmt9JV5khyL3q9MR2m
-8Y+5+virDnEacy9kKegONfIdMdISKTNvCrwckrE+IkTG/ihH1HPjYtjxr4q5lmaW
-Cilpg+R8dXnojEkTY3Axv94xreqmGHgOTyRoWGyCnHXsSCg6u4wA/lMHLzGqudZe
-0gXO6kc6CaPIPTmSJk50ghmo3oEHk0cVle1EeqVb8EJ6Rh+RiS0T/xa0iMLWtWGE
-OVFtdFzbMWjcBl5+peY5NRW22lVEQd4kTRrh+6abVRjYtuDgXtb1TAE9dYIACy5R
-lwHOX4SxJZxpQjvzaWwR
-=Uqg8
+iQIcBAEBCAAGBQJT5nhqAAoJEC7dUkA7aK9HYGoP/2MzGzov8HkGQvL9siucbUy8
+eZyWopVB9wtNSMugLNR/TgCLBOPGUPiTHQTQXbhettwMhqXHaCDBHSzRlVrzsrhl
+ijQaUDalxYMIKo6iQZ3EAn7hWB57Al335S3wBaB944RucKD8bgjMR5pblTmkr7DF
+3RJnW45QTdIFeuF7U3tGAg7w08VRb8W3nNBPFqksX8mWmRxi4Jms5TYzbkP26mmS
+a0o1xhSBV3r0aHVx54+5GSkzkArdJMr+T91XqFGTeGuRnT+rLatABXkAd48mS3Lg
+wogdc9yAKmDbIgNiAIqsQsWqGHda1p3/k/bupXmu8gv1K+0xjdlI+A0tGUBRCwrM
+idBWaYQ7bcuEiu5xBtw0hxNRKGL8glGbIAUM15m+FCS6jCMgrm+uJ0JrOkcQ0pSV
+kkvOnxiPj7XO7T4WFfV19wGrPtEBbBK+wxhlUf8m3Yv1XsqxVu1Vfa+PnTuPt4Pf
+3tCZp9Nf213mV3AOTU0cMJmE1C+evoEMcEfMAa8bT5FKiLvdSn6WgYVzTyipFTkm
+nEoxs81IDaMeZZuK8PL3OYXu/VzYd/BrIcL0MvGF84ELxNscY1xoc8NgM5sm97oV
+EcoQMmD7k1gY15n0RP26QfJnT4lR5slHuZpIWm8LiXvpk+CKAn/Hdm7URwk3zItT
+4iSOjUu3kXYrU41pi0xk
+=USTf
 -----END PGP SIGNATURE-----
diff --git a/sec-policy/selinux-rpcbind/selinux-rpcbind-2.20140311-r5.ebuild b/sec-policy/selinux-rpcbind/selinux-rpcbind-2.20140311-r5.ebuild
new file mode 100644
index 000000000000..0ce9930edbbb
--- /dev/null
+++ b/sec-policy/selinux-rpcbind/selinux-rpcbind-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-rpcbind/selinux-rpcbind-2.20140311-r5.ebuild,v 1.1 2014/08/09 19:34:25 swift Exp $
+EAPI="5"
+
+IUSE=""
+MODS="rpcbind"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for rpcbind"
+
+KEYWORDS="~amd64 ~x86"
diff --git a/sec-policy/selinux-rpm/ChangeLog b/sec-policy/selinux-rpm/ChangeLog
index 293ceb400fe6..1ed58be3a3d9 100644
--- a/sec-policy/selinux-rpm/ChangeLog
+++ b/sec-policy/selinux-rpm/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sec-policy/selinux-rpm
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-rpm/ChangeLog,v 1.41 2014/08/08 18:49:46 swift Exp $
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-rpm/ChangeLog,v 1.42 2014/08/09 19:34:24 swift Exp $
+
+*selinux-rpm-2.20140311-r5 (09 Aug 2014)
+
+  09 Aug 2014; Sven Vermeulen <swift@gentoo.org>
+  +selinux-rpm-2.20140311-r5.ebuild:
+  Bump towards r5 (fixes duplicate context for hiawatha)
 
   08 Aug 2014; Sven Vermeulen <swift@gentoo.org> selinux-rpm-9999.ebuild:
   Make 9999 ebuilds EAPI=5 and transform to make master for version bumps
diff --git a/sec-policy/selinux-rpm/Manifest b/sec-policy/selinux-rpm/Manifest
index 8032d07fcb49..5e9a9abea865 100644
--- a/sec-policy/selinux-rpm/Manifest
+++ b/sec-policy/selinux-rpm/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-rpm-2.20140311-r1.ebuild 375 SHA256 45c4b887ad12ec09b8ac7d428797aa686ea9c5440cc76cf6230d7d3262374f31 SHA512 edd6ae0de2c4da891aa1b4b05ba631329dfb51822e6b82bd28b1ec3e4392828aaf1d4ce757295abc5c340cbd235bbf1102868a21e788bc1c15f66b19830cbf0d WHIRLPOOL ac0bcea5efbe85b0f5a4a6238a19ad200c6ad0c4d8b33b2f3152cddeeeaacb02e72368c57669dcc3eaeaddb181c8f26f73ed80053dc2a29dc77b392e18fd4355
 EBUILD selinux-rpm-2.20140311-r2.ebuild 375 SHA256 33a5ee738c4f66fb297a11abc4334ccc75a7caae21c1c3c30aae8f924ba5348f SHA512 d492ff8d89825826b018a9c9e73aadb5fcc489afa41623b3d219d9a0b930ab2a0c617909cff5794b14fb2f24a324e360d1b0a1eb8f96fd27236d41804eb8d6a8 WHIRLPOOL acdf353eb2e1caa1ce09df471dfaedf407721c9b7e94df7b6071debc7e8ca7eea31f564848c2d9c64d43c2902adb90aa260aed97a105b3d5a12dc9c5b9711912
 EBUILD selinux-rpm-2.20140311-r3.ebuild 375 SHA256 348d2be8dc05d893cd867c7a9cb7b9024c93ff2f17b925302438665069dd8f88 SHA512 132fb7e81ed64fe41baa93dbeb8e99329485f1049ef1e6cc01cb3b2f38b3f332ed10003cace0c9c3a5f6fb664a24ba2034394a2a5c559120c6c0bcc8cce6323d WHIRLPOOL 4a0922be9e9cce5f4cc4aaa425eed1cbc33ac7f15f5036b97d0033cf34d8f25058ad26b0663253f8a2cbd0c3355d53d062decb06dd77c9ea3c8b7531fd0b082a
 EBUILD selinux-rpm-2.20140311-r4.ebuild 377 SHA256 d15e6e3fc11a0956d90ba554a17fffe39fb4e2057f7eecba696d4e206401208f SHA512 accded26a04231c7338f682c5386e697c0b4731031dbfdd6c1616f2ad591d425d586708291b9c573d0c73cb88fc43f9d19b8722d72cd0d21d2f782114554aacf WHIRLPOOL c1d685ac5822d4dcf9b8dba64a069e2f9344c84257c33c70c4710e605937803887cd89724285ee00d9e16a718ecdbce2937e9dd20e89d46f7f53bef3fc649dcc
+EBUILD selinux-rpm-2.20140311-r5.ebuild 353 SHA256 9e40b8e15ad808b7fc275ce594c7536257efad1f6b4cb0413578e13c79d86d81 SHA512 f7180214ca29d4a6fb619e2e2b104c6db019d2facfbe36c8c2dbe34e19eb029ff90b79332126a978674f9cf7f26d679575882da741a01851ad31881246261d29 WHIRLPOOL fa3f859f3bec5dad3a90663f484f207c8fc3d7b5f0aa27c41af37caeeb2479910a8bc44d303da8d317cbc8b5f8c0a50e6c56b76e6757ef87a12c2435e27acaeb
 EBUILD selinux-rpm-9999.ebuild 333 SHA256 165959074cfabab8ce9aee1b3219cf483e16024dcafa46cee909dd581b43b261 SHA512 b21994f339b44124a41c08c57043eb3e896f6de0ccac386a796390901789c4f55c2dc54f018a614c863c91b335e0aecb0c104882bcb69719c526cf54b718f8ef WHIRLPOOL 2ffab82262330c51428749a6511a9122c998196ff4949bdc54bedf764e2d4dcfb85f1bef6191252e64f0b6cda6a1419306a823380781aaae62caf12097da9fec
-MISC ChangeLog 6203 SHA256 30630f1c1312516ffb31c74d2d71cc0d3d48a5204812b1e9e00c225d153f8fb4 SHA512 00e203d7dc87d67295f98dfda7256962475ae7454df354d45f23c461c1944d5286dda992149c54ed23ac8b270bad166dba8a142ff14197976945211daae79f1f WHIRLPOOL 5b0cb1ee8ada40d9bfcf1febe171b0ea7aba2db8f4b0f06d0171e801ef68d49422bdb3847e93f289b15606683d62651a6fbbc4f7357a4325d996d8c48182cfe1
+MISC ChangeLog 6389 SHA256 08ef3f32680ab9eef92c902bd172483ed782fc22e5b0c4b395b418371c211ba6 SHA512 7e1237fb5fd4044053595954c40a1ba601f01b2cf026229ad9d12284ef4c05d5a90dd1550ba223af0e57cf46f74d801b23758344b19edd4d6c45b4cdff4fa037 WHIRLPOOL 7ec6dd16d55644ca03b451dc80f508aa3f008aacc059ab4a1828390a411041f21fb2a9d10ecb72dd70ca412f6239b93d4d7ffe2954dc78ee44323f11a03dc068
 MISC metadata.xml 227 SHA256 0a8a3756eb41ebe13c9096e7f7aa42be79f39a3546549bd6f2b97aca42ee8d8c SHA512 eb58ec28403d447e7f153a4d624053cdd6e26dd16480717500ee3cb52b1e262a593d51f788f9a83831a10cabf84692bd4a859bf58546ff972202be858fcff15a WHIRLPOOL 4c62b30f85b2cf822381c99d779b72d695dd35416d72ef9f2fc1ecd30e25bc38b1b7ae5b94774157d0a6b69e08d961b062f875ad2e2d929638c6d065a60baa62
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0
 
-iQIcBAEBCAAGBQJT5RyWAAoJEC7dUkA7aK9HASoP/21G2JGRJJrpvbHr+qrLojj/
-JLWqGD480qUP8gENhEx1oN3e7b3z8RZuZs7nPsTVhN6ZPe85iUENWEKn+BAo/SNF
-5FwX5tYhxkU/BJAi6r6DUD7lskyBTcK7+50t05qZe71UOZPLASdlG4rrsILgzyMX
-3AelxwVSUD5urDzZpCFp/oX0VZ9sys9WR4uah5sGDpMWFxxGbzeeFjrE/NRmdxHX
-R0NSeTkppeUKqcKQWkDaKp5h5/5HRosZuYTG2q3WynJUBNY0yWbtBJ648N8YarTz
-eOQOwjDBF7nVgvzvJHSW2vOWuyt9nLBXJDXiMLTldaj0h4t1LpsBqTl7cNpt/NcE
-WpZmY3VOkg5QgXRdqVVRkATfvrS8Atj6U42NnzDrZ3MGMwgIZQNfWh+/2mL6AV5E
-2+um4fQv/KTnJzNAsTIbCuhvEYSvR8dPAbJxnu+kH++99CSycxDWG+MNqNCuGR2N
-mGYNoJC4jXbyUXH4Tmgeja7jTOkPur9saX/Exfl/NTS09uhO6K6RFxCjOZ1T63Hs
-JVMBJHyTxLjrkA2VWyJR0xKSs4zheq/JqodoXiN6STr4dEJrwHX+1+RcUZrj/ixj
-fvUjgS6ka/XKj4ygCOhPu5Yxefkob+mHdNj7jR7xjhC7NnFJ5Geybg3rHe+qyzoh
-aUrLa0zm6vJoGd7HiN4v
-=v4ly
+iQIcBAEBCAAGBQJT5nhrAAoJEC7dUkA7aK9HipAP/2xTnLE3vuJsbrx2pVr83h/R
+um2V0l/3BwfDeVDV6fsVu6LWXq6RLpJqzzVs53CMnukgyOg9qDWMzWynGdMsuBgR
+XEArQ+E3Gd0cd4Ub/Qrd/i8OVcCbdfDgMG/m0ZL9uHrrsZ/f76sdfeQ+qbJ8Vj4S
+H+zMjcD2pySIXrAYuW7+aSgqmkGIolBJutvhVO9T1eriK4c3NgQM9FJRKoOzF3sF
+WkOvreg1VRE8FKrmsZOGG44m48RbETnLGWCfuKI5VXNMaSluwv2TwjS3aaQ3d6Wl
+ytN9aKX/9QR9603DP0gGE1LhcE8r64H7kWXmvSXevQF7lTUBqqX+2s7HdoVVRzHI
+qXxeTcRILc3vYRCg2c0cCyzOIc/nfbHsYEBmJs3vrqMfdiSPpK0HTZ65TT6x9gMX
+/cFh5LnMJocAhcX3SnVIBdCj6XZvXeMsqFayuSChGV/wkwYcCJmRxSD3CdCFIUUE
+rRFZHaNSUmXXjFMi0/AZ6YOGIfPKx1Yfe6escmUEWiWnTkYMo/x6bWoYOtF7Tsno
+zUInXrDejMH1i/xY+Lxi122SCVLZkjsYM3xNCnIrMvBIdCEwGUdIn5uAe7chIQ55
+qMvxLCDRaw6NbPrRu6kcqaSpWYzidGu7UfKTgHNQZiqM2VUWiWdMMiF8Nsa7lbmB
+BEfGqU59m2FtnKGi14ae
+=Hvsf
 -----END PGP SIGNATURE-----
diff --git a/sec-policy/selinux-rpm/selinux-rpm-2.20140311-r5.ebuild b/sec-policy/selinux-rpm/selinux-rpm-2.20140311-r5.ebuild
new file mode 100644
index 000000000000..231e3f56a9f0
--- /dev/null
+++ b/sec-policy/selinux-rpm/selinux-rpm-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-rpm/selinux-rpm-2.20140311-r5.ebuild,v 1.1 2014/08/09 19:34:24 swift Exp $
+EAPI="5"
+
+IUSE=""
+MODS="rpm"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for rpm"
+
+KEYWORDS="~amd64 ~x86"
diff --git a/sec-policy/selinux-rssh/ChangeLog b/sec-policy/selinux-rssh/ChangeLog
index e592d6475202..26a5f4400979 100644
--- a/sec-policy/selinux-rssh/ChangeLog
+++ b/sec-policy/selinux-rssh/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sec-policy/selinux-rssh
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-rssh/ChangeLog,v 1.42 2014/08/08 18:49:20 swift Exp $
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-rssh/ChangeLog,v 1.43 2014/08/09 19:34:13 swift Exp $
+
+*selinux-rssh-2.20140311-r5 (09 Aug 2014)
+
+  09 Aug 2014; Sven Vermeulen <swift@gentoo.org>
+  +selinux-rssh-2.20140311-r5.ebuild:
+  Bump towards r5 (fixes duplicate context for hiawatha)
 
   08 Aug 2014; Sven Vermeulen <swift@gentoo.org> selinux-rssh-9999.ebuild:
   Make 9999 ebuilds EAPI=5 and transform to make master for version bumps
diff --git a/sec-policy/selinux-rssh/Manifest b/sec-policy/selinux-rssh/Manifest
index 2718d08ea9dd..26a12e8a7ce7 100644
--- a/sec-policy/selinux-rssh/Manifest
+++ b/sec-policy/selinux-rssh/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-rssh-2.20140311-r1.ebuild 379 SHA256 e82228165f2f7062d6b04ddc10a9e1f6fbc6722190706a9adaed082caf46b525 SHA512 adfbf28157c91e90f1ec6e5054e54aea91823be17f5c22850885fd36b1cb6c55eadfae118f3bf887bd089ede9909a5642e6709bc8196dfda865d9593234c9761 WHIRLPOOL 223e71fda82776bcd87200fd392ed517e6ada9379ab2b6a969f7a4ac95d1dd12bbea0431b5c351bc9564733921193d0bf9ab07e7445ec6b69bad07b6bfcd8526
 EBUILD selinux-rssh-2.20140311-r2.ebuild 379 SHA256 f1bbf943a7b2ff52be0f688c8f6ec20c7ef2b7910dba45e1910c6293f6a81a81 SHA512 b124db1aa7f8232f2d6d1aa57e9aa7e42cfbc9399595cb517b7442a7974ab4b7eb366252ac0fc7260e29f56cb9e2dde0cf043147e35fbb476ebca7dbca783354 WHIRLPOOL e878c57ab29ea54f94d23a3389471e50a4c8da4eb4116d15de22c9f0f6c1a2dcd75bfea8506086fb2f1c05736b366799e6d4c9b3821b9b2b112e9dd72d835135
 EBUILD selinux-rssh-2.20140311-r3.ebuild 379 SHA256 7632c15cfe676753c9f343e190c5eeb58d7475c4be2f35fc10a1c08af5f21845 SHA512 a7ac64a0d6199df0e1c3912b766271f356f64f2df9564139951c811d9d2287c0af3fd52f598dfca33165f80837e61509d18d4676da3b149a5129f67055b9d98d WHIRLPOOL c0f37ff9414a981a4cf83da1c1cf1ce43274f799256f03746e928c146f6c1fa893a600b60237e552341e7ea1d4ad7486da1bf2a87d8feb53c9a32a029d643e86
 EBUILD selinux-rssh-2.20140311-r4.ebuild 381 SHA256 f750850be02bab9e9ec19726e503f464f0f10b7390bd92f2bfb985241edeb449 SHA512 0b5f364d92894a1ed789fa91a6e9155180d8ba7b28c0c4dc325a4ae4e160f41d52d067e537996f9af8cad18d120af033181d073e2caf58408381ce8f8689b5c5 WHIRLPOOL 2e1a9c854b815fbe1a4dbd8e61ad0bb1a9a47059dbfdd39d46f8d798cbc99ae971b9ec6b928043240c87b24eb4bc3c1605cbe6a3db6313ecd17b0e69fdc0cab1
+EBUILD selinux-rssh-2.20140311-r5.ebuild 357 SHA256 ffa1cb74dd8a5b6fb1b9e2ea9d6903ae495f136b285228a045c4a8ecececf6f5 SHA512 dd6148a5cf4d050100886a236b31d89c252edc8cd3ce3677c4d10932a0ba1a6dc61ec82645fdce25a9fc6e87722a1bee97e3de4377d7263a4ffa628ea5be9e1a WHIRLPOOL 596794e7020a653073db2a3cb57ed0df866284ee86c126fa52b011bc61927fe96a59eafa22cc3303383f86849a8dc9e0f081c621ebfd374e2327a008313c8357
 EBUILD selinux-rssh-9999.ebuild 337 SHA256 7e17193ee39c592122aa8a9d8b28a023a34f177a67e71bf7b491912162d644b5 SHA512 164b5bad430ed66ac9b52fb0f11d3d0ffbec221320c3ef3cb777ca0f7c82ec70d9398ab01923736c00e5aa21488fac9248347c8f5d7cc4594712a861956b3c81 WHIRLPOOL 7b7a2ca98e42b3eca0575d3b8665e40af26e83647a541b6024b320bc6eca6bfc065db71b589ab570bff6a6094fc8fbf331f032eee6c02f11bffcf6cbd7d57c2d
-MISC ChangeLog 6361 SHA256 7e9a899e39cd1daf30323926ea2be505420a22f57639b740948142bbb957a915 SHA512 0b18116fc0a5441aefa944c19e9acdb440d78e92da57c115737f90dd79dcdb9f5e9e041db42310a1209e31b49691cfdf764eea5584705c63db0a969e3283a485 WHIRLPOOL f00cdf725fb6b8362974d1cc750015f266f0172982ae4d0d8e8e040d63e49d774481c8ec8bfa7df9cfa190b4d3955c0692d19f310263c423522dac5d8134cf8b
+MISC ChangeLog 6549 SHA256 87410e932aee7b720cabb360895bb6b90d76b302b47e3c26c8fd2aa5dcbcbd37 SHA512 58559b2c10557ab1322141ab2dcb316c403d2f36f998915577d6b82ab29090f7c6ab2a3823bd6eed91fc8d7ffa6951a2e609dd45ed6dcebb673b3c76141ef624 WHIRLPOOL 480ed7d592e0b28768c9c5bd8a8e642ced88408981f8f386dfb6c31851ebaca69edb8e422f67300a0bdc80fc623bd8a72f7ef6fe4d0ff8471c5941ec642c1cc6
 MISC metadata.xml 228 SHA256 0cf762f0ef37159e327f29dbc3544351707f01c7cbae46368e61064bcba70ac1 SHA512 194fd113a4fa10e97847ffc4a60f17aa2514bde8d05fcbcfb571aac0d258a296bcfcab5e56ba36bf8f26557ba978160f6ddfb29a8093bc5d77bcfba31bfa72d8 WHIRLPOOL 81685c9907326e4a4c2b95fc43b676f091edf7c1f98f78037f2be272e8f031c4bd26f5700436169837246e4cf8cd422295a9f3a5d4a653313b478cf265ee7044
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0
 
-iQIcBAEBCAAGBQJT5RyWAAoJEC7dUkA7aK9HTPcP/icxlp7sn2VgM6lS7JcOb5kS
-pjDaFbwTPJiHXrOOVy69l2vLuVs6CLNarloe7t++CXdx30XBQH+Qw/qZp139xUdb
-d5ZuOU5MPGKIOC3RO0Y0apkupGaY5DRLkr0QyuCzOi0obkoN7/4s1xBHz9mc8Fyu
-4oDWknCZsNICTatGlOCMxvYFdbaQoxGKlftu4Yu2GvFLBm2QF1XJgHIFzU3dpo6K
-WWBBbC4eJo8NWk6pEBw3rPJOuVepmEzp+aIJkwX1EzVQo7LnG9XgoATGsFtJdZgu
-iupq8YTI9C2hnbRatXFfBBuNjpjie/tfmYhwzdVeQxL/C0hYpJo6HuZDDhSsWgVX
-VyfSLwspCuxOuU2UobPVpB5LReBVKWh7P91IcNNe08LsCuvucv0zWjnVUBw6ke8X
-e6wbrXmVVzmJrtjqCbcK5ZytxpvgZH16wVcU55sfXBSx/XPWY4uWQL/HXD6RiUg+
-8zk9ojn2nCTM8z45O7I3dBATY1da4ZgXDGaZMnkq9nS5rkxuNio25FaBHl+Me8XN
-OMQBd5NKl50LxLr1Dmxy7lUCxI7VunjoE3XzIt3ySxVXe83F3I0FpgN8c7u+LQiw
-w5qyd58XbvA0kKMo71owLUxlDDN5yygoP/L7qs89Rdy0Qyznsx6AZ7ARJU4tsVRU
-3hC/VNAP+3oVS0AtoS95
-=RbG4
+iQIcBAEBCAAGBQJT5nhrAAoJEC7dUkA7aK9HQKEP/3javWafGup5gncnS6e/tXfD
+YsRmvTNSd+cDCq+iZPF0xg0Bul0bxPW0JPt3152ccDlBt8AEPAXSApZqBUQtsl3N
+fMFS0mTDTuyOS8hnkEDuE0MdxD1Zl6vZaoW6r8n6VAD50l2rPZbjpbRaqZrBHWOG
+qOztebp05PYEhPheTeDYvB5CqJXbgD0cYpxVa8LTczhdjRO1o6HlWNFFUtEpCtLl
+A2y3C8Dq5M8jjY24qUyiwMcF2PCWR3cy5PUxNvhPm13s0Bpm7oKssMUPNvdmvLYx
+KDP18ggkoIbgEhPHrrUMENCNsaFmVfc4s5YN4uASUbmCZ74TM/CK0IT8OkKUElfI
+yxbFKaYZ3QCzYUKiSRNRiHcBShq8FYbYEofmv5isKsqdlvjF6rhwpyGEaXZOFa/S
+KJsKxQ7jMYHCMEVtI4otMbEQj0I9xeiuwwFIWWRoS4bcSJrfte8ovyMe0uY+29Ot
+Pj8BDmTwwxl4WdxkZU7tMFcw92cBMW36Szs7in73j7hJ7gxgX1xm2DMzLUB7SDe5
+BlTUEbREax05Q5xWbrLX8fK5OlxC9sKKSrTZ73ZOeryou3FLPj0HuwOVUihV3Frh
+d3WIgrZ6U2zKUoZRS36a/KaZsLZajSApvfMWzdeGs9r9vt4ZBSo2MZ5IWuIaAwEx
+1aezJNxgLpai1JemEsu8
+=I7Vw
 -----END PGP SIGNATURE-----
diff --git a/sec-policy/selinux-rssh/selinux-rssh-2.20140311-r5.ebuild b/sec-policy/selinux-rssh/selinux-rssh-2.20140311-r5.ebuild
new file mode 100644
index 000000000000..f4cf7713e3ba
--- /dev/null
+++ b/sec-policy/selinux-rssh/selinux-rssh-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-rssh/selinux-rssh-2.20140311-r5.ebuild,v 1.1 2014/08/09 19:34:13 swift Exp $
+EAPI="5"
+
+IUSE=""
+MODS="rssh"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for rssh"
+
+KEYWORDS="~amd64 ~x86"
diff --git a/sec-policy/selinux-rtkit/ChangeLog b/sec-policy/selinux-rtkit/ChangeLog
index 19c1c69e3d53..6de42f715985 100644
--- a/sec-policy/selinux-rtkit/ChangeLog
+++ b/sec-policy/selinux-rtkit/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sec-policy/selinux-rtkit
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-rtkit/ChangeLog,v 1.43 2014/08/08 18:49:40 swift Exp $
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-rtkit/ChangeLog,v 1.44 2014/08/09 19:34:38 swift Exp $
+
+*selinux-rtkit-2.20140311-r5 (09 Aug 2014)
+
+  09 Aug 2014; Sven Vermeulen <swift@gentoo.org>
+  +selinux-rtkit-2.20140311-r5.ebuild:
+  Bump towards r5 (fixes duplicate context for hiawatha)
 
   08 Aug 2014; Sven Vermeulen <swift@gentoo.org> selinux-rtkit-9999.ebuild:
   Make 9999 ebuilds EAPI=5 and transform to make master for version bumps
diff --git a/sec-policy/selinux-rtkit/Manifest b/sec-policy/selinux-rtkit/Manifest
index dc76227b3cda..b7fabf5b000c 100644
--- a/sec-policy/selinux-rtkit/Manifest
+++ b/sec-policy/selinux-rtkit/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-rtkit-2.20140311-r1.ebuild 448 SHA256 595ef7445ee70236d0a7c7bca4647e1a870bd7b988638a72c225f5f6a150de26 SHA512 d28ce133f6c6fa534320e973703b0463984cb882958040a51e37bcf08b2393122114f88ce7efc3ac6d43b86f5c17b987e8fbb1361a0929ef7d5d22ea1cb806ee WHIRLPOOL bfa080817088e2846e207ebb48729d1f040e7efd8e1203b40f1af07c25057fb4fd4d1e3a9980e868b844637dd36c8ddca5630b5fed8e4b45c7ad7b0aed1615bb
 EBUILD selinux-rtkit-2.20140311-r2.ebuild 448 SHA256 0a2f49d17c93ba786a9f49f3d5d18683f677527d7b96047d18e740e94b192b27 SHA512 79d59e31da1871448761c27a57c23b0a3bada024453900e19f919aebf9b76d9669aa934198654677b799396ea7cf4c0753fd3b869dbbd1815f6d36c49b3e2fac WHIRLPOOL c205553a2be1c2ceef6a504f64c1d2d2bc21fc12e6737ebb2d26483c4df1cd5ef1903c9d29ae4e7bda7dfa509aabddb90d182093da1deb2b1fd9ffc234e4ba67
 EBUILD selinux-rtkit-2.20140311-r3.ebuild 448 SHA256 012c10e98edb2f505ef9d4f35da2f4f89db6a04c3cea34153523c0b81d584f53 SHA512 6671c8d7282eb30f614d379dc630850daca547eb65a16ab01338d749f5b7d57f88f4e02a5472d0f309e6d6574bcb52c291ed9a8c0f20b9cd882a8131e0380360 WHIRLPOOL 198c2dcf1039b8586ee017d74f2cc0b4cd867c20c4c531f5003ea84d1d02753377bd06db9691697c145f845d191efd87a0fa9d903b716db5e09a18c97732402e
 EBUILD selinux-rtkit-2.20140311-r4.ebuild 450 SHA256 d0f944da33ea23e0500afcfda1687044bfb068ebd7701a83ec3505006a3686d9 SHA512 408a30749760b1f330390ece20b7ba420320b6f6be77fe31d4f3e0f53fb6b5c28efd6c592533ad168bd122e68d11092bd27fb8ad0989bbb94f2fca2cc63413dd WHIRLPOOL 7020b82d04752277cd86442ec98dc5ff297b3b05b95874f27ecfd8e805420c00626849caba6ada07d0a29a210fa502e420c523b9a82fcf4de8b2fe78e2468182
+EBUILD selinux-rtkit-2.20140311-r5.ebuild 426 SHA256 d306f8d3434bf6c80d092570a8b1a11793b20cee44091f129e4d889eb806056b SHA512 ad1ea67319d440d88ad4c139104bd2da77cb89ed986bcf01916f2f8ba0d6ca68737a3d8e698cb16f8bf149c89ab40f4c10ba3ea61ec91b8ce9117ac42ad03e28 WHIRLPOOL 3e8d7cb3332e6b8cbdf1b24644a72d739b717b8966e72261e506b271370578369e7f81820f08697a1e221fc1d27a3060d0d3204e68f27684f1c9b387b8c09533
 EBUILD selinux-rtkit-9999.ebuild 406 SHA256 96246aca7199bbc41a9843230178ea779e0a71198ffc0979214aa693fcbf6024 SHA512 5c10f4b91b30a7bbfd7be223aa135edb2d5edd5e010608384db3c263ebbdf1ff6e0e244959030872136191af6541eaf04a40f56704bfeb656f82601b083fd0b7 WHIRLPOOL bc65d1735ce0d44cdd26d8fc1605e929ed56d469df7ff04ff61956465a75ddffa18a126e311362be480690c4a6a3a4c43d2d0d25cdc56e1a00ccfe4e4c0757ee
-MISC ChangeLog 6574 SHA256 d0c57f84ca8fc8e388e2b0d873e896a18d8af8875d59051581134e74e027e575 SHA512 e39a25f41a52e1b5c8705f04c31172201c288f400a70049909a8d96541a8ee206e0e9cf56456a5ea8b47e2c11511ef3dae2397f6f5f9a005e289c761692f6f04 WHIRLPOOL fa9535c82d5cbaec1f83bafe53290105d828e8074180a763cbdda16940b69028c83f1b86108a247a8035d531b3a10f6e6fde4c512c9e799dba3444e4cf9ce12d
+MISC ChangeLog 6764 SHA256 352a6f837fe1a3e3397f6ce5dc87d0681649e80aa57b8e00fdbb7f75ab8c1041 SHA512 6ce56ca3e22e1bf8d54ce03011eca84927b669c48fe7f7780982ce796de45243f84eacc28a92af06114c8dc5f3ae3c0116627fc75bdfd187b699bee449a1ab41 WHIRLPOOL 8992bb388e1aedfb221d0161377348a1d5a8c3be4672420b1b599280b7f43653b4d74936fb1bd176f995bb07ff750b080b4f85e30a679364471394f24a1f41c5
 MISC metadata.xml 229 SHA256 04e6a8fe4575194415c95da4007a0ad0d5ec5c352d97c7683c021596cf77cf9e SHA512 20068be041dfc2011cbf72059595f0e6a2e79d4a3fe68cdee5897473914fc24cbac653451cfe6115dba3c99232fddf3ae38c2f83ffddd6559a53cd2c7b860293 WHIRLPOOL 44842c82f80d8e1c54a90287a40d7b57fff65bb26bc521dca639a4565e1532993a6038f4d41d407b80b3efed747807912fec636c3957bf901a811db1f4bc7022
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0
 
-iQIcBAEBCAAGBQJT5RyWAAoJEC7dUkA7aK9Hu/AP/0K6ew8yk64Pney1Ib6B16nC
-HOVTjMe/N7ZLYzvf83UP+DDzOlYznW6VyfSEG0op23f8aSuWfp79zDMIPkkkwE7O
-GrApKN1T7nW9zNkTdkKmM/f2FKCOlbYtpcZMb0NwjNDykHMtlKkxvD7uCWWZSSYT
-W0ynCPpILUw5CL+Gtqi2fc4aFggfwf66KgqGp3on2uFFaKJK90pfhLWwUaAXNAzt
-O8gHZuPFHoEFIN2Qk95vF5syTCbOLLXysTC/UctFYTT64rFYqTRRJpWA6XSFcyya
-S4Yg4JM4HgI8FTFFXyE6HdG4F29ouovRe7XkL6ov/2xmzRF+Bkahu9uB+zbKFt91
-NEvHS1Br/tsg6RkXMSwx29kySKppmPPDuVkomCF37auuWGQuyQin4dIGcVSWBCae
-/qwMpMO1dBNGxNHqlgXLakMD6O4AlumqaEuR41KNWrWWqE7BSbNocw92Rs3gfkn6
-v0GCXN65IyXw+zC0HyyZHvlhJvS4VKYy74dL+oPnwXKd6HqHfJYfOxTd2yKLeMSq
-iOGhTQN93YuFpycMu83NmVkhUr3t4ptXTGnRoUu3+IkAD+s/2rIFrLElUMvgmfF6
-hZqjgvFRKoC/9ypFR9FfXBENALCVM8P4X8UU9Pbj21fUdjOgCyaMv/x3DKk1iQ4L
-1RWgfCKtkZo+g0HtHyuI
-=jFWe
+iQIcBAEBCAAGBQJT5nhsAAoJEC7dUkA7aK9HYFQP/jxDHzQIegH4IKFDKUrtHtee
+W4+Evjs6X3gbsG+TNW2M+T1EmwHvg4TJyoXp/mWZH99zataD+JBzk/TBUN1eavit
+0eZeXpQ9nbl0SQWCu0ya9Y/1jhO6JensqkG9hr5al+AKm2TsTDLoyJHmlKcylbk8
+Iz9p+y5qyPqf7sVklp0UJVd3Gsy6cU2CLKS7rniIbXOuB+O7E4RIpDd2MroVMgwv
+IPl8qzH0DExW2gY/rknfnQwB+qmiIlL0zS3vVXPj5oZKRBd3+iDE/VSbQMruFtPo
+wQgh0eEgDlH47zjL7a7fVLV4B7RLMTJbdY1tEw+tTwgEYKOG7d7J1OtjfEoHZ+Nk
+1rP0pqNCPD1tcbAbJPTj/hP50BLLDuAnIXYZe2dT/+EKAmFL/AmcSXZWmlD8FoNa
+ezCIFDmDxI2/dcAV50wx9kcdgk67SnG1s6wfEmx/rvYuiqjmNdLlDtn6qk3wBHK8
+7Q69bc3Zyc3dCA+Krl16nvCoWFw1EdLjtZ+yKszkWn+m7By9NvLaPj4k6H8Z0z6e
+32VhtC2r0G9CKlkr7svcD/sNFbM67VSq7VRWg03k9Y6SAcRbWK/e4IDc8H2DndDU
+p4P8v8ivE/qTWIv3cANAwHlDBB1IatXjnWiuV4e35pM81Y1O073cMNKmu/4WDRvB
+w8vXOgBROcl5a/H0Fr1F
+=rKPa
 -----END PGP SIGNATURE-----
diff --git a/sec-policy/selinux-rtkit/selinux-rtkit-2.20140311-r5.ebuild b/sec-policy/selinux-rtkit/selinux-rtkit-2.20140311-r5.ebuild
new file mode 100644
index 000000000000..b6ffc4cda09a
--- /dev/null
+++ b/sec-policy/selinux-rtkit/selinux-rtkit-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-rtkit/selinux-rtkit-2.20140311-r5.ebuild,v 1.1 2014/08/09 19:34:38 swift Exp $
+EAPI="5"
+
+IUSE=""
+MODS="rtkit"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for rtkit"
+
+KEYWORDS="~amd64 ~x86"
+DEPEND="${DEPEND}
+	sec-policy/selinux-dbus
+"
+RDEPEND="${DEPEND}"
diff --git a/sec-policy/selinux-rtorrent/ChangeLog b/sec-policy/selinux-rtorrent/ChangeLog
index 3e1beaf4bdc0..15c8c79a31bb 100644
--- a/sec-policy/selinux-rtorrent/ChangeLog
+++ b/sec-policy/selinux-rtorrent/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sec-policy/selinux-rtorrent
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-rtorrent/ChangeLog,v 1.27 2014/08/08 18:49:58 swift Exp $
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-rtorrent/ChangeLog,v 1.28 2014/08/09 19:34:11 swift Exp $
+
+*selinux-rtorrent-2.20140311-r5 (09 Aug 2014)
+
+  09 Aug 2014; Sven Vermeulen <swift@gentoo.org>
+  +selinux-rtorrent-2.20140311-r5.ebuild:
+  Bump towards r5 (fixes duplicate context for hiawatha)
 
   08 Aug 2014; Sven Vermeulen <swift@gentoo.org> selinux-rtorrent-9999.ebuild:
   Make 9999 ebuilds EAPI=5 and transform to make master for version bumps
diff --git a/sec-policy/selinux-rtorrent/Manifest b/sec-policy/selinux-rtorrent/Manifest
index 3c1acdcdabb8..ab602f884610 100644
--- a/sec-policy/selinux-rtorrent/Manifest
+++ b/sec-policy/selinux-rtorrent/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-rtorrent-2.20140311-r1.ebuild 395 SHA256 3eaebc33b1abc349b4e189fa9ec439b8b9e323176855a9109a4de1e5addb07b4 SHA512 043b2f7b4c19ff87fd013604c3afb7e1c4173cba877c954f1fabd59dd0524b6299edbfb2f211aeb4a9ff29e7cd6ce8c25bc1c8d0a2325d383902a0b569375572 WHIRLPOOL b84b60097161bd2742c09835bfe1d8650f2aac93578beb3af8fa8c85c5ed03fd72c40d7b8961d52634bca207b2f6792016f595b893794b866da54e61e53eadf6
 EBUILD selinux-rtorrent-2.20140311-r2.ebuild 395 SHA256 2299d08363072b44488169fae563736af58d2ed3f550ea4b6ad2849638070921 SHA512 d2702ff4cd5fa845b37a8980db94de21ccf792ae1247f80046be16c82da54fdae21b01cc65c1757d0190bb784e37eb1bbebe024fa343937c218c585ab0d03607 WHIRLPOOL d7615b105d8010ea89348e76cf48648545f00152abb8bb4032fcd8b7cce51f9a6aad372a3e308a83d2c324ec26ed095dc81bab5bbd97cfaf36c4597ec4ecc00d
 EBUILD selinux-rtorrent-2.20140311-r3.ebuild 395 SHA256 8304a882537f47bb0f065337ddd25e3ca345df320a4b319cfdd1b7ac7a132856 SHA512 621e94590b42ea7fba9b0c517fbdf46c8c6d6089d9ee935f9d348341e379618be7ee6623a1e18be933f9a2712ec66d55d2b252d49714816e155418231ad806af WHIRLPOOL d932374835c39d85311fe8dc431ae8f08c47d5f1f7e9c2ac0c00c0d4831e81b33a977183258f63e7967089b7e0eef6b1fb86433cb12d5c47a650a1cd6bc4c18c
 EBUILD selinux-rtorrent-2.20140311-r4.ebuild 397 SHA256 8a7616d23b5dabf593a47e849dd1e703b431bba878dbc44155a10b305358dc42 SHA512 4f48825c5f5edce42bc1c404c5e2ec628dd0d75da4875c2b5b42916a5201b7b617770dd418a50e9b93e931ba9d1b0a8f508fae948bc17535d36f6e16c1d3f812 WHIRLPOOL 08424db7e776b24093dc03145772a84cda8e3a2ab9212fd469bf6b9c906e75e614a31df9b6f4721eda61d3dadd95b45f831851ce5cb2919e80ca5ee96ff54d0a
+EBUILD selinux-rtorrent-2.20140311-r5.ebuild 373 SHA256 fa609196a5df213e1523fd24f1a0c1cc32f51ec9641aaa945635389f10479b02 SHA512 98acc697fc470d88bc9d7c0a222d932bd5418f18de87efd8fc331a0c7e899cc5967b19c9433031c54f2ecf6cb045e177e28788c1a21d1a20a01528f4d88026db WHIRLPOOL 45a775d937cda6022d4ef746ffb08308e054068d43d735ed4179d80d6ef8a18fe3028c1d13e51c1e22d000d753e07c0682292680b50e78eddc954265c6db9c82
 EBUILD selinux-rtorrent-9999.ebuild 353 SHA256 fcb75fa389b4ca144094b2a6b722cca2d5f2423cccf071c4467dffe2ad184e0a SHA512 63e9f5b66e758d234be1c8a51aa3d99310715db3e50f5e34018de7708fe310f5ee422df74af0e5ddf84637f5e821d05d7a127af4c66ed0407bbf3e8e9c0b2dbf WHIRLPOOL 1b667233af39b5c93cf36b7b5ed4752b82c4952e958707260e6821e5348edb68f5fea7a70bee068a8c446bb5a71cf70c50960a200c9277b699fdd21df889ef93
-MISC ChangeLog 4498 SHA256 d7e48c539362d55da82cc9697f7406aee088d920a58987544c30fce5faa08c8a SHA512 8792fb5e5e97c8f6c075694e60ade69c8ca3f7f95c5604b0ee5134b836498b82d85911139f220001ccb15553ad6229ac9ed98a84bc5539949d3521eb4c6b19a8 WHIRLPOOL f70acd2b73184c8a4b4cad1226f9107c8cff72d64f607f44538c95d6b18a68c7af871c65ccde60444d04f1abc817d2f0595be5aa2096327e2bd8e59838149c27
+MISC ChangeLog 4694 SHA256 b6bfdb26f62310c26cf53d676cf756c30e2a90d78afe743877832d9c923c7c03 SHA512 395585b2680e44dd92cb8dc16a5b88cd02de79e22b583694e44ae60ed44b7e29f92bbbc50e7a72697bfd985247377f710bb364cce59ae210069b417cd867af06 WHIRLPOOL 3a2b794863d06f455544e691ad1217a84217a7c2cce7b2d800c5eedce17f293645664f7dce8f9971d7b2acdc91ce542baa8fd7108fa8a07c32e0a5e391a47e56
 MISC metadata.xml 232 SHA256 a5502bbe4f531f78dab05bbf4fa8e6ec049940a3134a281656ce8fe56e009f3f SHA512 35bd1927dc43fbecbf31c1fee5e35815db5226522e0eba5b59925979c411480ac0862613bf978a76863ce19710c2f7c62bf5fa569e129886bcf1dbc2feb6571e WHIRLPOOL d0de29f347fb4d8030cb4b306bda373a527244f2edc89f51cdb4f1564771ee63fe23e88129ef94355f37aec2d02e76e97dc818a4b1d387b53283093c8329340e
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0
 
-iQIcBAEBCAAGBQJT5RyXAAoJEC7dUkA7aK9HtpMP/2HusJhMQpT2PktjnSr7Arzp
-6JmIxLcst5zhjtLBKbAs1JbNJDiN4rkJtXD5ku3XbwRtj4R0WrWTv1fFnxHqfZX1
-aRrLIPFDpqJXbkJ9xk1ueMYw9B1lYmlIpdXbbZeuC7lqXv4ZtkObb401wVzqBq6G
-EFBc7TSTmVwByhpXuHy8tc42oegtFrrGsVLDZvdgNldw/FfoWwhwYbDP6Np67LS6
-7+VpwXYzL/ETzt0I6Hogy+NnYylbjC5ZeH0QpeW9gYHXfsMNYTs2VPTr/HMuh/S8
-PNXIajks9+p5ox6LX9FQpxjiYO3cNnWE3wZ+v+nMxQw2zWgUgZgdxjdklNXrMqno
-Pyh7xjAXPhdmWUTD8FRslTjzxo5tivHAb1ElnKotR2zYAduelLbx5XMyCWez8vpJ
-kBKPfAyQoWjV1LFSiiINS39QSj1GDjT9ktnpSYaz8kp+uqBQYvwlpRunR9sLV5oM
-qRiCC7o8UJnCrdqyMCUoFEiq9a7PV2q7pGsXm8q5Xw3KiuH1i4Imd9QgDEOGEASr
-yoDxVAa6nCRzFX2zgTp454OD2Nfm3NY8Duop5cv0yV/viznkgHSvP7Vw4KEx++rk
-QlfMhaIwo0qLbRROSbBGClV9JgOGyBCvnl0/rusX11FEebwJ9AF4r7iWLeoBrQzV
-dehhPMGkA0TpADnapRjw
-=44sD
+iQIcBAEBCAAGBQJT5nhsAAoJEC7dUkA7aK9H7+wP/1H14hodB3lXsrVYd1iCxl0b
+h1JGHpfVMFoIYzAKgoX/6DrWru+F1+lsEaIyz0ZCsd18dvWfvaPkUDC2O3L8anNk
+3uaxk9UfTC12Q5TT0qXdFRwBmVh4cLhsRncNHRI7mTeBO3T4eW3y2WWB97SvgU5V
+vIxBV1hwhRDltz+TubawocjjujxAhru2O1LauA2n1SZCrR/vyjaDYUCFnDKU7d+p
+i9KX8n4rUwkYVRusvrjR4U/K9exiNlMOBGqHvy9pkajnhIrCMiLfJZxvpP7H7uVs
+zoVKmD5g/tw4HKycts98RVN8GSbvz+UuUiU6jrmpaDa7kr+5t4Vx1wl2KXsOd6rq
+LPrSTHRyjiuew8wqua4sqtD2lhLj6lqIbs/PI3Yeob3akbUzKsv90I6Xq/z+VfVF
+nLdw3ssii2Dvu2NkytqPVqKm2hW1w4Z28wQWMTaITK88Jm0Uc6w7M5iAHFpjGmnt
+IquMqSRRLOjNOzdFf0aiAmArLVsF65X+E9vqILwIXl3RHcpa0zkgRqc77ASR8i/E
+L4wYQwIvB51le8na+xSKXDzo+x7QwlF2BMVuocDXzsci+kJSAJw1aKG/p4wHvpNd
+Lt7WwXdBEGsWHvLy/I3C3gwgNHAfmaTGFPFbGEj7nHJX+m3YCRaROk02VKq6niCp
+Ngf6ztrC5qDFeeHtNqul
+=msOh
 -----END PGP SIGNATURE-----
diff --git a/sec-policy/selinux-rtorrent/selinux-rtorrent-2.20140311-r5.ebuild b/sec-policy/selinux-rtorrent/selinux-rtorrent-2.20140311-r5.ebuild
new file mode 100644
index 000000000000..9fec1d25862e
--- /dev/null
+++ b/sec-policy/selinux-rtorrent/selinux-rtorrent-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-rtorrent/selinux-rtorrent-2.20140311-r5.ebuild,v 1.1 2014/08/09 19:34:11 swift Exp $
+EAPI="5"
+
+IUSE=""
+MODS="rtorrent"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for rtorrent"
+
+KEYWORDS="~amd64 ~x86"
diff --git a/sec-policy/selinux-samba/ChangeLog b/sec-policy/selinux-samba/ChangeLog
index 8373eb320453..34aa8fd16292 100644
--- a/sec-policy/selinux-samba/ChangeLog
+++ b/sec-policy/selinux-samba/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sec-policy/selinux-samba
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-samba/ChangeLog,v 1.67 2014/08/08 18:49:42 swift Exp $
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-samba/ChangeLog,v 1.68 2014/08/09 19:34:33 swift Exp $
+
+*selinux-samba-2.20140311-r5 (09 Aug 2014)
+
+  09 Aug 2014; Sven Vermeulen <swift@gentoo.org>
+  +selinux-samba-2.20140311-r5.ebuild:
+  Bump towards r5 (fixes duplicate context for hiawatha)
 
   08 Aug 2014; Sven Vermeulen <swift@gentoo.org> selinux-samba-9999.ebuild:
   Make 9999 ebuilds EAPI=5 and transform to make master for version bumps
diff --git a/sec-policy/selinux-samba/Manifest b/sec-policy/selinux-samba/Manifest
index 64516280baa6..c6b799069096 100644
--- a/sec-policy/selinux-samba/Manifest
+++ b/sec-policy/selinux-samba/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-samba-2.20140311-r1.ebuild 383 SHA256 f03250d71412704176376f34fdd0ec2e9fa063711f79660007bd4aa40b27f88a SHA512 b3ced9166e55b683a4085f230e2711775b4e6fe18179d7490856698680e86b1631b93b97a2eea980553543c07a5f45dfe6aebb74220bc295ec58bbd78c54d716 WHIRLPOOL d12e1e5a7340ebd16c1898d4d8dd9d4f31ce97a9a8858e58e7bc4f363bded1e5be989bfda0dca848c18b1ed5ff5d7c2218ac320831ae1a6254c0e1bb6f23e3a3
 EBUILD selinux-samba-2.20140311-r2.ebuild 383 SHA256 190c777cbbb8f708e6faba5accee43d440498cf02a70a441d484a48149fe8de4 SHA512 03292c6cbb539dd19addd0e8f3646b974f9cc6120a87b89cb535c6d24b764cc971b303ce8b6e27b4e76957be9ed148d73d0072ed2b7b701a1aba266157c48d7f WHIRLPOOL 64c2e1a70e4d387bc8bd9f1536e2ff301f02d6eae978155febd7f29867ee2f448de9732a629302c401180ecc59d4ce58fbad92362c5134f5222f0475968553d0
 EBUILD selinux-samba-2.20140311-r3.ebuild 383 SHA256 ccfd625456bf52e547510928d02b593e5a532b4d7ffadf7a6172414da0ee88af SHA512 d5ab2501f17faa5c663d873336d37e309cb5e8688cb09fb64196216c8eff9bb5ed0a669fda45a3b40f9fb93162fe312700c4a07a7e2e0cf142253210e8ef32db WHIRLPOOL 2f875fc6d433786c71d9dd56c94261da213bccb4b914bf0875dfb5567541888c8e0599e7f9ec45855639c3a4399bba13cafaf78ade91a9bb3c353fe2a2ad75d4
 EBUILD selinux-samba-2.20140311-r4.ebuild 385 SHA256 9911c37293892f41cbe764ab793b42fc2704c5f4f25fe6368acc21370cbb3851 SHA512 ead334093c0f80ab7c5716914a5535cadbab1a49bb189ff0a65c722bec544c7751249860e66e8d09f660aa348320acd6eaa26512fe015a75ea708bd36b64a82c WHIRLPOOL 63b21ba00b317709820aac1f6fb462b3cf06e76e9abaa5d9d5d11556c5f01dbb9b4c2750e4939853e51791dacef9da4fd55d7f4e777031da9a8184267e8d29c6
+EBUILD selinux-samba-2.20140311-r5.ebuild 361 SHA256 a30ab0f54a96479716a9a3fd142b25acb0461c1224b36048265d506e0a1dd4d3 SHA512 75517706927d643b96125198bad751460f2e30b4749b7252ab6065906ca88e7f4bbd085af29b44c46be126a47888da44a33b5821b03e65d9847b60baf3a67985 WHIRLPOOL 4417722b814ff740188a0ff90ede63f0a51d03d9d261cf5bf6e0d85d9163692be5536992e0431c8e494eab3502357e41cc4a27a9264df98acd3f936e37381c80
 EBUILD selinux-samba-9999.ebuild 341 SHA256 93e1b781327d3a6d81a8fcf1c5ff81f43d1785c9b04c55e8f61a7670d38ce7e4 SHA512 744b6a79a895fdb324a326af4b04407dc3e5ed60a7c074afc2ecf9368ecc33922fcf65fd4aa5457ad49a197da4f28a1ad6e8fb906eb74cdaf3056e0794578e32 WHIRLPOOL b27b5d6e99e3520aa3295352fa7a621e321cf167c65b36273160f81a7791d482ae643cdcaa48b5946cae7381de879944aa3ef71fe9e015518b5631601f3c8d5e
-MISC ChangeLog 10202 SHA256 8046bf6616649d5333841b6910c8cfbc2ab888cb1522a5348150e45a9dc59502 SHA512 972d5dbe57ec1f957f77160d9445e357b0c1febc52968791da3840bf3253b0528f5bd6d771eb1b2e6bb049fa937404897862effcdb3683e4181896fb8dcfc161 WHIRLPOOL 90d05db2e3c8fe2bf7e8278c98124f10fb37d83dc8c9082e30cdb5c1270a7d7f505a1595b122703eb61997a0252b7a5ec37b0cf6fb846f9d06a34315c2d2160d
+MISC ChangeLog 10392 SHA256 fea8a9c362689ea6006b120fda66b1c20e7fe5ced37358bf0651e7906b9016b8 SHA512 776523db75c8ab493c60447bb004d39fba617490766a25cb44366c12b0bc07c0846deff42bdf7dad185e86f14f8d5b54fb05f3b7049e1bf99953fcf370e16d7c WHIRLPOOL 78caae57529542a70b39c0802e9ec80329abf7730a8329b7739acbb9cbd86b234d2003b8038c61b7edfab3405032e2f680ce66c838a90e54248abbd9589f6bdb
 MISC metadata.xml 229 SHA256 25ec84cabc8cd56f6af491645debe50d10a1f1155d547fc766fe5812100b214b SHA512 396190ffe35c4f3e99337a2ebcc9014e81dfb5c52d1a06acadfe158a79760eb276b170ea0951d399f37db2d6512c066b53e7c3411b727e1f7b93caab3d6245a6 WHIRLPOOL bebdda7a0ec9c1d16fe592d332bf143b7a659e1a52a566e78f280f07bfb120dcaf6c3f216dd2724bc8210f0580a37551727fd5aedd77a8c23b5efb68be034d2b
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0
 
-iQIcBAEBCAAGBQJT5RyXAAoJEC7dUkA7aK9Hs2UP/iqORjwe3qoQt/gSt1dSm/V6
-X/UGjN2zN8aF/kySpi+gENDLPXsUUvVcJM4I+59jzdthnR+KZX6AnqL85bTmBTTx
-0h9p0liVyI1Q3T4eCYhNa+OigTvj9KpzWav9kECPJStoUuIBtpHkgHaio481yOvK
-xrcoh3GUrWFLCBoJXzyHCi+g806F1Hr+hIbn7d0UGYao5qN0LzFSlfCKwbtialDO
-yU490hXghcRmtY5/nvG/G5dhm2NGQDy8nVRwbO3UnMXYTeX7+aMcPkaibEPGmC1s
-zGHdmtr1xqmyUH6LohxycA5gSJYuoMtolvljEwrHZXhA273F7AiXyNQrnBTpFTe5
-BghYV9lLn0M3Q1ql/QRQeZ0d5JZgsPsHqVqkTIJJ4VNgs3rGCRmqP/+6Sms86cy0
-x6aja6lvDQ2sZOH1SC0g9ufeDlysuDU6TDmi5RUQ6iQwm8NMt6jXp/1asWd9Kuu7
-Hj4IG72jTPA4LFWYJdg69MqreANWNPHvmLhMZ8hXCLoKkk/n0wTkTStDqr1aShDq
-ux174k6XgHDl7rkvuzdAUrZJ+BJMXnKigaDl3mifom+/uhGhoq2R634TeqFKypfu
-d7Z2i8F6nPgVwXPfKVVx464vJKToy3MkyFNGXpUe8L4kJLznhO1tzQBL8PPZEkMc
-JIBUbQxpyehdewFZKW3v
-=SOE6
+iQIcBAEBCAAGBQJT5nhsAAoJEC7dUkA7aK9HYicP/j0s1hihH1kOP6zE5OR3+ZuF
+FpDQig3DAOWmw+Fuo9LgkayPEZ1G80Kw6P/XejlVuhMZj3yhMT5v5HYpV0H4Ns4k
+PDf9gpRDvQ0YjDXe7tsuMDDc3O29+WBdmcS+qWxYIpL4ecXcScWoDbnLgKwZ29zc
+e3Dll6CE9i+IEeSdi+sbDpYeIVNyLbkjarqnrzQEOcNt0AkPppvzdoZon5dCjCR2
+KjXRwQb7zPqJGP/z8wB/17rW0u2/jbULSVTk/wf4oKp7A8KHgqWTLJdqehcnnCIv
+HLSH3ylxfuxZeyi8p7f6G7w+R/N9uM9P8Z+HJbz42E6il/acbEmBVGVUS5swIkuC
+xY7g6oWe8oq8lU/4+Bhx2N6s66a1GIOPGJrhW1qTmWXIGuKorxdge5PW3nCNP6wM
+QeV37ZmIouDse4eHVhABa6I5L0IA/qDC0w31h/UaQYRxhToXUztK/emKgsbtcdzm
+4Uk/XVcLVJxaRadymqDCSfIvzFRoiybL/eQ+Azn1Ihl6tAlQjcNrpPfDl+w4osfS
+ykwc8SJCP5LS4/umwSUMKYOurmmAAg49UX8vuMipnMNf2XnIvn5EmdNXo3q5NZ6C
+IP6U62zLDGMgmTlWma+AkHsLL4EuI5i4KCfeBIqo3tZH+TmFUMzoNWehsLYu2BeR
+Ic7Zo0TicS5XjxI8jhH0
+=T4V5
 -----END PGP SIGNATURE-----
diff --git a/sec-policy/selinux-samba/selinux-samba-2.20140311-r5.ebuild b/sec-policy/selinux-samba/selinux-samba-2.20140311-r5.ebuild
new file mode 100644
index 000000000000..2e7b9a83978c
--- /dev/null
+++ b/sec-policy/selinux-samba/selinux-samba-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-samba/selinux-samba-2.20140311-r5.ebuild,v 1.1 2014/08/09 19:34:33 swift Exp $
+EAPI="5"
+
+IUSE=""
+MODS="samba"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for samba"
+
+KEYWORDS="~amd64 ~x86"
diff --git a/sec-policy/selinux-sasl/ChangeLog b/sec-policy/selinux-sasl/ChangeLog
index 9e46c6a3f723..3dd71a60377c 100644
--- a/sec-policy/selinux-sasl/ChangeLog
+++ b/sec-policy/selinux-sasl/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sec-policy/selinux-sasl
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-sasl/ChangeLog,v 1.42 2014/08/08 18:50:02 swift Exp $
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-sasl/ChangeLog,v 1.43 2014/08/09 19:34:12 swift Exp $
+
+*selinux-sasl-2.20140311-r5 (09 Aug 2014)
+
+  09 Aug 2014; Sven Vermeulen <swift@gentoo.org>
+  +selinux-sasl-2.20140311-r5.ebuild:
+  Bump towards r5 (fixes duplicate context for hiawatha)
 
   08 Aug 2014; Sven Vermeulen <swift@gentoo.org> selinux-sasl-9999.ebuild:
   Make 9999 ebuilds EAPI=5 and transform to make master for version bumps
diff --git a/sec-policy/selinux-sasl/Manifest b/sec-policy/selinux-sasl/Manifest
index c7bb33148b22..83e53c99567e 100644
--- a/sec-policy/selinux-sasl/Manifest
+++ b/sec-policy/selinux-sasl/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-sasl-2.20140311-r1.ebuild 379 SHA256 651da102e0612b7e0289e008cc9a0b9092e0f28cec85e285b17d4ddfd3f64bf0 SHA512 d165d6fe78d0795801e2e398e16b9dd1b39c657b2d39eb8114aa81b7de747195699810b7dc4629e0c01353ab28607eb95095cf9a1b8300c5e443e0472179741d WHIRLPOOL 39bbb24e70681fa866ce8c5b7144ae3239b98057dbd761ad979ad9bcbdcb55e04269334806b5e0e9f8727fde9619b6d37eb27823621e5e665f8772a9984fb93b
 EBUILD selinux-sasl-2.20140311-r2.ebuild 379 SHA256 f3adc2523f0b5b145750743c508385729216ad00a379fc580a299fc92bfd4246 SHA512 9400982207692087927746d02aaf2b1b10f8769f084d4bc1755c494c130ae0f6335c595aeb03f4983d66323fea76ff5ec07aa85582c686447896ef888e3fd542 WHIRLPOOL db80cd2c0fa802fadf05aa515c8f3e947a0d06dc0eeae6d282784679a7603ae23602ec7ac0cbadd520de3685080e8693018cbe7536c285fbe59ad8a0cd29cd53
 EBUILD selinux-sasl-2.20140311-r3.ebuild 379 SHA256 f04bb2d292216c827d32e6ca7778ce63ba1ae22acddd5801dbc543ffa8aaa00c SHA512 b10a918f91b000baf1106b1f5dbc82fcf4548e40e71127da3f5b67e30a3613e312c167816c84be6b32a8365602a1cbc3f5145717ef04ed27ffcfcbe872d9fdfb WHIRLPOOL b89498d26ae1cc90c5dfec54fab54ea0d06608951f2081fce4ee60300eba6306fdea3d8d99bbdf5a0e950041a388e41328d5b7dcb763de89c5039fed890b363d
 EBUILD selinux-sasl-2.20140311-r4.ebuild 381 SHA256 aff1256924aa6491ec25c3296d61b0f99012df932cb8cb2e916c5986c6eed812 SHA512 1d5831cf0e8dc240621b680dc10280c812177cb135c920b3daee1f3a1185bc3f32514a1355136bc580eb2460d4d9070c1bc206e4d925977c00d1b5862d477488 WHIRLPOOL bc71d29330d3d239083ab241144ecee4b99c4632a68732f2aec431d99cd1324689e9471d387fb57fcd33dd0637b0ce9fb5fb3a6c75d477db5f055575633fc345
+EBUILD selinux-sasl-2.20140311-r5.ebuild 357 SHA256 765c871aa3000daffd05ad3d7dc1d023c3434d1bd71295bf4003a901bf7e5932 SHA512 e201a47cbc116a7dda3d99771647f1131ae774c105a55909b5ca0105f851de3703fcee514ffb673dbfb4a9cf31ec17eb954794003516410acd143f9a15b953ef WHIRLPOOL 4bb95121a4d5ada4b25e96a1387082460f3751a238a1d276c925c8d00ae645ee29dc62de019295bbcbd79b6ae85c75eff11d2d93c76eee8575b9c25136d67777
 EBUILD selinux-sasl-9999.ebuild 337 SHA256 33d82d7d586c0115551fa598ea7c3e10e1a732252e2a445d9278d024a1f665a6 SHA512 d57a6002fa24fb8dd2dc0183b4de1b12204444b41b52499a193218bea0fbe20d7b9b63db59c1cc85babd4ac235d781e162a94d7d27015b8a506e1bc9d44991a8 WHIRLPOOL 37b5dfeeca1abb2931b2741dbf85ff71b016df1f59ab30f0a0b566ca8be063a1925f40f6b6d52de2458e405d1561c1baf6d2733f9621d6056577351f6169dd27
-MISC ChangeLog 6990 SHA256 021cb70b62ab95777e6241a8573f3f40b9112a40410c7d9996f052425d77015d SHA512 6823a500adfa19fd8b1c2bbc100cf2e463a831b3139560d57376cead4a85986d41e61a09c9292e6f312389e38f6ad022501570922f7809835c820874827dd97b WHIRLPOOL a9184eecd27b8f188c054bddc7fa9d0ad4d476456fbd97771f4f9e22fec90e3c6523214694e03b0b700615d25655d61406090a0953cbf98c633c1c262ecd4338
+MISC ChangeLog 7178 SHA256 af2556321f9ffe8d6977280217317c186ebd1515821fec0eaae821b0ae3cba91 SHA512 126c44f74062e49e3b17a18b42998301780470c9323c0f84380b4146c358e22201f3ba671a3f4edac1697bdd79d8fb15051866b22e1481929a1b638a9fd0e204 WHIRLPOOL 339ef5135c2e30a631a38f50792a03320c066d563a5d29546f55d0487e6b408b1827db9658d9f8ac44cdc3e875a88ec54d2965dd9d5cf0771ba73bad57c85997
 MISC metadata.xml 228 SHA256 879b7a8b419a879258afa5169f6c9347c9602465b285d8248b5c61ec623e9b5f SHA512 42843af7147ffe8a6533655badc879db5817bd56291c3a353a7d568b6c62363d2c5caae69d6019df8a5832642d8ee81d96f4c4ab6b4fde5123cc794575df7857 WHIRLPOOL 08c4e8e4e435bff1a861fc53c9687bf3d67f0a5519e1bb1d98a683f44378279f2aceb52015745894dc72a83883362f1fa215cf73adbdb77c4ce5f6e5edca48b0
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0
 
-iQIcBAEBCAAGBQJT5RyXAAoJEC7dUkA7aK9HC4EP/3LyDyBmzOJsBR76t0RFHj3P
-CBF2zhcN/G9bmTJrOFD4nMxmjWhPZLV3dtxC03YM3dX3MRJrp6cwXKiV32OBwlhG
-24d1c9daH9CakP+tDVFa7ihR00kAAQv4ua1S/F6CDhW25VvoSrXDxyJZtZaxkQ/L
-id587p3RdG9SjtuOX2RItJMpy4MDo/bFJGeTRSZcq3dzsQv7Z8F4fwknH2nmAsui
-4tgBVQ/cDWMxjwpJWgvN+mYCVjA1Bgtu4DX+ZG2K1n3tX5QQg2T758E8zbQq4WjO
-jtoPK/IaEICa3cqEnHtQ9U07aqD6agF8E9lMLzvTCsx2Ho0d4iHl4/51NGpy196C
-9VLEUqor8zMtMiJtaKq+MYTZrpVSu++jLqqtdzWrtrtLsCyBhv1ROBTKkBXdRzAN
-bShopxi2uRoVgmH2Zcl/INwXUgLjMvMaJjNEgzClpUbaFwh+jVS7xtGo0ukutmi3
-6TcUzmQouek/KN/QxSz32jOFI/OtfWnGczgnqQymC8F3YinzmABUbs/0iyisKym/
-0sOv7oCgwqZAceqEF9pD7V+t5ZSoUyqXAxhlEpIfAoTJCY9dgZIRYwaHP3nDyJHq
-47TC/K5zgZPiKG9BlbUXZ8RMY6tnkcLPoWoG+GbyyRcxY8FsMtOipRhV1/WE0zm2
-REsTa53BQbqeHyLMXu4z
-=L6VV
+iQIcBAEBCAAGBQJT5nhtAAoJEC7dUkA7aK9HK68QAJmrqfG1X8TRUjMO4V+oXw/I
+bgadNGhkW5f+ZZok1nX+FInxwaxdBBzc7Ri17qrv/Z8TFuXFjiWfTiEh/Ki+HnYu
+NUSAqtYoVk7X7fsnr4ZKVM8LprZDZpHO6I8bCTLaqbpGFGCPwV81GidYdT/Ha+wb
+FT6zuK0RiNij7W6ebFA/lXLLAteIiyPsO/sVWXroOMVBe0/WrrSiOtuNuZXm+A4A
+5kjV7abnyQEkRhx6werL5gOMzl/6kQkcR6pID+h9SM3YX2QkYZhp8L8Fl042RxgU
+y2+w8KHWsecwYKIg/VnDrqX1iARj+P4nCZm5WcYyKWzkHyC3M/KqeUbHI2qlThWG
+Cg//AOk2aWVnhZi3F1Sr3FeeOomBsgUHD2Nm2EZ5Vc2AVG9jhNbN0ffcMGvT+dEV
+qNzGKRU2PxiRDrG+UwlRPoi5kPS7Iu1CH/8uXWcR4mzfU5pjs5jTvARl5OTYLEqf
+sUg9DOgDIR6ltN4Uunbn45ZdsWocDdFkbbRAULibWQmYB6tIfzLE8rNTyhdj693I
+eSSO2kP67/V3laGoX9FhFnYpcZN9kd4Zh9iuJkUiRjGE3QGQVrzA9tYETTOh7/s3
+b0BHFwitBDrkIz7K/RTqFhgc49vD4DDVHmh3+qtgUq0qwsXgskTnaYRZRiQ0kXYX
+fOpYHUvOEJ2K6izxE3z9
+=Bssn
 -----END PGP SIGNATURE-----
diff --git a/sec-policy/selinux-sasl/selinux-sasl-2.20140311-r5.ebuild b/sec-policy/selinux-sasl/selinux-sasl-2.20140311-r5.ebuild
new file mode 100644
index 000000000000..f1cca3b0ce59
--- /dev/null
+++ b/sec-policy/selinux-sasl/selinux-sasl-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-sasl/selinux-sasl-2.20140311-r5.ebuild,v 1.1 2014/08/09 19:34:12 swift Exp $
+EAPI="5"
+
+IUSE=""
+MODS="sasl"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for sasl"
+
+KEYWORDS="~amd64 ~x86"
diff --git a/sec-policy/selinux-screen/ChangeLog b/sec-policy/selinux-screen/ChangeLog
index bda1365c108b..0542d4c43b1f 100644
--- a/sec-policy/selinux-screen/ChangeLog
+++ b/sec-policy/selinux-screen/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sec-policy/selinux-screen
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-screen/ChangeLog,v 1.60 2014/08/08 18:49:47 swift Exp $
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-screen/ChangeLog,v 1.61 2014/08/09 19:34:17 swift Exp $
+
+*selinux-screen-2.20140311-r5 (09 Aug 2014)
+
+  09 Aug 2014; Sven Vermeulen <swift@gentoo.org>
+  +selinux-screen-2.20140311-r5.ebuild:
+  Bump towards r5 (fixes duplicate context for hiawatha)
 
   08 Aug 2014; Sven Vermeulen <swift@gentoo.org> selinux-screen-9999.ebuild:
   Make 9999 ebuilds EAPI=5 and transform to make master for version bumps
diff --git a/sec-policy/selinux-screen/Manifest b/sec-policy/selinux-screen/Manifest
index 69862ccee8c9..c64d6639c6f3 100644
--- a/sec-policy/selinux-screen/Manifest
+++ b/sec-policy/selinux-screen/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-screen-2.20140311-r1.ebuild 387 SHA256 8ed760c193094b04743fa34778f363da5e2f39d28403151d5583b4ce243675a7 SHA512 6d96e30d6c920ba172085c6585e29271bad353a91d97c02db86edb0e862dc8c77308b8d90a5fcac5d6d95db31563ac6c8ae5626988ce1e46b8e4d6b8fc067625 WHIRLPOOL 5776ff1757afa9c110c7ed0cc3dda0ae1e2328f764f3b29843dc71b4e2a6ee70a50921cc4fbee4b175558ba3501baa0390d025f5258967a542a2428def3b9e0d
 EBUILD selinux-screen-2.20140311-r2.ebuild 387 SHA256 1a4a8c50c5541bc39791e408f4807470c7282645280e8e983978ed1f43c7028b SHA512 d44bc41d5d1fe0c7479bbda63efce76dd2c793b0ac69ffc080626af49c514987d6ab2ebd7122de505661a836754244272406d5d1d5641b854b791e300f3a03e0 WHIRLPOOL e4e1d81dc58bb1f9e040c8d48873e7081ee2d06aced6dc643fba10fbc469007e1eda6018dea7181e84f4cf6e031747810b5441b40c84a33446f7e3aab7a030ad
 EBUILD selinux-screen-2.20140311-r3.ebuild 387 SHA256 fa5fc77eabe25193fef7d200012d8200a324e2e229bb1552336abb4159d5cbab SHA512 837d11072073c9b76d9ad435a65d004900eb44eb72990303f410f82075324872c091f9dbaf4985832cab0a82b2c57f3dc1642f62c970c8c28db9b867affdae71 WHIRLPOOL 579f7bf834232b73b2506e6316a7ee7c786ca3aed8b95d0464450ce5f450c92477d7be5e8468c7588a71e62c53dfc86e638bc334987bfcb130a7fd6488e77b01
 EBUILD selinux-screen-2.20140311-r4.ebuild 389 SHA256 2b98087666674671e27f53657922ea339f09a49c0bb4dd4af4bde8af5e756df7 SHA512 d298adf409870d2004724f2c7fea90b9d3e8e83cb87f6b30f57bfc4b28ad01f89bc716c4c170a890e639306ed4caafffbd6087a7649b08ba1ed07e2c9e8d57fc WHIRLPOOL e9b605a6c9ed7a08372a25e0c31369c31c0fb79578af252ffc5e80f51cada646420e2cc0bc9b4f2260a75885798ccc41a380f19655085471e8f60c0b6f5ef8e1
+EBUILD selinux-screen-2.20140311-r5.ebuild 365 SHA256 84db3fe6f5d8fa00a670bedff71abb6b662ebee51e54f94b83a8871180d5426b SHA512 7f78df081f7738a728739023132f45b087d2f26c36ad89bcba65445e60c2317d0c2df54c422c6b2d3f27f2a85f7bcbc556838a19d9f5855aa6fc09be5feeba2c WHIRLPOOL f4bf679b7603f207007bac21bee81e55b625fae9d1d4b036e368bbb83528b79e2f47ddb1afa51d3aa88ede6ae52a51231a6ae3cb4a3b2c734aebf47a10f41929
 EBUILD selinux-screen-9999.ebuild 345 SHA256 02b2765542f71ab9a88c50d66e9e2f03ebfefa0350a574909ca0ee3a1770828f SHA512 ce649d7c873149ab0a4a7d0a01f7fe856804dc2fa4730a2fcfbded7abcb15dfa13422f1443ee57b37994069717e05f0afeb98f0e1c70fd94601210c38ab65f42 WHIRLPOOL c33d8fbd8775382ff7dee3fe2d19dc26efac452aeb3a6dd1ca70c7c5920d2434cc11b47fad4b4069ebf98352977a8535adc59044d27f40eb0f632d72f9c90069
-MISC ChangeLog 9168 SHA256 a3d0b6ed850fcc03594ca194b06512294e18e8e712358ac757ef75f41070b0dd SHA512 4056649f3cb68998c0b8ba6fd5c9ca51b34c2bc0515a6f11129b0b910d1b4a694aa262aaf7e7f6019bcb58337cff939de793e1921ab750c674842bcd386523ec WHIRLPOOL 5257f118ccd35bcf1fa1c33f37de6731599c33e5fda65c756250f83d467bb07b0a5ccaf9881587c557102bdbb44f1d739484c8e3f66d2df5970b4e893e6b5985
+MISC ChangeLog 9360 SHA256 9314d794668e32d95ad0450a0691811d45855f1f16778cfecbfa77459c309aaa SHA512 688dd73ac459e43e10e2f46d4e486977bc5dc5fbb558e2033103a73006f84e37fca55d0cc58e287de619e51117b4c7ca3495f4547b50de4bfd9c30fd88ec27a8 WHIRLPOOL 8b8eca06ef0bfe571a780e08762c5a82f81473af0c6d6f79a6827048708917235cd6ac9ff2f0e2cca6fd01a6ae1aeb598b35c7401c3c7ef14d7ac6942f11277c
 MISC metadata.xml 230 SHA256 e72932fd0bb1e2cba9c0a1b5a99678b350abcc7687acb1ba100c49c1722d90e8 SHA512 dad7bbb1c4eb525cab6793ea6abc113ccc85d0ace924c7839bb0b9727c9621a4dbd1d370ef3bd04ff338231ac33c0056c862cb7d3533d2ba52df006c3ff0f05a WHIRLPOOL 8aa0f937ea7be194a9d89659188f45935551e5abe517630627e4d7ea2bf2cdace082a83ab683fdae3579f67491d0b629e08e3056afc3063c94b89cdc4fe7dfa9
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0
 
-iQIcBAEBCAAGBQJT5RyYAAoJEC7dUkA7aK9HR1QP/2kpGgTkSE2DiS2FpGyNH6ZS
-C6PVV7E7PutOin6y7BdA4kEfgGQgj/yJPP23DTlQ+OhWMiiiPlk2QGm/n6REsQYT
-G1rZmjJk5FLKVz8M/GKR2uBH8OdNDBMxujcyEW/qwGJ9KyzDn4W5iaZFDQQN8e86
-rjR9AnfTyKU66hMX2RIV50/CyqpE+5ZpzIKougJ+s4x427L2zOuFIyt9f9wld31Z
-Pkzob2Bl+Ys3NosT/m3VgqWzDKqfK7Ffu4SvDax1KpwpIf4F6jqXOikyN3IYzZzu
-fb4V9To/rI6Msx4Afl3/1KA/+JjZX4Ayd5BYq08KV8Pj46nacUYB1hcvfbLw4/tB
-VvzBMWcf5q9uB1LgWEPbbgu7FNBjXwHlnd2XLeulATH+kLmmcnGDRApy/0478E62
-Z6xzEe3TUY4+cswFGKO3KIzkk8qLO56pJIJoSRRKCm8YjAd0SdhTMyp4a3y04BB8
-jj4r1AsQ8kM8KYvRU1SGLSbysAajpifKR38P7Pr2NfjdDxYbD3S4SFbdC2qUuDBH
-os2+E/I3qtzWX5AEjwnrsR0VxFl1mAXJZGbvcRJQ+SMh8O6JwkbU5kzfzTd0Fw6w
-M+ZWGX5TYgu614NW8LhKFHoIEudb0nea906/lIMdJ1Bypfm+5MlD6lVb9NPcgovo
-k+Fc0/uoo19/N9YRL+7h
-=7PKs
+iQIcBAEBCAAGBQJT5nhtAAoJEC7dUkA7aK9H45wP/0wjAILNO9zFqD8EDwrPDHV9
+60urwTHkRi3TudGBueKq5yQYEMy7HMg8p+1OCIcCPsJqSjN4RVAKI8/QrHtN+ThB
+q4IoegzCgxEM+Ax8Zbfb8WL8gHNsx+xSfHe3NLI4XduZ6dsIO5/1q+K9u6uX12Q/
+M8pkAcl//CSNW7T8YcMV1Q1W+MTqwuQz2xStEGFNdgE/lRVuYKUIZeHlrbfNgqvg
+DJFS0GrNe5MAXSJOrfGZ6NktCXbN8++cmMriTfutgK+WfNeaZYPqoPC8NPfkfuzq
+rD+emBbqcJM/E5CZGPLK/8U/7cfdwDGaXwj5coLBaZEdHIT5VZpqfNEYGlahBIpU
+ZCfntmQc3CGOFE9MAiz2netlQZ340fsvBwzVBcZ4zU+5dVtsxkrj/jQBIk6NS2XS
+Lf9QB+Ys7WlIQfLZv/8RByht9wr2MpZI2XpSsW3YeRNWDoHIEVW/Xz4siTt6ozk3
+wv6dL2C+Ll7qZmTH2UeXXzANoLcWfzyaan5xBoaJOYAJPUoIbBUOmZbJatAvHxXs
+n1GwCdAUnfQl72qvcF+ihgIdAbsDAqj/ACMUiZUR4MUxKCw6b04vz4lX8yDUJ80U
+oah8+khTHUMReOhYtP/ggXObHhxu0HHkjvRjVINn8DqNBfFYF68lhIwRk+9MhM/S
+ydu9DMjKodd44iW+xwyw
+=C4Lf
 -----END PGP SIGNATURE-----
diff --git a/sec-policy/selinux-screen/selinux-screen-2.20140311-r5.ebuild b/sec-policy/selinux-screen/selinux-screen-2.20140311-r5.ebuild
new file mode 100644
index 000000000000..af3c2c5852cf
--- /dev/null
+++ b/sec-policy/selinux-screen/selinux-screen-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-screen/selinux-screen-2.20140311-r5.ebuild,v 1.1 2014/08/09 19:34:17 swift Exp $
+EAPI="5"
+
+IUSE=""
+MODS="screen"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for screen"
+
+KEYWORDS="~amd64 ~x86"
diff --git a/sec-policy/selinux-sendmail/ChangeLog b/sec-policy/selinux-sendmail/ChangeLog
index a028cc923006..6ac0262a8852 100644
--- a/sec-policy/selinux-sendmail/ChangeLog
+++ b/sec-policy/selinux-sendmail/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sec-policy/selinux-sendmail
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-sendmail/ChangeLog,v 1.42 2014/08/08 18:49:48 swift Exp $
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-sendmail/ChangeLog,v 1.43 2014/08/09 19:34:43 swift Exp $
+
+*selinux-sendmail-2.20140311-r5 (09 Aug 2014)
+
+  09 Aug 2014; Sven Vermeulen <swift@gentoo.org>
+  +selinux-sendmail-2.20140311-r5.ebuild:
+  Bump towards r5 (fixes duplicate context for hiawatha)
 
   08 Aug 2014; Sven Vermeulen <swift@gentoo.org> selinux-sendmail-9999.ebuild:
   Make 9999 ebuilds EAPI=5 and transform to make master for version bumps
diff --git a/sec-policy/selinux-sendmail/Manifest b/sec-policy/selinux-sendmail/Manifest
index 340996de34f2..e56d34f2be0d 100644
--- a/sec-policy/selinux-sendmail/Manifest
+++ b/sec-policy/selinux-sendmail/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-sendmail-2.20140311-r1.ebuild 395 SHA256 90a3665b4d5038f72109fae525bbe777c45440bc9568bc10f54292a822fe7a73 SHA512 84a8997af8734719dc752b1c1ed5b53d4bc44eb2fb4e57684b8d114fb866f9bda744cf6bb63163d7588aab9264ae1142bef426f49e1445d4b7f5f9fbc1df025b WHIRLPOOL 542c1fcbcf987c7e46514ed8b3b038439d5f0748c4ea372cb0b5b229fa09b4bcfc526c4935bd84ed562165e0e2416a99976bb3e029a3fcdba175f7eccd66aa5c
 EBUILD selinux-sendmail-2.20140311-r2.ebuild 395 SHA256 5adf751fa64ea905173a23c2eb5b60bdf5637a7e93f17b54af7397eea3e9ec8d SHA512 9ae472f53e313b08485a80d8be7479d37bebfa977f68c371be637391f80715fe316ab8ef997ed810a6b80515f85e6e9a1968e42e4ab7cd2a2a5491632277e05b WHIRLPOOL b40b70cc007e5d4adcaa086ce1bd12af5af6aa4f85f85f1e73207f0cdaa886408b44b02262fc4732994edc5aa6e38758e1064afd27222dce0c0de0c3426c5685
 EBUILD selinux-sendmail-2.20140311-r3.ebuild 395 SHA256 7215ba8c07fcbfb32f4f2777c5066c48643117ac706bc177775f1fc9f03ed1a8 SHA512 abcedca78382e08debca6fa84a8a046d1888b8dc770b76c5f4e1e7b7c234741f6e96c284ba52f143d91476adf4d237f6b3ff9b2bc70329c78abb23cfaa074b5d WHIRLPOOL 18eb5a895f39e7f1163607f27a6726c5606260f50ce9ffbaf0e4a8a2c9b21db5718fff47cf86413a9030494f9a82424fb6edbbb8dc6c2370f4252b4ac01390e6
 EBUILD selinux-sendmail-2.20140311-r4.ebuild 397 SHA256 680a03d5cc66b1289ce4bcb3af8c3a9e39434d2d60b761e671bf849415f0a2e6 SHA512 b02e12e90c670686b0cdf0d63a63083e56691e07eb6cb2019da74460fc66c35ece20e860dec034cb55ecaf0570d4558cb50246c4b1a793a5693597cf5d943923 WHIRLPOOL 51c3da02f9af8770d85d4c91da72ff03faadc7bffbc072eebfaf235e3d7e74b648db4fd038f08df882a89a34bd60d29edc6769f42dc35185e54b8231cc3c7c8b
+EBUILD selinux-sendmail-2.20140311-r5.ebuild 373 SHA256 cf3077882e363d9584e192647efbe01c1fdd08aad123b0b54b4b419c82f67aaf SHA512 42868ac2594ad863ada27aa8a04f891750ea7e05288748443ed310ea5f49233ef53fbe400ac76deffe422cef87f12d8d3c61d3245675a5a32ea9ccca546c2412 WHIRLPOOL 0d9405157d2d30483a252fd526b416cc3dfb146fe19284e185547b7c2793964f5f7e3b5daf06c7a5abdbcbc38e5f6780d334a503ed5d20304dd627f585b4ab9b
 EBUILD selinux-sendmail-9999.ebuild 353 SHA256 3d46a3c3ea853698b0f7be3e2650023ccfaad04b92ce73065493726d142d5d2c SHA512 8fc4ffd53f09fd7c811b4b4cb6683e88302d55325a4432b9323d6e1b4f783f608f389cd1fbd7a0e4ddebf66ffe3af98508109471b34074610c321ae3f1375841 WHIRLPOOL 6a9f016a29b046422f19e3ad0d711ace96e8d17fb4cb15ddbd43e4e012a52c7ed9ca21fad1f6700e793b81ed63e1ebfe95362c0e3aaefb6973e339da379efb01
-MISC ChangeLog 6671 SHA256 352e6a0410b9fce02ee4fb6469af2b4fad1d4d858c9cb82dc7b3590d7fb49a4a SHA512 48047d58497d0a6e9401c2ddc48f1d950fcc5ac91f727edd1e30388291d3077706e04b74fcfcece2f41794edc86e34bc266aa1312ff0180ed5effc747b011eac WHIRLPOOL 1f02817c57b4fcfff1dfe280d7c54fd1c3571bb088d15cac436b8403207ded9bb53bc72f7bbf8bba6d58c55a3c96ded83fca394154dbb7d1ebbc5c8394642f38
+MISC ChangeLog 6867 SHA256 45be9645a8104bd76e4349a21aafe92e3db373eaefdcd82bc79735d0b78f77de SHA512 0f7ea2a844faf41aa36a1d870c069c510523a384b60abb5c8a08846eca80bfb01289a1a8852d12ddc6e7f37c5b57602d870f2d0cdb1f844790cf6feab74a1210 WHIRLPOOL 7756e1007740bdd7f24a3a3d6c42f2e10ff86a78d2bb080eacf17b7cb8a103adcb1dc1dc03602f4e086073a708cfa712aeec9dedf934cd284177cd2f10866ca5
 MISC metadata.xml 232 SHA256 8cb852383c4d30a2df5fd4e8b859bb10d6ed59184df68399fd06ffa59a48cd61 SHA512 d194891df73d4286b33e2c5b4ba36715fbf5248468229ce67a5328ed7884474c0e292cde392a2826d4a4ca221c767d24a8e4713dfadea6ad77f2ed79e6d4fce6 WHIRLPOOL ac097013fa38d813ccf5fcf862c17f032b01f1e09803e6c57d87100f69e57c117dcb259299730952b016b6aa128845d4bc49ecaf169f75d09774539ba6f68d40
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0
 
-iQIcBAEBCAAGBQJT5RyYAAoJEC7dUkA7aK9HEzMQAI6m6BApypY4Q3k7APVBCAN8
-6DABupfAdF2f3ZYPOciJ48njVABwukNkjDdcHFqFQEhgcNcQADYEO2FcU8kRhf5b
-YxjcgjX7WhfZBlfdo6dkI3qyFjO4r2hGx2+Jmy3uzjQwown27u1iqX45EyEB3COZ
-K96wn54PpXM4mjwZbJ3l50IOPBv/oyDRn981XHl8U37/URSpn8wALX16f5oJ+Mol
-oBa9nqoUMdCSeW/U0Lv621W4GRe+Yv9fvSYRwXcvloC2F2xVFgCiIyeZWcSMq52T
-soCDS8TvquXDrhVu/NWhU8mJSOJJUJxGNJhfQPeoaEtNasugtncYlIu5qqVNK88g
-g3V4/BlK6LQItfcj0xROOXYOIQCN2DlbBLCxzqbSUiRbUqfzUt4LOhgx5tBommxF
-rH64hC8NIm7S+mbGCqQnqrOwCqzj6cxWN0XqF8OCaexsoJ1mLF64fUfjJFB0GBFX
-XZW5U7L6yqow+kRQYj09xTeE95nLLxy2la7yV3D2bgPXlCeL5TvTXH0UduyRYiSL
-EHobEq9lP4hqzyc5BY1vvSKuskVvAdsbtcrMHwB7c92f+Vh2EdWwjgSvFrteJId/
-oZ9tjRVKb8Bg+q8rYpN2yBiIUbIADymU5UBIECemD+BOEIQtd++ZZQMtVjtJKJbu
-q5dhHj/g3jyG1j72Mapc
-=A8Y5
+iQIcBAEBCAAGBQJT5nhtAAoJEC7dUkA7aK9HUO4P/jwqKwY9zENkno3KRjL1mfrB
+anHIfRLjN9pObXxnYI1BvKIU9+NvqAqMJ6/cIpYtSsgA3NTpZXVQL9mcqmAu3B6y
+0DA0xBjHb5OHF5/zsx/U0whIOrbA/5rstPwz7nhZ1EGfyWl/CxhS8XHZXORRqDxz
+SOC1BRxJ+8XVTIvMNx4v8nJh5H9bWKBTKQxZOfilB4mfE3weG9kWIF8CX0CHjane
+gtpyGW84GzEpku1c7v473VmaWIDfP6J67MbTf+nleEXLy3mBfCm+KH2KOzeDN+Mi
+iiAUZGZ3JN4lrEp8ofQT1yq9a/jSk6UKJSYKiIUisGHNdUqxo2vhWhiBUjA6uRJH
+mfq9CwAvCRP6HXNYbggzVhNIc2P88YWEV8CL5m+gWkIqo4edBPkQMf7Abu8gkceQ
+YNCXZITctZSkfxXjXm/YQpDVgdjFRsLoMrKn2I8MHxbGiX6lQRrNni/eCAFRYrbs
+8i4wn8lGbyH2umlk1zVqUqOsQdH8xWXW3SHlOMXwnh/3Zz2kuw4kywqZDBd7F/PU
+9lnOkGA02uutTSwAxa+q5ns1n+iosy6MJfT3wKqMYD6y8NYdA5J3DwyqHZ7btDCE
++xmCcxQFirhmtBp3ZF/FVBsCjY0f69hlgU8qWSo+K3lmPpJvyiw4v1zUfOh+nu/m
+sICYYcQXZh5/DB+C4T5s
+=ncJ9
 -----END PGP SIGNATURE-----
diff --git a/sec-policy/selinux-sendmail/selinux-sendmail-2.20140311-r5.ebuild b/sec-policy/selinux-sendmail/selinux-sendmail-2.20140311-r5.ebuild
new file mode 100644
index 000000000000..1cbf7f0567d1
--- /dev/null
+++ b/sec-policy/selinux-sendmail/selinux-sendmail-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-sendmail/selinux-sendmail-2.20140311-r5.ebuild,v 1.1 2014/08/09 19:34:43 swift Exp $
+EAPI="5"
+
+IUSE=""
+MODS="sendmail"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for sendmail"
+
+KEYWORDS="~amd64 ~x86"
diff --git a/sec-policy/selinux-sensord/ChangeLog b/sec-policy/selinux-sensord/ChangeLog
index 73123f720a4c..3249c069c404 100644
--- a/sec-policy/selinux-sensord/ChangeLog
+++ b/sec-policy/selinux-sensord/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sec-policy/selinux-sensord
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-sensord/ChangeLog,v 1.14 2014/08/08 18:49:58 swift Exp $
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-sensord/ChangeLog,v 1.15 2014/08/09 19:34:24 swift Exp $
+
+*selinux-sensord-2.20140311-r5 (09 Aug 2014)
+
+  09 Aug 2014; Sven Vermeulen <swift@gentoo.org>
+  +selinux-sensord-2.20140311-r5.ebuild:
+  Bump towards r5 (fixes duplicate context for hiawatha)
 
   08 Aug 2014; Sven Vermeulen <swift@gentoo.org> selinux-sensord-9999.ebuild:
   Make 9999 ebuilds EAPI=5 and transform to make master for version bumps
diff --git a/sec-policy/selinux-sensord/Manifest b/sec-policy/selinux-sensord/Manifest
index 16db39a66c78..dd7a470f46b7 100644
--- a/sec-policy/selinux-sensord/Manifest
+++ b/sec-policy/selinux-sensord/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-sensord-2.20140311-r1.ebuild 391 SHA256 0bf00fb35549949a9563f00c19c8003103f55f0a6db8998b82fd63c12e5c179c SHA512 9cdf1c32d434bdd38b9fdf14db46cb3f70f55be0cc69d74abbba2e56307ce1780fc69a21898a22aa75bc8defbd4a2669b183652553a2d8026e80ae88d856bf4e WHIRLPOOL b718813d092e62371e2052a8eb97fbd6b6a096ebc68a047c24e7149a48aa301b92541d80cb3892db0963d1183a4781d7e2f820d2c233434aab8cefa02c118cde
 EBUILD selinux-sensord-2.20140311-r2.ebuild 391 SHA256 4db2458cdec56f715391539de5621c2ca937dc6c349bd372634a9a8da1cd68a3 SHA512 67c834db05911c1b27ac7c8f2f6a42db5d0eb33753949fbfe25a5aeb8caecdac43d436818961e216546a117183a74ebbc312e867238e84f3e71bbb0036c184d2 WHIRLPOOL 979e96fba047eb05b86c6043c2f2458cc6cc5ab05274d65d00884b0129acaf8104ebecfca904815201ecc38f26ddd5199b520fe8ef92d4c3ce425999ecb50922
 EBUILD selinux-sensord-2.20140311-r3.ebuild 391 SHA256 e3412b2b5a93c8cb8b26edd0a2b77c514fa4d9e52eed2a9e265dc7523884d348 SHA512 1eaec351cc42efae70ae7c90a5e59c431c48230569efe7642d384f132617bde801ee54ca39c2e3ded7016541ff6f26a53d6e2eac12dc3036a1bba921e697bf84 WHIRLPOOL c16e482faa44bf8ef9a5a8fc1e63f64670d92496d1e729797b40b7663a0d3f675009ae33ece813392b4a0580205a7b374c1b4d4824df1c3b72c1d9aacc932ad4
 EBUILD selinux-sensord-2.20140311-r4.ebuild 393 SHA256 eba36961778f25714570d9d9825ec9438d32e3c4259f7b756d63618d64ceaf89 SHA512 484e9a7a8909e789eedc6608411fff4c456d6b5ff0e74ed7ed4c5ff10608a74a96c580d855a4684b659257d223fcbd8358c2868567fd9e2c2de918af3e6ea6fd WHIRLPOOL 79882149f0945f50be804f566ab040e1205304ec824b9cf4cc96e29a74226b13b7b2ebf6f5ce3d9ae4b4edd19912d3713580efd329c2fd81c4bffad75a37b51a
+EBUILD selinux-sensord-2.20140311-r5.ebuild 369 SHA256 bffe0b111b9be77db84ff264085ec0281920df6819c8ffcabe1d0b46ab122abd SHA512 0c05a807832607dc02804298ed37739c59aa0c39f0f68c2d56de9e4cda2e7630754915e7300bbed56f4680e750c3aa0037df3d92a7ced4c346f91687613cffe9 WHIRLPOOL db1f39dd5a81f56f48302422358a2cb206e4ebe9f184a5111e8cdb59be23ba6b9c0f45a13a38443a0b2346476fd264c3fae21a36968af6ca6dcc7116bd6ca994
 EBUILD selinux-sensord-9999.ebuild 349 SHA256 c3c47b999cec8b95a9789de6aa43dd663248b62ff3b36e1543eb537fe75db466 SHA512 a19dc946e561d9a693d8839a1525745799e3dbc36b88deeaaa477abfdec8485bc288a5a02817d2b8874fcb11f4a172d1ec8bd2ae109f2e6265ed9a1b22a034db WHIRLPOOL 3680f793c261ce7faaa1fced9e0ae9e4123fc4a01deaffdecbb897ff38adc7f3213dbcf819ca5a96224bd57ee28d7ec6de5dbd423436a5483c73a939ce37e510
-MISC ChangeLog 2689 SHA256 d4d734401e59fab4284502de9907f25d3e0b0e64e4ff6671df89974977fe553e SHA512 d70f198133beb94f754565723afd4453cccb70bad33f65094673b0a3a1b532fc0bc188c2446df78c4f710958c87ea72b78a553b0b3efb1fce63ce0a52b8b2192 WHIRLPOOL b0104d645a9ad0d42a862c00a1ac9d42dd1bfab66a9e648196751c9a6c9aa81dcc3b84f3d51c6aae74b6ea9856b4b2cec5afd9bf9782f43372d671a884c80ab5
+MISC ChangeLog 2883 SHA256 d649c83deb97027a776301388adeaa5c1cbfd16249e0a8fb9091f5a34b06a1c3 SHA512 f2ddabc85add94fc1e5bc8de797fe7a72a8278f75246d4c0eabd12707e8ac68aef460c57a1c46c0d9cf67caa06532ea767b776777bdd06ea208b3493e1a73d80 WHIRLPOOL cbee77e01ef7d4948a6e3bf03287be752f0046969b41fe516f9000ea79335da3b16d206319721ea00a40844f3eec89181d821dfbf0fb954770f317d3502fa3ef
 MISC metadata.xml 231 SHA256 f3718cb5d8a4b92f4dca154167fd3ec0e3c307f7c25b745268d8d3c0f78d8a62 SHA512 aa64b01ffdee7b64f46df498ea53ff7d63842e5710c8256d92fc4369614275943ce7c0b729577c09abfd3377b0114339fc7000fd2b35cc74e9cf24fa9d0df4ac WHIRLPOOL d946260652eec34f592cd98ec9fc1659366113c04822dffb567276514c012dfedf54906afe16c8e9846169e5672beedc19c486cacba5c263d11008652dd33c5b
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0
 
-iQIcBAEBCAAGBQJT5RyYAAoJEC7dUkA7aK9HUBMQAIg/eDA4xBE2vuULVkXBjN+j
-d+7CPYKC/ji90fno26zSNgDl8MYl4JlcpVpu9rPcOquYu9BSK+b4WZL8OS7Dhapx
-KQcShi+w8YEb3t4Q1QMfoHgSuuUfOLiLpAhJc/obp2T0pbycBQNqmkeJOmdAfI9U
-/mgGyuvpKUDLrLBAQE+t8qshjTWmQIEBdOXVrynOz+7u3ViSuO+fIAsW7MR4hMW6
-13INEhkQPfvKWmCCHxBqkJJJ8fKHcatmKR6irJwLXm05C17xW2WVdbSirmAd5LEo
-TzxypxRH8Ax4UJubRU4ZA68OvQMLJqhsi14k0u5T/umO9LreJH86GucjbMe8m9x+
-hCCBROcV8PjheVy1lOMnCJJQuTJUIfuJlUnSVjv2OEiPF2LqJ6y/bb8N6U6kgYKM
-HCkxUw7tE/0AJeJ+8c5TvR/rlrPx8nLrbdqgS7tWY1pw6E+3EQ4HQ0rXMDWWNQYs
-0CNtnwvj2qBKlu5t21l9Va4gCCyB+6GCDCeDAGp8QTxC1gWn3WD51gHTBP5/zbxw
-wxW+IYlq5FjRBepQMwNfyUvyvH0JemQ2KUIq+4w82xMgN9buOw18XfvI3F0ZQqrk
-HkrYSwMcxxnRa8CDE5tPhmSU2dPlBK3iGzloEQUrs2EfG23915sotsKAOP/kfp3n
-ku6tgmhMrS08qZ4dYdsn
-=JgFW
+iQIcBAEBCAAGBQJT5nhuAAoJEC7dUkA7aK9HOiIQAJZt1MJenYswMl1MSZoSNZhX
+x5EACFLmkfeYoMZsTWO+IDKxOQmxFnMBwiaeOjrAp5BKJSpWCUPfEQbxMXh4hrmh
+h1YL6p+enZTumVHpk4oAFeXIM9BB1tSijCotWwUlPPVVqBBG4HAByC5YQ6RoYhCh
+l/zw4O/KQ2g8WgbaI1/TunphS9sK3yI4j0jWzIUx1TK7u7E8WjaU1MN44CQOW9oU
+b+TlMkM7bn+lK6fsVytbnoSp8zZ3e3W045TbTRt0crKCUuU/B5G0RFEXyorVnBuK
+xSEmBRVtT1OMsofml5npRQUbJ1Z9OM84OAPUPHJu0dFnm17wJRwbFM6sJMaI4reu
+89K5nh9xpV7awwaLHWPKgemXWowWH/EcvDKn7b5eupHHIfGShfp4y0AHTejvH8Q/
+kNVwJF1BwqS5tW5cBCRl02VqbITPCuWdrnNHWgoytXA1BmaOcsGGAUUN2LnFE3yx
+M+3WzjXONYsNepuBbrz63JVgokWU4mPEHZXRw6cm9JHpG5SEz//2H/XVS8pFW3Lj
+rmosCEsJ3lQt6o82WNdwfqcLxPobMe+mmCgRhmFHpEz6sf2S0HDmafWdPoAqvGbK
+lW88SLDsNaqCVL5Y1L+w//LBKwveR5lzHPoDyGsp+QMnJUF2e4RQWNXY03XsNlbm
+sivhvd0LciiFUhry9+ZG
+=Ydz/
 -----END PGP SIGNATURE-----
diff --git a/sec-policy/selinux-sensord/selinux-sensord-2.20140311-r5.ebuild b/sec-policy/selinux-sensord/selinux-sensord-2.20140311-r5.ebuild
new file mode 100644
index 000000000000..c0cbabf86246
--- /dev/null
+++ b/sec-policy/selinux-sensord/selinux-sensord-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-sensord/selinux-sensord-2.20140311-r5.ebuild,v 1.1 2014/08/09 19:34:24 swift Exp $
+EAPI="5"
+
+IUSE=""
+MODS="sensord"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for sensord"
+
+KEYWORDS="~amd64 ~x86"
diff --git a/sec-policy/selinux-shorewall/ChangeLog b/sec-policy/selinux-shorewall/ChangeLog
index ca1846840e4b..a9807beff4be 100644
--- a/sec-policy/selinux-shorewall/ChangeLog
+++ b/sec-policy/selinux-shorewall/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sec-policy/selinux-shorewall
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-shorewall/ChangeLog,v 1.42 2014/08/08 18:49:29 swift Exp $
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-shorewall/ChangeLog,v 1.43 2014/08/09 19:34:04 swift Exp $
+
+*selinux-shorewall-2.20140311-r5 (09 Aug 2014)
+
+  09 Aug 2014; Sven Vermeulen <swift@gentoo.org>
+  +selinux-shorewall-2.20140311-r5.ebuild:
+  Bump towards r5 (fixes duplicate context for hiawatha)
 
   08 Aug 2014; Sven Vermeulen <swift@gentoo.org> selinux-shorewall-9999.ebuild:
   Make 9999 ebuilds EAPI=5 and transform to make master for version bumps
diff --git a/sec-policy/selinux-shorewall/Manifest b/sec-policy/selinux-shorewall/Manifest
index 9b6e1cc31871..f3d946f6007b 100644
--- a/sec-policy/selinux-shorewall/Manifest
+++ b/sec-policy/selinux-shorewall/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-shorewall-2.20140311-r1.ebuild 399 SHA256 20ce39aea068fe71b0a591bad6d6ec4baa938be7ee50a87cc9733f810f3b0b56 SHA512 aef383995937a8450291eb84cd0414ce6b86667d7987a6b104fe40696a663ea82bb9129d8b44946a6780144ce78214f08ac68ae6d05d0ff1e5eabd23283a7292 WHIRLPOOL 0832464c12a1626846708f466be08c37446db9aa5fba68330366d6be946337d13d844d1546c572f52e626457a00b2f56c1f93a73e151218c197c1bf5625068d4
 EBUILD selinux-shorewall-2.20140311-r2.ebuild 399 SHA256 96e27cea58845dc9845fa35d3427edb5069e07993c1fc6f4342b7d568adfc0e5 SHA512 fac1260b4875b7730fd20b98955d7c583149fae5bdd31b6a8df64af4550cf45fd3e1adba5b58a3df90fb525724f01ca8f6525852d0b8192d481b4d63bf9b8aaa WHIRLPOOL 1b5bb65118a218ca851efe91418ac7adb312f094b6a5155971538d54e64a30c3720f9d6d9e60ff9620c1a0072cc90d1bdc3a39f37829acb39ba0ae90c8b5523e
 EBUILD selinux-shorewall-2.20140311-r3.ebuild 399 SHA256 3b42035e396610e5cdd80e30f16475ebc4652f078d2ae1a12fb0764e456b1d68 SHA512 4ef96ab4fbe449d1dff43bfa319830e7a93d5098483ac742189f963770e5297a9072db7ef25eb5ab55ecc42ae76b111619ec476f777a54b4eb033d3af4f4eeb7 WHIRLPOOL 1d8d3ab57b5e4bc33b589c6eb5737afec6560bbf1f409f5287501e44e83c56fbd3b40009e4bc1a252b231459da261036569e71547a45429a24f7b53f0dd7f031
 EBUILD selinux-shorewall-2.20140311-r4.ebuild 401 SHA256 767d3582427e2ca801a877605883006d72f9e9d7542c09b430985ffe3e17afba SHA512 d1827a3146f19b53d64dc5a9e4c979d9dfd441f896c8eb858e8582da48f33b711cc01dc6bf5176cd96dd31740bde73f58f1d4929273e8c61ddd61a484c072d89 WHIRLPOOL 46207d0136a2b1a53a87c06a4f29b931af2df886b7dd2851abca11584512cdd38bd238e31045f9e783542ad8461a84e6dae7f49883f52c09bd7abedcb3bcf34a
+EBUILD selinux-shorewall-2.20140311-r5.ebuild 377 SHA256 63dce97be5ae0691a53cc5fa8ccfcd44d8481353a4dd2c0b4affa2aa07a8d0ab SHA512 2331828a1bcf5f52c20c98a5ef87a35f0e532340d583a3d209b377ca3fdcce5b6b74455fd31a0fcd2be2cc564b6eb399a83da1a5465df6bddf598427e963d95b WHIRLPOOL 30cabfe580e5bd39add77ad90ae17f9a2bc2f872a1f68c42300ed14b6bb71f02b44bb6c22871ae4c367c09a2b8d548b25f1e00838defee45f10772242bef2f6c
 EBUILD selinux-shorewall-9999.ebuild 357 SHA256 a0bf51f1e64fc591e022729fc6a7c4d72554e8f2b6ed06bff47a7d602eda6bd1 SHA512 02ac29681091fd292339e6250b3810568e04e530c2a1deb9e8cd5a36dfed89623b13e4862f424933041fa98ef9c803141dbfd52f43c21bc83d219000b167d180 WHIRLPOOL 28390bcfe8d5a4387307cd3b59c54d7141e4588e814f988c1a41404c3448c186ce1da954f7cc733e144f393d429a6b943c6d1f8ea1bd80ab692bf01d51d9cfd3
-MISC ChangeLog 6750 SHA256 ee8dc8fbceadd7fe2f13bca9ee676031178de8dcb8d57e6b9d2d5f4a72cc5013 SHA512 7774593e929c62270cde48fb102465c61fb587d3211c3f28a5bde687081f297908b4211a66579aec5b778ddc7358aa3e0b60c5adc1c721d34cdf6c50aef5db76 WHIRLPOOL 5c320f7257dd3386f395ec5ea733d06cd0530e4ac4106d6f94db75b705524e2e6aa172b76b9b89573338633b0132d24b0f91b3a5a83d831cd96a5b5014c0d5f9
+MISC ChangeLog 6948 SHA256 dacc378023aa5ff007730c4a84082123526937c42827ea494a827b805caed52a SHA512 048a9afa29c14c577c43485a63cf7101e0adea03e06622e84e5b6c7d4b6bc13b0269a5706f79c66db456f3411d1a5d16015641b93a5ddb58adc1a54764bd2f58 WHIRLPOOL 2a5877bd3b3fb6581e838bf17ba0e8f9d0ee35b28ce7fd79f3081eca7c3e8e06f450ff4148cda35cef819ab3a59571a0a5f83284177e3c58c72fdc59639ef7e5
 MISC metadata.xml 233 SHA256 23fea73eda96a9d62c261b725037ae01d859835be7473f3d3a15234511e17d1c SHA512 318895b1afbb1d8c8aa371b846dbd3af194a9e8e221b7c52c593d54f86963fdb95454145da44bddfe761a7a13c4bc00c33233dadf0c7939f8dca443e5801bf31 WHIRLPOOL fc60f34b00f79aea2c31c41f035e7a360fc61b96320879d24382d635c6036c7fe3d486ee81d70b80e056e8b904507d038741a41ff806905ecbcd42f0f5b5150b
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0
 
-iQIcBAEBCAAGBQJT5RyZAAoJEC7dUkA7aK9HhZEQAIXbWjg5wuRHHokg3PZUbYdo
-MQPejswU/bkpRCfTgpWCAGO3vW/3XXLuLSuDIpjH8ZXtsZa3eOnH+X36dobVVmIV
-v02ipbFGVN79s78jwZMwBVJK8Ukke/HZuf7MwXKAz6cZJQPxT6PzHg5wd6HajYVn
-mWZyTOGG3FhokMO6zN7T6TmSqkMAKkEfJsE+qhBnTGjx/I/mlh2sfkrZqtOltt4i
-YfoaaoGKjcIrqUiN1eeLXSoQj7/qKbqEaMA57vykOwsstQbZILdV/w+SLZWC64vc
-5kH9Vdw3R+tSSJZblaE33CetcubsMatLusv0hykjsqjYocIAiLBn+J4HSzfpEe0L
-odGSW+/2VwTOAuWmljnTYEVZRJ2USLOiC52anu3h6qvhRWFVfMasrO6ShlShXdJH
-ZT+HJXihVVMQVkYWwfrJuXzoW8ZpZNh8PcLWtCSnf0WScQJ7TWH6luXHHCodLnJ/
-RpwRZfBGiL/zBFAbBcPMSWyBt0HiQBARrBuC6Qj1z8FGcDITsgLzHLSpaiIUMm2c
-pMA9kaHVWB8ayQF6O/oRg31Ixq6LmdhNhIbWWxDuNZFL624U1+lKIzThpGjzEPM6
-oM+7rNPkhYyzKfjEFPlaIlsJh4xDYX4/tO6wcp9PTzC3JIbT7qBGPFm3ZNd8Nk9R
-a5uLJ9NizwWeJnNM1Ak/
-=xDq1
+iQIcBAEBCAAGBQJT5nhuAAoJEC7dUkA7aK9HwSgP/RJFvcl7GG2KoJ12s7TLmYY6
+4BY+6zdGuLn0o5tAbc3hWIzRGuwU4bDA4cYc3HM7luTWwGYC4/X7mhJICMWed8GM
+HzLy2R9N8eEpOY6YZdSA4uFUZmpldWUTSv2HcYv+GSN2S369+VRDhzuBKVDeAeYZ
+sM6tJijmEcFKZhnGWSZ3Z/bPNCTaZ1FywxtjSUfxW9p4d9cU4FviihmeB7arO0hb
+LS9Ohsed80/nk7ndOje3XMp8ZKCCmsdUN7zAOvhIq7eWAAVC3hiXP4hYrRwFocR2
+g7/kzu9RTk+tH8V7fFJgjmogqwc5BGy8oVkDUhpugnkVu43QZIsnu4vAJPJV1WSd
+IdBMOBVXtLbIGrdr700CmW3g2p6dbdNlyHDtNxxKRD2u5VAC0sHAn80/AQRx48km
+iO/duXo+8EWqqQlPUUNa0AY8u5PYVt8iqwQ44e5CANUe8asPR8ICnsUFLY7K74N0
+YBVzNOATgJlj0BcAEJD6kDj905qaWcCUdMyjhT4hzIPQ92RwlECrdkVDhh75uV7u
+uw0iYAeiHe4aysxt7EPiMzQSudvABmPwltJ0vJd633J2shqJ1p95eDWGv94Irs4S
+nqtkGV5FnZ4sjSZTOtc+fhh7h3dNTWpZUf8DfN5gUGwotaKCg0a9U1LRHAPOWCM1
+GIDMRWUsE1Vgz+p+JR9D
+=IkRg
 -----END PGP SIGNATURE-----
diff --git a/sec-policy/selinux-shorewall/selinux-shorewall-2.20140311-r5.ebuild b/sec-policy/selinux-shorewall/selinux-shorewall-2.20140311-r5.ebuild
new file mode 100644
index 000000000000..361773db3c89
--- /dev/null
+++ b/sec-policy/selinux-shorewall/selinux-shorewall-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-shorewall/selinux-shorewall-2.20140311-r5.ebuild,v 1.1 2014/08/09 19:34:04 swift Exp $
+EAPI="5"
+
+IUSE=""
+MODS="shorewall"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for shorewall"
+
+KEYWORDS="~amd64 ~x86"
diff --git a/sec-policy/selinux-shutdown/ChangeLog b/sec-policy/selinux-shutdown/ChangeLog
index 77137ca3f908..51670f51a4df 100644
--- a/sec-policy/selinux-shutdown/ChangeLog
+++ b/sec-policy/selinux-shutdown/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sec-policy/selinux-shutdown
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-shutdown/ChangeLog,v 1.42 2014/08/08 18:49:27 swift Exp $
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-shutdown/ChangeLog,v 1.43 2014/08/09 19:34:23 swift Exp $
+
+*selinux-shutdown-2.20140311-r5 (09 Aug 2014)
+
+  09 Aug 2014; Sven Vermeulen <swift@gentoo.org>
+  +selinux-shutdown-2.20140311-r5.ebuild:
+  Bump towards r5 (fixes duplicate context for hiawatha)
 
   08 Aug 2014; Sven Vermeulen <swift@gentoo.org> selinux-shutdown-9999.ebuild:
   Make 9999 ebuilds EAPI=5 and transform to make master for version bumps
diff --git a/sec-policy/selinux-shutdown/Manifest b/sec-policy/selinux-shutdown/Manifest
index 2321ff33a4ec..d73e95baadf8 100644
--- a/sec-policy/selinux-shutdown/Manifest
+++ b/sec-policy/selinux-shutdown/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-shutdown-2.20140311-r1.ebuild 395 SHA256 d862488e330ac5bfc065f1d447711518bd9dc717fbd9b5fa421ab9c8aa4f98dc SHA512 e06cc05eae027f216633c5e2dc36efdd8794e9f0f598e84aedc8a761996e6a5e83af47322da858d38d46a6438f849c0b98bed82239276deb6fdaa47e79041666 WHIRLPOOL 463df29e9cb640c59102d3952cd2fc28b8323533e0373dc4387e95190b774556cb4519c818703c0ea7178b9d1727588130a03e77afb7074d5251a48c3662c66f
 EBUILD selinux-shutdown-2.20140311-r2.ebuild 395 SHA256 2996c9908e0d236b4ab8e6bbfe35fe198b49d7cec999663877bee10ba5f88e72 SHA512 584765069fd18d4391e8fec182804f2ded3cfa8a243d1ba7f6f8938488eb0ebac799b9acbd55feee090943ddbaf3d281e9424c8716254acec4cf92fad82e5982 WHIRLPOOL f0fc2f10c8d649ef15904d415e966d96b63d5bb29981f5ba04b516c198294806567f3c3a577dcf9e70dc0e0177c6c8fb8e31cbd2844584d63ed0350f2007f08b
 EBUILD selinux-shutdown-2.20140311-r3.ebuild 395 SHA256 e33242374390f5fac00bba6c5e67fec852d0663859efe50a8234ad91b4e20b23 SHA512 d30a111dedc659effd602e5a046022b199748d44256641b62a6567898a7b3e05d14662eebedd2c9563a1202f93321f0eedbd7a45a5c02783a37ad7a4b431f6fe WHIRLPOOL 8f554b9608de70280503d3afb204aac48c1214c728d44c2c80587b3d437614dcedccfae827b676aa74a7751ec985eea4b699c7bcf2e4ed195d8259f3f0e3cdd7
 EBUILD selinux-shutdown-2.20140311-r4.ebuild 397 SHA256 a17c00f30dd869db496662f0bc7cd9630d3c99315bc9d7a4b1c9145d96ed7c08 SHA512 f9f286e176936f009f0f564aa390f622e1e06b7c0430846b5147ebc76c3001636b6064a6ac304a1fbb2d511b653fdfb95d55ed76eaade3ee210af4b57fcc6258 WHIRLPOOL 2eb6ab5af54f4475c56d8366a581d276555b3a05c1f1cdf07edae66bc4fa12e9c069b79cfdb9c3f5ff50a9a14c38997b4a835461f385a29ee044ee05f9ddcac0
+EBUILD selinux-shutdown-2.20140311-r5.ebuild 373 SHA256 392f0c734a2199b511061611f2392c445f8b4f25f727484e557759c254929f4d SHA512 d82a1a58569a7472b8a9b5de721f08ec9c85a926804e68054843890162a06328d7f5a3fff559d9c068f84d5ba4190df3ce3c9cdb0f8136384cf35b5715327f4a WHIRLPOOL 21e013ea2bd42629c3193096502496ab8a3afdfcb78cb9b66cc2323c51de940adb16d6bc0cf84b616aa7a6db1fe582856772f449c125982cbb1b66a80fba633c
 EBUILD selinux-shutdown-9999.ebuild 353 SHA256 03300832fea915dbd0cfb2213aca940b416a463865cc01f680bc0c774acb1f59 SHA512 7455a2a8ce69d4e1fd6e72a3307f3fcd47ba4e9615d3ece9f4f28de94a274e50e79aa19e9d6671f6ef79c0d05789937173d23a2a926e91f55993320a28490c05 WHIRLPOOL 95e32f13b2017a9f2137d96b780c960ed23f72af69b6aadf4f916fca51048b68ab07d520dd8b500d4fe9c93bb641dfb49f6bc76e6a3c8fad3fb7f9fabcd9b08d
-MISC ChangeLog 6671 SHA256 9aaf5011de9022d9b10b0a37fe513e7b6c591579e43b53b2f5dfee5c650fd021 SHA512 52e22f50118120285c0cccf96528e3122df0032e4e16b2437153d0b2a3974b343787b13014de2e7c5d1a8b3dd2502a38d02407b7a3f0e8a686461f7eaadc24ad WHIRLPOOL 2a76a4803265bce6f25ab1951960972e358bb94b71bcbe8d242a3e19a29e2fe59913bd6b7caa6af8c01868bf043e2df095994bebe117fb9488f34870bc9ca4d3
+MISC ChangeLog 6867 SHA256 153c98d24bdae1759f88a0c96f02f8adaaa796474b2f010805b8256374cc7b85 SHA512 9604e9826ddc35f36132353b6b9b335e627071118384d6170dddaff22fa84a0912203a9a7b35085ab9c3a0a0c036e02f02846eeebd68d19704dcee3c0a4167a5 WHIRLPOOL 29f4f54c96be34e5095536055993118f92352b111d9c5b38cf9933eef59e86a9965dd617f8b4176feb22cfef25d7c3c886ae8c143055f6b4dffeca4ef54ecc3b
 MISC metadata.xml 232 SHA256 96789a331da327e3c202037a71c2164602a29fb2c86cd91d4659c7ee07584098 SHA512 909860dff66db7559b7c1470fa29d58aae373fd6359f762f86012e36ba7f2cef3080433404604e3bd567cd0d5bcd8b1f278b9daf37efa4cc1ff99ab5a3c2a32e WHIRLPOOL c0f6135e63849e983991d73a0249b33164b27a600917da4c588d209901b2ebf830a291d010fef05be638f7db7dcb8b72712a04ea3153ada53eb3e0da4ac688f3
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0
 
-iQIcBAEBCAAGBQJT5RyZAAoJEC7dUkA7aK9Hwh4P/3DUm08SicCGxV71wpnRaX9n
-tF5AyZrqvKBGrrgoUShvOgiZ5zDMEJO8MKqK/mVaI6vWIrkCoj8ijkkbUAJZHI+G
-ulsk1mKNAoP5okSWb5frYjqDBdJttGQCY0aCnu4oRZPlItkP0SH08Dwv+UteY87R
-rbsEfuk/+FGCpC8CIFwlA+DmHNS55GZLgRMPsHGtvnaCoyOalXn25fzD1AFxP8Ay
-d4xK1h5BEPvuuZqYinPIv5oA0/1Xum53YKSzJLcdP/dRwO4jeONUnw2E6SEPWnpv
-EfSbhDSygF3tsT1aiCwZU6xsOvR6PRnrgjwMwHt52/0Wcg3as/dZwiPLJPFD+/F3
-iYZ5Wv+JmQHGDgYBavp816DSOPLkeGmXT5Tf4+qAXNOl7icEmDAabflShGRKOAeR
-UcvIxxC0yLkWecuOGWwFX+tJiAFgox3WUAo2J5LNsIcTomXYJCC8SaiBTH1Wsnem
-deSzw1YYma7IUY28S5vTU2D+k4Z3/NULoH4Cj9BJG14/ZUnl8nrSzcYLq8u8VVfY
-e3sgy2id/bkiKZPGjSruC4bY6bsDKXwFWxfhX5gIqDyZcZ7Eemq+Gj4n/CdoQ5ek
-1ux54tMZZZ4qfwz+FWBwIYa3VGpzisXARsJGc71cCZIe0erPJ/MZahnoZ0lDuxRH
-DV9kxPXFL0xoqYlO/ggO
-=KFmE
+iQIcBAEBCAAGBQJT5nhuAAoJEC7dUkA7aK9HyToP/RKrhk5hnBvYzfgtaIWV5lSv
+YBXA3FTXxiDeRKxDYYZdeVcOnp+z1W7Rx9WDB9k/JMgh/Bl1PPateTDzXBBgXlJM
+eLhrwc+Is6U6ZY5vI49WoajUn7P+vmqG9+fZgvrFQj8uZUI0SowkxNtAZHt6iWcV
+BjTrKfB7AT/cmc0QQNX9jCXV34EQiXBFSqk7yWD+3o8MLkofTIwGrtZ01vLGIKzE
+h+UJLAaXjntZXIjqKbMUdJc6bXQYsunBAaN00AqH8nNK0W3jkWBkbMc60iz+LXPy
+w/X+doVQhXlgH6rt8PV/AQME8VkJdBQO7C/le8TLCgSSr/Ya1pEJWDeYHdbhb8kM
+wO8O+qcEo1+tIL1d3E6oc53C3tNoMRmE9pxhWVE5iZsA1tsgUVuAKN4bI1PK3aw4
+e17BhyOPeAtq2xG+61J2R1GuPNEtEuAULtoaXHLGS2EQUqS2RGiEZ+9z0puzstXp
+7X18NeZzqry4rUFmQhtXO63VtH9fmaVI94ee5yifJHDUVDJCERcHiIQCC+GsJaUk
+UHFllmJFlXbnUhLPAHV1xm5vQzmAIlZ55+RYZ+GeHEtIOKaGbM5m9EW8/yfNcpyg
+0++cUgk+2dNmGvBtEqbyayMz8j+69g0lBwgSffrwIADwMxAi5rWfBD4gvtOMXrGt
+b7iJZES5Sk+qLGQ7WmVF
+=D/N6
 -----END PGP SIGNATURE-----
diff --git a/sec-policy/selinux-shutdown/selinux-shutdown-2.20140311-r5.ebuild b/sec-policy/selinux-shutdown/selinux-shutdown-2.20140311-r5.ebuild
new file mode 100644
index 000000000000..adaabc1a54fe
--- /dev/null
+++ b/sec-policy/selinux-shutdown/selinux-shutdown-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-shutdown/selinux-shutdown-2.20140311-r5.ebuild,v 1.1 2014/08/09 19:34:23 swift Exp $
+EAPI="5"
+
+IUSE=""
+MODS="shutdown"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for shutdown"
+
+KEYWORDS="~amd64 ~x86"
diff --git a/sec-policy/selinux-skype/ChangeLog b/sec-policy/selinux-skype/ChangeLog
index e665b7fecbc5..01f533d34401 100644
--- a/sec-policy/selinux-skype/ChangeLog
+++ b/sec-policy/selinux-skype/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sec-policy/selinux-skype
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-skype/ChangeLog,v 1.51 2014/08/08 18:49:23 swift Exp $
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-skype/ChangeLog,v 1.52 2014/08/09 19:34:32 swift Exp $
+
+*selinux-skype-2.20140311-r5 (09 Aug 2014)
+
+  09 Aug 2014; Sven Vermeulen <swift@gentoo.org>
+  +selinux-skype-2.20140311-r5.ebuild:
+  Bump towards r5 (fixes duplicate context for hiawatha)
 
   08 Aug 2014; Sven Vermeulen <swift@gentoo.org> selinux-skype-9999.ebuild:
   Make 9999 ebuilds EAPI=5 and transform to make master for version bumps
diff --git a/sec-policy/selinux-skype/Manifest b/sec-policy/selinux-skype/Manifest
index fd0c1ec939ab..94ed5750ec50 100644
--- a/sec-policy/selinux-skype/Manifest
+++ b/sec-policy/selinux-skype/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-skype-2.20140311-r1.ebuild 451 SHA256 8075a6ed5eb2b9500feb06ea121124b52f300e1f80530b068f1b9017a1ee36ee SHA512 5f80da70c9df5719ec6c36b786a9bc4a8fa15fb441619e4bba298d94a21bb2e09701d9bf13c4a9a69a53ddc2f86ea581792d12b623a4125bf64d1cca95b73e7c WHIRLPOOL d51e8267c56b114e605ebb7854b8b290f544531e09229af377f465996512ffb110b24457cf7c5fc6c29983abfed88346ad42de6ab76719365193c69af4d0d232
 EBUILD selinux-skype-2.20140311-r2.ebuild 455 SHA256 4ad874025ac592be6980082e0280291595914a211f3d4527b632d1b09ad95594 SHA512 41b7435b622688f2b0667dc35f7ec5770db7e45b31488e31d283c0dd272da7354a8610bf7b984488730ada90b1689e6eea000bfa414fef12ca78f1aa7925428a WHIRLPOOL 8f619526d0d28301e17950713be71f022414940aa173020cfc8ec8e6846e1221f02b7a6325ac4f6a38a65f69aac00d667dcd825555679a3d619730d13a33ebe8
 EBUILD selinux-skype-2.20140311-r3.ebuild 455 SHA256 2992fe9efde1a891839f0cc968da7e4569b5f241f0369d085ce560e4fd768e08 SHA512 d7d36143a61129957150f744c2495706b7baa8b799839058d5c2c0594ca142571bbeae508f206384a3e79c3aab1e77940db576dba85322a92e27e3f44b37fd1d WHIRLPOOL 1be360da506d666f49361242a955ff5217f4bf74bce6b0a569df88cf10c486f81c9f37950a875ca91400081d14881620c93f082fdd182357959da40711e03587
 EBUILD selinux-skype-2.20140311-r4.ebuild 457 SHA256 9e8c72ff02af889cdac4273891e8f4b8846b6ba90ddbeda252cedf28e1124e11 SHA512 a2e056da6feca5fc5a5b11c9ed86a2ccb940fd4cfaa40b81290f953ed74eeb41dd26528b035d8a9f0235eb02045f24d7ac6eaa193ba97e31d70fe331a263ad9f WHIRLPOOL cd84714f0be530898f2ef5f7faaca9e14202f1e78f8438e154d18d97a1b3f8a4e81ae32880a2c10a18f32b40c63351dbbb29ef03209e49324262113a416964db
+EBUILD selinux-skype-2.20140311-r5.ebuild 433 SHA256 336d4ca9a8e561b83af9f02c4a0aaf20c0a54ec81ad78a270ce3a7f47cd6065d SHA512 5374fcd2a4d7942a0a831bb4ad5973083bf1810c012c0a088117660cb7f4d56d5fc76a52d6d87354d490edc583807cbc247051f427dc17ebaf9b2184906d86e7 WHIRLPOOL 7946aa77f9fe0d4577f49f4a73f8850fab9ff9ebe6c1486fee04aadbb22cc8aeb22a2dca239d0ba57ad2c94b150cebb797bcf87e51dfdc5ac75030f057c5ab33
 EBUILD selinux-skype-9999.ebuild 413 SHA256 76cef9bef47558ef130016cddb56e963bc610bae2aff58ee73d4307142b7f830 SHA512 d8f13020a854410b70c7339bde3587aefc03cbd6094dfa74d44f5837a0d2714990eac423af5956862b9eb6a223e6e53b1d90724394d3edd536d84b3db77b6e26 WHIRLPOOL 1ba0a0a56a8ac637854c1d562c12e570295e666a0ed14f9b24a01d3221627d2cd4ce6f8c26694ec3bafcd7b7f77738f1375b02fa2cdf5bea26ed472f1b004185
-MISC ChangeLog 8452 SHA256 3d52d6bc39a1932ffec895e93e122aa3967c497e4519f955d0b11dd520594942 SHA512 48bdf7e294ea7f0365658244aebca6e4bbd596ee258ddbb8a69af1b33b6d79a23c2dad44fef80f40d49378ba08ca9801ec9a9ea32820f90fc1bef820c2f3b4db WHIRLPOOL 484cec055e6f4ccfb18dee00ee4d6637473277df0c8d50fb73714510b790f20f04df7bac63f0aef7dda7f81465c56798465eb79def19a4aa18b91b0555513d8e
+MISC ChangeLog 8642 SHA256 02da22d617872a41b66e55268b0d301d30a34f48b1baa1fcad363049e49e33b7 SHA512 9f9b0314c60f9bf6d2043f2766fdefddd86a916916557e9aa98d2df56aee6bad1d3b46fa961f0b7e39b23cee5ee1faa3d30031062f3c73de65fdf3be01ed0b7b WHIRLPOOL 48b4d569d0867cc1b4eb7c2efa0f23d75e15d62fe754a5707e3995f188b576afdb350c5ecbc8fd484ad5f50053cdb988c8b3acda320003c197fbe5e7ba21c703
 MISC metadata.xml 229 SHA256 dd045a440e1dfe8b2e5eb751cf8f81178e21ae2b7916571824bf81faba81f762 SHA512 181c2fa98a1a7f549aeec52b6cd58b08efa52af405fa18484c2163bd38e22e0702a94b4ffbec13c3b6f0e49f533c32dc3ed3e9d63ab260193ac881845b59fc41 WHIRLPOOL 0594c79abd8cb2e42db8193b92c96d00c9193745e21e29e05e7e5b18918ca3a4d7492a70a62d71080ffe095cd2970fed0d796f8bcf7e3d2beeb17dccddc6bd41
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0
 
-iQIbBAEBCAAGBQJT5RyaAAoJEC7dUkA7aK9HQFYP+Juq8Os3MCeYawia9fIyMakj
-qqoRAc7SnH7Q/bMnoJA5DfdQ10fFmg7QD0Oj+bUKBBfAM8Qr9WJKj3kIvpoOQeTv
-YCj0aKEZrvauIB16NdILTnLh30cz4yVCFhYF8cyELRVM+LDQgyDwkIfYVnQ2jpJJ
-msFXn7WvQ7bSOWqXPQqYG7w/yWUKtJ8lnheYuYz3GKTBeIP4kgl/FjbTY3DrB2hC
-HIS1oW1noejemaWOnZy/RVrl+5W661YrzX8oAlLkbhx7o6WtAaK72kr8N/zIPlx1
-k4TGNNcxJBjvy9Sjlz5sne8+Lax4gXs5HbbiAusDLSmuLSAAam58qhStRfjm4wyr
-lKq4ayS9t7TnHV+PGwy248MyhOeiZ4xMKaf8xOCLdBF7AWW3QxSTC92uMOyOOUlJ
-RLX0sITZypVWpD9Seok3GVsbs2SzQFzkcHerCQU/qJJ1nh4LigHwDeLwup3lRmbV
-Fn0AXA3QUEAyxubs6RPkc8mlm2S+K0olyxcGMp8Krr2cVEHmsawMqC9dC/4mDyKb
-x+5hIf4KJlJ12ss9KLMXfDgSl/DXK35O/ZSFLafLrd477phGc+61QeUzkveMov66
-TSPWuwAOwD323+51td5mVbWHd3wBKo9DPY5SdP42s/0u8VYu7iAZG2SKaMvzrBpv
-jDqtNrHW8G0urYrHl+8=
-=Sfo6
+iQIcBAEBCAAGBQJT5nhvAAoJEC7dUkA7aK9HV+oP/3NUpydLFWzORAeHKNvKQUKj
+oupB9ZwHBd0D7Cctqftwgjbymt82nztErW5aawcmz1B0Wdrf3e9YRJIaNCxlRiTb
+R6aOcUAziN013U7/38lk+CFUv3u14Zr2WsVLJzp7tKnobPP/KjmC7blm8LWlswVr
+/96oSHkESo5sN8Qx8FpaojZc/BBDzXQ75xPHd9gVTcrpUEDsI6pXs/F5UU7p8bPT
+bqAeD3Cs4eSlWkT/ca0DMu0bNXrwwNid4eAGMAZJqV+YrZYfo8pPu550GP6mYavz
+w9EXxFdyuBuicpMGgZSOwhSVQ3tE3TEw3P52uThBeOVLGbs1Y6Z1NxfNTl6bqJEW
+6T4zqhhNVV+uH2WxvbXwO1MBAFaXR83B4PPs+1F7q1FFdvD1gMw6ZY76M9jsiEJe
+vbT7FqbLaQCA7LXdBxS97PEtopihxTsSFWGpubUiQv1HhG77jBG7h+ppAHiZEYeO
+phhdI4Ouny9okPaWhlqZ01AjwNza+JOek36dCdv2xoq2Zy98uepGVcOCkoMLhW0L
+pmId6ZUQkBpC5FepY1g2R0viFbiDJJtiVUkIKEXLKtq2UVE4pRxmTxXJrGCNn+w6
+vrLngW8FFFlfyOjkonwUqFBNZeDIe2NbAorkdc2whSfiVDeyORsTo3z6P7sTfceQ
+kyeULu6u6wdBvlxOOXfC
+=tiVz
 -----END PGP SIGNATURE-----
diff --git a/sec-policy/selinux-skype/selinux-skype-2.20140311-r5.ebuild b/sec-policy/selinux-skype/selinux-skype-2.20140311-r5.ebuild
new file mode 100644
index 000000000000..e51a010c4232
--- /dev/null
+++ b/sec-policy/selinux-skype/selinux-skype-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-skype/selinux-skype-2.20140311-r5.ebuild,v 1.1 2014/08/09 19:34:32 swift Exp $
+EAPI="5"
+
+IUSE="alsa"
+MODS="skype"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for skype"
+
+KEYWORDS="~amd64 ~x86"
+DEPEND="${DEPEND}
+	sec-policy/selinux-xserver
+"
+RDEPEND="${DEPEND}"
diff --git a/sec-policy/selinux-slocate/ChangeLog b/sec-policy/selinux-slocate/ChangeLog
index 905fb89a28c4..c8e455024c82 100644
--- a/sec-policy/selinux-slocate/ChangeLog
+++ b/sec-policy/selinux-slocate/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sec-policy/selinux-slocate
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-slocate/ChangeLog,v 1.42 2014/08/08 18:49:54 swift Exp $
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-slocate/ChangeLog,v 1.43 2014/08/09 19:34:10 swift Exp $
+
+*selinux-slocate-2.20140311-r5 (09 Aug 2014)
+
+  09 Aug 2014; Sven Vermeulen <swift@gentoo.org>
+  +selinux-slocate-2.20140311-r5.ebuild:
+  Bump towards r5 (fixes duplicate context for hiawatha)
 
   08 Aug 2014; Sven Vermeulen <swift@gentoo.org> selinux-slocate-9999.ebuild:
   Make 9999 ebuilds EAPI=5 and transform to make master for version bumps
diff --git a/sec-policy/selinux-slocate/Manifest b/sec-policy/selinux-slocate/Manifest
index 88ca09d58611..9158a333e81f 100644
--- a/sec-policy/selinux-slocate/Manifest
+++ b/sec-policy/selinux-slocate/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-slocate-2.20140311-r1.ebuild 391 SHA256 7434ce3cfbd49b09fccc51d18ec8b39ce71c2896e21bd87437e078901e760c7c SHA512 de05d8e88918cc953093c05d74eb20c51732970fcc86cdca7e60005315e809a5b6fa5021d90792679feae21e18d162f52db819bca43c8f5907c7b800d78bb06d WHIRLPOOL d1cec2a1a7509eb7838b54b3a615a7cd8c5174e3385f7d8bb766c2dad4fd2f5c9bce5bb5f1e6e4491bce23be48743fe10fa7c16ac323e03a18645aa1d4e59996
 EBUILD selinux-slocate-2.20140311-r2.ebuild 391 SHA256 6f2ee6c0fcd9db6ac14f13293038fd8a8573cafb2b6e7661f91633717edc9f4e SHA512 c5dd9efeba12a138a806ca80b72f169fd6200434a0d8176f43f74ebacd8a9e83002fa88414752ec399b04640516cc1a591e355ab1afacb97a0bae9549b47a31e WHIRLPOOL 1ac05aef036ef0f95ad04fe43b5f2df6c640eb9f721802921b09cf999d660bfcfe5404738b4e08a3c26001d784c8022f5a9bf33cdce16de635c2284a0ec3d54f
 EBUILD selinux-slocate-2.20140311-r3.ebuild 391 SHA256 f424d165b8f4ad19a6e4b153a9c0dfa212fc6264fb2296cf9f4075d9d8178f29 SHA512 285fd7fcc1fe9bb3ff794b99d92a5f04140bf8204ee6ac2e5ae0f0465715f191ed66e46cab05a4f901f67a47225c2bb0620dcaff1dc1371157258916d1ea6c01 WHIRLPOOL 8a07b9f6cb4d78b9cb4c2743a67453bea7957e8451a8097fd83d4b591e2555539bd8ac3425d76e60ed168587154d259b82b928d069c4709798f43704534526a9
 EBUILD selinux-slocate-2.20140311-r4.ebuild 393 SHA256 0bca3b91f2bf669cff6afac29cdd9fb14de5972137aa471d63b8e682f1d5106a SHA512 8c7381eb0884eff3253fb2bbebb43136d6aac31721107307fc5a2cb539d941b02fa9f2674dfabfc9996027d0b3e0f9803730edf3a3e8ac890e0b3e0b6a7b488a WHIRLPOOL e6b0e9446f4c853da73b3d3b2c7b9650a1a3ec02d20d68734d9468b5d2e2a48860bdfdd300d1c94126a20af402fa36d84c0569c98eb60d1ba2cb87ca1e3dae45
+EBUILD selinux-slocate-2.20140311-r5.ebuild 369 SHA256 e7e4492d59d991a1804309e41c4c5a81c5d81624aed1e9ab499fb15749b0e8a9 SHA512 d8cbe160b27ffcfd4751558fe7d49c325a1c4189003be5dd5bc68508b5a2a9f27fca8e8b1ddb51ca8b47661de089aa25609f4529a4aa0f77ea993ac8ff40d2de WHIRLPOOL 4e004da8d2c9c05b4c1c46c7d99ec8cb05f8109e966957f0e65c45b3e4237a57861aa33d9b21dcb2959c5f32736fdcc5b3535c85a65bb2606189a7ddae19fed4
 EBUILD selinux-slocate-9999.ebuild 349 SHA256 85a5bf85f51da96f186711e3ca198539318964121b09fbed79bbfff19e7aeb5d SHA512 c2ab1ff8bd54ad0a229d263f09a5b6c4b7cb91ef2b60aa175d2f959680923418974837e5aa9aeeba9ee25b93564e5313245f242b6e7b80910e528bc08b1b53b0 WHIRLPOOL fb2ed6f1d081a40b4229146418193db2d1b340c2fcc2c3b1a02890713b5c917dc74d9a43d54f7c5b0d7cb7d9d64e5186ed02d87cf4d11e2c91b007865417895b
-MISC ChangeLog 6588 SHA256 53f177e9eca1a6db7b9244d4091a40d327fee88ff562f3276e3dfd17eb3543c8 SHA512 23f57766f3a9c3aee68d3f051b11f338f30b98396c6d447f25a17768cb55b7410a1867ebf52d5d71eb2aa937f8ab82d5b62c56d49841d83a40305eb023c01e7a WHIRLPOOL ab24018a9efa1f9d3da291dc0d914abbd7f2104b354c7d81e3ce3dd59e288f30dc73671116da4d202d516761fcb60f0e080c055880da936734f21b8176dd765e
+MISC ChangeLog 6782 SHA256 bab14221b9b84ab61bf804c7a1a3378a8ebca91394a26fbf67d17ccc1f5d7a1a SHA512 69988a2022dfce1a87c996a868f10e467ad38b38e175cc531e194c15324709ce95a6a1838067dd5b9cb82b38fce736017f08b6b4f7eb08efda14432dadc8a2b5 WHIRLPOOL cbe518bd93550a6243e9e54b39bf4e3e583a48bacb988ddb96e1c5351dfae27486b8bdcb574e81290e8487f5737fee6d1ba00c48a794d8aff867b6c4b613c95d
 MISC metadata.xml 231 SHA256 4e842bb8dbfeb358a416b210478bd4a35b4280f1154b19c3ec5e20cb3df5e901 SHA512 d8f1c7295b1d7be861586f78431d9359136ea861a2ab1778795b8b835ff07d1809d784385158439ff0f169f4c9d69e5d8670e9569de57a09119d7be065d96651 WHIRLPOOL 776d0067ae1a651f299c71a87ba0802622ff4f5585d77026a7469a03c2590aaf9af93203e72fd03c7b1332fdbc6faf8d5a1519218ca1c4fb3be746550dd0ffa3
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0
 
-iQIcBAEBCAAGBQJT5RyaAAoJEC7dUkA7aK9HJsgP/3jGO5zbtsgLXE2nuUQY063j
-BguqQ+0AncSph2KoHy42Rjpxdb6JAFRIJkpWn9P3Fjq7KfRRHi3T9smq1qCj7noP
-bdq5V0Cy8IpLdCG03Xd39loNz59J1LtwG4B48yC63mUCVwNeOC5uB8xzHv/ohYs6
-P0nnYxTBr7IhJ5ib+V/6AhP6Q9nJ2hhTHJGg5yQBIo82EITMvdSUW28t/hOVeIQL
-kzvIWLBiVZLMCPcM6LFFpeXdYIsmSlETvIYiue6CJtnQSn5e2VrC8CtmI0VxlEFd
-P04luAt5DODJWW5p/y/aN/1A5D6e1nIvoFSQmVdTG3Rw3i16XMkkJupyR907CZw1
-ilZ2RbgiZ8eE2FXA3R5n6hY1HZ5MRLF/pdoPpPRBLoyFQBMpEz5RlYsBGGve0grW
-c/FWxPyGFSuXKKKbtaiGCQCuvx+XTyF90CWshvi4heowqQ7ctfFkIFD9W2eSks8s
-o9TYQih9SYtRhcA5Z7SRDNbS5X+WzXpUq1nx7unm45GILU1lNkM8lW5K4Dp5qpvi
-d2+caf+pL92MpG1/04gdtobYp7Q4k4iJ6LTCaSIQv7ZO+Q9tU8NRWHr8wha5/ko9
-6+l+v3lqCB8Lhmg9km29X9KOogqFUksZyF4j+iX6y064SVbMB9Yeq6FGXex+agot
-qozba/qFIPmz3qn+zRkc
-=z2sf
+iQIcBAEBCAAGBQJT5nhvAAoJEC7dUkA7aK9HqtgQAIPuyN2QX+Bzc5pq/IbKdW5G
+MCF6eelUPTCJg8VcTGtE6u0JjScgbYNWiYQTLz6aNwoob1a3k4Rk1RTzNwsvjEpb
+oKuh8Ft9l+o1KzOE9AAVRSC77bcy/fWJtVgtuIOpH5dJDb9Ii6FijJGhizQDdwiP
+dkKiP6k6r0vymIiXAcryvfdTwwAbs9LSTZUzdOAy8Y6oZBPE9XxlE365ENi+P/RK
+TyID1Ha/6yDfXXjdg+Wn1po1TznGvjFVp2rcel7gsxehVVvGMYJPv3ItwLVMFKe+
+VtyTzotqM4Y+h7T39xKrnY8yDAJFt7+MQy5TaSuaTciH0VT2MoI/ET/ec1bon4YA
+hkkrpHGVSfPKyzIF14IQ87MRVytdgK338bu5LIdCh6Oixkm9z3RijP42JhDPHFgG
+alu6/kIXAn8qIHKetu2fXt3TRKlpo/NbsRlqYlyuHLMxy30Y8TPSZYRPpnwwWqjf
+EFbBjtaOOmtJGkh3VSksTfFbyvcC3Ele2Wd8jwOEfkF0yT6sZr5MSBpgd8fr7dZM
+BwfkLcEJYVIpleS1yqI11gqA0qLYrcJ8dUEu2RShiJvZlX4T4eNt+FiYJUGgd/XU
+J75ma1CVx8qX47aHV9LfshjAGA9I7EXG5GiDyhJoFaEyHqLOxEvanOCDCWHnMSy+
+/ZOp3lhQhG7XjvOtpocQ
+=izFa
 -----END PGP SIGNATURE-----
diff --git a/sec-policy/selinux-slocate/selinux-slocate-2.20140311-r5.ebuild b/sec-policy/selinux-slocate/selinux-slocate-2.20140311-r5.ebuild
new file mode 100644
index 000000000000..654231247b3c
--- /dev/null
+++ b/sec-policy/selinux-slocate/selinux-slocate-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-slocate/selinux-slocate-2.20140311-r5.ebuild,v 1.1 2014/08/09 19:34:10 swift Exp $
+EAPI="5"
+
+IUSE=""
+MODS="slocate"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for slocate"
+
+KEYWORDS="~amd64 ~x86"
diff --git a/sec-policy/selinux-slrnpull/ChangeLog b/sec-policy/selinux-slrnpull/ChangeLog
index 07dd8a0e3a94..09d068688adb 100644
--- a/sec-policy/selinux-slrnpull/ChangeLog
+++ b/sec-policy/selinux-slrnpull/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sec-policy/selinux-slrnpull
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-slrnpull/ChangeLog,v 1.42 2014/08/08 18:49:45 swift Exp $
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-slrnpull/ChangeLog,v 1.43 2014/08/09 19:34:23 swift Exp $
+
+*selinux-slrnpull-2.20140311-r5 (09 Aug 2014)
+
+  09 Aug 2014; Sven Vermeulen <swift@gentoo.org>
+  +selinux-slrnpull-2.20140311-r5.ebuild:
+  Bump towards r5 (fixes duplicate context for hiawatha)
 
   08 Aug 2014; Sven Vermeulen <swift@gentoo.org> selinux-slrnpull-9999.ebuild:
   Make 9999 ebuilds EAPI=5 and transform to make master for version bumps
diff --git a/sec-policy/selinux-slrnpull/Manifest b/sec-policy/selinux-slrnpull/Manifest
index 5534ea11d909..cea8931efaf0 100644
--- a/sec-policy/selinux-slrnpull/Manifest
+++ b/sec-policy/selinux-slrnpull/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-slrnpull-2.20140311-r1.ebuild 395 SHA256 a04ab28e977605a40fb8b3ad71db1462dfa3bb4e98df9fe0f6839e39d2267a33 SHA512 5ad6ccc49fe0074d482106fee9f99dbe53140615914eee845ec36f77621cedb02f9b72d6e16da2f00374ad9f9cc16cb40547d6a2ce6cdf78e7b419e93b02e7da WHIRLPOOL 9e0e82cc074688a291fb79aad4aec5babaefe8fb9e1c9a9730c9bb03b8de4ebefda5b29d8f3dc92095f6660b7cfc477e64816b0833f87c6a890cdd98914a66e8
 EBUILD selinux-slrnpull-2.20140311-r2.ebuild 395 SHA256 b80c92a527fe9834c671e5b5a5f80e43403ec4d251e5b0aa0266297b52444965 SHA512 2506c3e1af16d2bf956a768c6579d36ba8530bbfb949c066693b4fcc665535dcc3d71bf5156635f4c3632358ea3d96a0a3c2aec8bb7e3b073445fb277a8badf4 WHIRLPOOL fc8c7ba3ce1d9dbc55b2e2629aaf2e5ea0d6cfa013d246e494504a0dd2158643f8f3649aead4a51fdfebaedd281fd78e6d8e0d78391e629d706d570ab161d52b
 EBUILD selinux-slrnpull-2.20140311-r3.ebuild 395 SHA256 f9a05017c7899d5284357db4ee3ea4e9fa2675f1f7c06f8c9abbb9528174e0d7 SHA512 ace3077ddf779b4e3bab4c8e6614a9d566d1e56008f196ec6c378ab6b24482fe74a10068cb948132d3a264fdf8909e32cc2046ba67e1e6e6ce6500b3b4e15cc4 WHIRLPOOL b448f7f8c9d1b818c0f31be8ba9c633fb9657f57f56e031d7dae6e3e67687fc8ac5dc5babc60d1f2553b739d65eae04481e2d5df896f18773a16ae3bf9849ba0
 EBUILD selinux-slrnpull-2.20140311-r4.ebuild 397 SHA256 95ff762ece22dccff29f82910c02a9c22437b47ee17c6739423e932ed1b3958c SHA512 eb452013ed3eaeda9469bb2f159752e3efb2ca44c9cee937784a074f3241c0a52bc3cf6316cc2d2d428480adcbe49f976add4a79aa0081e2c587938cc7b53dcf WHIRLPOOL 6d3a07de7b1b40f8006cf021859e2c78dbf20052ee558a03a4d303b7bfa1749e2f8ad103afa9391120a535c4e9243ad6b65eb9cc84301dca1c520fe092b87c46
+EBUILD selinux-slrnpull-2.20140311-r5.ebuild 373 SHA256 a16df0bc0ecb8bc9e592320d17065ab348884bac9e4ec26910eeee72bf33a60d SHA512 cfd1152b6963e9bd097c9db9db0aa5cc76287a716a4747332cfec4eee921709440c8658a2a1f468a8a6c4b973a664d0dfdc1d1daf22b9322d8ea056275fff04e WHIRLPOOL d9f2c6222bfb541450e5601a6612d08c30fe9b9e3f74cd1f91873a676c7f0fb9c53c370323a3c1c98e694009add3256b42d4319f6bdcc4ff9d32150f9c57fd3d
 EBUILD selinux-slrnpull-9999.ebuild 353 SHA256 f0b0541bac0f4f6a5eb795ada985130413c228a932c5713072f1a88c5c1d72af SHA512 c1f9939b778ede86bf855f732313588d031da7beeddeeeee091345c7712d69d898c6abe8017affb1c1343d88b9a5b96093c5ce3440f13d30e220b533ceb281ac WHIRLPOOL 1c90cfb52adf71ba2b33b70a66168df13eb15db34ba1e674c2f55a4b64d5e31e64bde8b396ff0d7968640ae87b0a064f61a8b12d6ad92a901dc11c2384001a8f
-MISC ChangeLog 6671 SHA256 d1ad419f14ad6593427e3255f522e277875cf3afebf4395745236f2532306b78 SHA512 319222592054dc9d2a8e7d1b412dd8f9b23466c0279aac71d73d7b6b3b20190426c547fe7809fecfe41d15920c10f0f4ae8cd7630f01e04541296f328aee39d2 WHIRLPOOL 09098406817418bd6a5b7da3684fbfe8c9d6f086bc1d4788753c724a003e1ccf61a423f8e46b74304e1a5f4605ec0af7a591cc22d84c0854aaad5d53eb18006f
+MISC ChangeLog 6867 SHA256 e2a138bc3022e2e0badb4ec83922df11af9d640d85155e492712c4032d090499 SHA512 2b94db67797542698b63bd59e3927886917f9f16c2adc6672bcf5c766858f94796cb4a3da4bcf441fd176e85543b5f73bf100612cccb3ac432fc69821d0e34a5 WHIRLPOOL c7bf4fd28d8eb25a24e82b4b7c92454ab3570a924db2032b5bb539cb404f78d1a558787b42ef7b93d9a84a79376040b7e765282ea19c74d65612bdaf2fbc618d
 MISC metadata.xml 232 SHA256 a4e8f79530d106617a004cc643396f823b932252f563766d9d660c0094d6197a SHA512 596629b05df4b2d92e20514ca535cc2c91315b2ec689cb96e0e3faa1f65d0c827d0efaaf5ae076cfd49655f87e7d7212042fb0cbdc692c2606ddddf1af84f2db WHIRLPOOL daff73cc8f26fa0f69f4182f95ea0fd63a8bb4428358e26f713427be54fa2a03e9c6132806e2dbdff51ab18bf82ead8b3e5b1cb3888a291baccbcbae62dcc64a
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0
 
-iQIcBAEBCAAGBQJT5RyaAAoJEC7dUkA7aK9HitIQAI2CxkLqU7O0zhRtT0U3JLTf
-963xdmKF8q6KAK6JzFv9mj+YMPSm/yNlWGNK4iex2KGrjXmY1Nz9f1mLf6+Vq2b9
-ZMtd238StQ2/I4nwJR/FDGRmk5PpanSozWgVPxiBLEliWl+WTBO45EzndZU2nFUs
-Qm5Xkn49HCx/ML/u/uasqgkvMtsKWP2WNJi7OMaFXVd2xjfTfPRT6K9MqNqPtFL0
-nvb3gaO5dNWUCEcH5Izz5/NRPfuezIIRju+dsTpviGRWixM7fDrmCrvANxcAR9Dr
-N6NYTMbKAEmbzZb0GUyZOtWBDiDIXWX4nDVXEbSR4i9ooIgIpyBPwtSak8byN5H+
-xvtMJ13IvCWTfSUdP4u6FcnIT0/w+Mt0oIgX8AVskHezjvTILe/YwFozn2oj4yyI
-JJHxiWNxh7mX1qdcgSE2RMfFKmYZK8qPtghlloKCh/wltWl3IuOHmQX6r20tdUHX
-W+GYmOklPixlhUZEh+LB+NQD3usSszN5yxv0x7R5SGuxUr1pyO8YE4n+Q3B2W3Zs
-Nhy9Kn7RVGnIM0s/WLmgCDzCyTegL1qzCXB3QsFHKzlNZbT1j96wNYA2yQ9SaWue
-3B60ux77TY/+OUbPcPtSrdoSKeKuua2wMYegq0kD8NpU/KOsYz+0EZ6uoUTjE//O
-0o8G+Mw6l/EYaZq2lgyw
-=S9bX
+iQIcBAEBCAAGBQJT5nhwAAoJEC7dUkA7aK9H+HsP/j01tuTZ+es8BrtOuqGf7dDM
+qeFK6y27lPBiKYLtRDhzxJ3M24LINCllzS3tZiPUvmw2BLPv8poAx1abBcMK/vsr
+CLNnM0Ytvdp6BUHuyeqxOjeiBojbFHc5Ieha8YD/9srIXX3HadisV91SQj37EqRn
+jmO/E5IVCVh8lg1Y/9gQqeasgdijEPhKtFgZ9Q8txMxK3eQ2kG1YXC9rWgPVRa90
+jilTQhucQu8gO/vBJ0RaE1hrWwjMIoVG0ffX37jS+QWT8aaw1h/CrjLRtr/ezDol
+Lk5Qj4rWpHGZGtoeteZUJ6M3kwyiP3hmzRSA54QWc8JTUdUb4cdxRYp3DB+rahzn
+IEz/XVi7lAMvn9dnTqRigyB6csrP9woyzIQwUaGo9ja+yGwnc3Bi3de04YpJpPOe
+98uH/pmsIgtdFVS0LAt3nVmQ3Yb/DRmhC3rS65YmwrnGtOtdR2priAgk8NxIhgUF
+3qu9LWfkWBVibPmXlxi2MB44OGEsaUi0lMa2SJfkHkarZrSzQPhhXWljMTb82DzJ
+oyCr/oQzfCQaH+p2FYb0jlp/yaBtV4uNRBPOr1dT8pW/J7PwnGZdyoNDXxyfIisQ
+ZAtX22+6xcPRUfQ15EnIw4acJ2bev+lprdEmL7wjOKQDzRrZ1MjLpcLIDWLCCHlC
+xcYTRYQ2eMvPKyrQW/sX
+=bT+e
 -----END PGP SIGNATURE-----
diff --git a/sec-policy/selinux-slrnpull/selinux-slrnpull-2.20140311-r5.ebuild b/sec-policy/selinux-slrnpull/selinux-slrnpull-2.20140311-r5.ebuild
new file mode 100644
index 000000000000..44d5ce707069
--- /dev/null
+++ b/sec-policy/selinux-slrnpull/selinux-slrnpull-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-slrnpull/selinux-slrnpull-2.20140311-r5.ebuild,v 1.1 2014/08/09 19:34:23 swift Exp $
+EAPI="5"
+
+IUSE=""
+MODS="slrnpull"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for slrnpull"
+
+KEYWORDS="~amd64 ~x86"
diff --git a/sec-policy/selinux-smartmon/ChangeLog b/sec-policy/selinux-smartmon/ChangeLog
index ba1ed2ee22e2..958f5e0837cc 100644
--- a/sec-policy/selinux-smartmon/ChangeLog
+++ b/sec-policy/selinux-smartmon/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sec-policy/selinux-smartmon
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-smartmon/ChangeLog,v 1.42 2014/08/08 18:49:21 swift Exp $
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-smartmon/ChangeLog,v 1.43 2014/08/09 19:34:21 swift Exp $
+
+*selinux-smartmon-2.20140311-r5 (09 Aug 2014)
+
+  09 Aug 2014; Sven Vermeulen <swift@gentoo.org>
+  +selinux-smartmon-2.20140311-r5.ebuild:
+  Bump towards r5 (fixes duplicate context for hiawatha)
 
   08 Aug 2014; Sven Vermeulen <swift@gentoo.org> selinux-smartmon-9999.ebuild:
   Make 9999 ebuilds EAPI=5 and transform to make master for version bumps
diff --git a/sec-policy/selinux-smartmon/Manifest b/sec-policy/selinux-smartmon/Manifest
index af78e19023be..770a12b6653e 100644
--- a/sec-policy/selinux-smartmon/Manifest
+++ b/sec-policy/selinux-smartmon/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-smartmon-2.20140311-r1.ebuild 395 SHA256 5c445b615dbbfe30a77e9aa3c24c457f4406e4d7dd2750d1a05e2a7030149061 SHA512 29ff40aa7666f541218ee869761d3e70a7287fc315207f9e6a349fa44f7ca628d57aef14214e1a7642b984583bb86a24b891b9e00d6036bf69ea259971ce90c0 WHIRLPOOL f12db6494cfe5da035eeda33b03b6b12393bc242662663294617856a1e60c76027bfd88454da7dab4b25ce544c5e715c51306f0bb58bcf07b872d0f9127c7125
 EBUILD selinux-smartmon-2.20140311-r2.ebuild 395 SHA256 361767761d9f7204e8bfb1aaf2785dce2eb9a7d04e93ecf056c260cf8ee5006f SHA512 6b980f0b6f1fb68739d22faa24db60ff704c7b54889433d4e7e4fcd19208910429cf271568737450f0c7eabb440d81fd43821115d4e3aad101e06ffd8fd070aa WHIRLPOOL 5fe33469ce73969be8ff42d98cba6a7e8d2eb91642de004c4777029e648f11df256d83876230298a90487522a577cb8a1fe571c51b212c845c19e81224287655
 EBUILD selinux-smartmon-2.20140311-r3.ebuild 395 SHA256 1e8ee1b8a4f61418fb73ccedc53605de0e5748186618542002e610181beb6213 SHA512 43779a3e913257153700da4a720d027137506708193b53f61742d675797ce7dbc9c211429c4b0efa8329848cfcbaf7deb7895088f25ec4fba98b81f28a623734 WHIRLPOOL e20d896049bb822d400d1bb3b7e1b52e4708a96ecc3a38bf430e355a2011e06857d44602b154db29a2c283e3a4a2a20f1a2e782e278c7ec08c53e92134ea62a6
 EBUILD selinux-smartmon-2.20140311-r4.ebuild 397 SHA256 f95c7efbde2c99ba5781f9c281a01b28e30e7306ecb9bfc0387a3bf2ccf02d06 SHA512 92388ed60912aea4d4565769b9beb60ee6fe390f8c67c46f469116684ec7f203afec37dd84b80b23f2f00c6eb5ce9f5dd64e40b522def7eceff4da6d37d8ac7b WHIRLPOOL f7b7c6a4cca66fb930b3593467e3dd344b1f89965939d145cd8b332520a00a642b49905de6c242eec0fd263ebb2460cee9456de1342d7aadff916f1e29ed7cc8
+EBUILD selinux-smartmon-2.20140311-r5.ebuild 373 SHA256 c0175143bf8c312c9c8f6b785b5d371d16c4a869cf4a83200256a64a22562dc7 SHA512 752ef2e30cc62a2cf0248234bc5cfa654ec5e695603e5ec9e5bcaad95d905db2426f9a697ff0f823aa0a9faedfbe4d0135069c7cc04aa67ce1ac30770f175073 WHIRLPOOL 748271631bb2beebd469851883130955adaf2cd193c2db9e31fbfbd5c10bb5888142491f10870d550bf36153980ca87bc0245dbf7089c1bebc4a32d7a5f21a86
 EBUILD selinux-smartmon-9999.ebuild 353 SHA256 8b4ebc5ba651b33ac25ddad11a6c300654dc117950115fb6ec06029bea21193e SHA512 6a50b2d40f6250fb447cc29222a3c419ba18b587da045a4b507392fe4a95c1d603c669c46b3b7017e1fea31d38506f7f1ee1e04dbf12f681af7f67bcf4b5755a WHIRLPOOL 06c254723635aa40efe5ccb32a2e24d1bac03b238a1e0c3ad5498fa02fe0c08c1247727c594cad50dc1fe67181af451795a5cf2b007391e0497750b60c1c35f8
-MISC ChangeLog 6671 SHA256 1f3bf03836d4995636fea646549612ebbce3ad9d5383198be893fc2235b2b4b5 SHA512 5cce7620f22c07a67ec5279519892b5bd324f9e494912ef6a7d6dc4c0ac220fbf2d01e2485fe442988961a72b1185cd7345edce4d2ccb4036fa2a8075cf231ac WHIRLPOOL a733dff4e43422963e35b174dba4e6272db1a6583e2eefe3c9ae330695659c463c60e955d3427e7e904b51a31060833f7aaf136f1055d68a5742d861da3238db
+MISC ChangeLog 6867 SHA256 6f538aeb1a3ef7d1386ab6095422df9d8c240886d6dbe4e139158c45b28f305a SHA512 23460d2ecc38ee6682596f308a742bda8f70b49ec82967b20176aeb265fe9f3bdd2648aa118813f2457a455345c06af2bfb8a49f8e88e902d09c98ec0c9d9c6c WHIRLPOOL 63fd5f06a0ab9f5b8e67fa4ef0325ca833d4994dc92bf1d2ef26f90304b18351aee09e5cc76f4070043630a87640acbaec942e3e4f0167d0ed44ec473cbc71f5
 MISC metadata.xml 232 SHA256 f04a8916fe49b55fc807c9e44c8fdd5d655ee48455cbf9465b945123a3cf3099 SHA512 43b5d48cea578177f86cc717da2f41da649ae296123795d66d70044c864953e6770cd0921ee7691d7d8b21fa841e4d06d9a9718c48962465a9c23b422eb7e1ec WHIRLPOOL 112cbd90d00ab171774034e3aecfb8fb856915e7240a180137b7bc0a12019fd095e21d663cbd7064bfac8df9d78056dc43c7b9d9d356f104db83555bb01d1240
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0
 
-iQIcBAEBCAAGBQJT5RybAAoJEC7dUkA7aK9HmX4P/2d+Gf48o4eckGmc90n652tf
-azdqFrFNcrmHdSxs0fFh5KoN3ykSwqu3Tx/a1GsGYKuiwZhw27gGZGVkS2/2A1Wj
-Qzy+VOmwwltmwSM8SlBDkeEuWBq2wwtMr5JyG/b+PkjCTIm9VLb97l+vilO4mId7
-V7Gz46Y0lBh0ZrNxM5zw0iRv75/avnGuhxX90fb0p/9gklCDIfLYteJix5xN03Vf
-ZsvD/E/n5XKZlGLJ6Lh2HRC+fMt2yLhiUyRk5LUQw8oOopChhTitW0xZJ5UbyHN/
-c80a1qczn7eqcWO2FbTXkNwVg52fsWHYxXIFnRMIMIXUocqPtIi1L/Sfl80sDXiz
-tfaJKw+2rIU6OpO6gqxbGwKLqOSgB5yLdpoqjiPKyNIy0usyxzy5Ndt0ETOoyyh8
-IYqVHmHktfozwA3lRcYNwkyG3eqotg3g1ju8TAqoeLpqs9sMP07Bq4xBc+33n2eT
-+lBcvz7thihm5LwI2xLAEU/zAxkjb5mGWAqcPKnqi/pb6Pubf5LyPEnFRRtA7TDM
-FhhCYDi9NvzeV1901rlzkrDxn6mzb/Ra+MuyXGF3ipj56A+idpewaOm/R29IRePb
-ypDWfq/cC62aTP65wX8vQxRr+LHBQVhnXlwZ6kGkhb1VLifzWzqiXM9cy3E4XRfE
-T/rVLTwfNw745S1eozPe
-=hoHL
+iQIcBAEBCAAGBQJT5nhwAAoJEC7dUkA7aK9HcywP+wR+ExQ0rFlr+bUlTVWNMeye
+sBIbvsosIoROqQ5zrqPH42q1JM56QuIuc4fujkDhmBkhCUUfyV0Z2QpsFNeZDVgT
+DbcHqgBQlWRERSW3y/PDckVE5f3M67r+V7dleh6XaG9Siict6FAinaqCMHl9Py/7
+Z0CGn4f/et0/blyKofTkaft7jmB2IEwL/uhwhx4X0TSAa33cp+7A9iqHviDM4fSQ
+HxkagsBFh+SeDy0Pt9wN13jsv3Is8YvZ6xKfh2ixrG1Xl6OSoL58SRGmWg/T+LLH
+xibRzHCmT4NzOtNVh9UkaN+aiGDZ7Jr9fvj6pd1rjRcJz8Yd+UtgrAFFu0VOvUkI
+z4VKnEoHR8Mevia0DHp/UM0xswlJhBv+2yk5tm88HpEJawsffXydPmdkc51ArgoV
+JlUHc6ss57J8VT2AI9G3orHkhdZVpO8EmA3SV4Sm2v9p4MkDBUOJ1R+/0+gANNFL
+nQyMNbzAapjWYVd4KN3Zj241zncBmH3Mq2sT7+ZMzaGD7DCZb9yFVIPZe/GM892W
+89lBxe9AnnUb2CRS48LR5jO8iLzsYtjl4ugwyyRL24M0FmLqwQXF7yZ5TNOHqIy6
+ztpMAFWfQk3h0OT5xJ/iou84FwUGBJPLtDgvMHVOKGvJLa3YQBv5eWpq7MGv8TvI
+ve+zORZfLSXAaY9d4LYh
+=X8Nx
 -----END PGP SIGNATURE-----
diff --git a/sec-policy/selinux-smartmon/selinux-smartmon-2.20140311-r5.ebuild b/sec-policy/selinux-smartmon/selinux-smartmon-2.20140311-r5.ebuild
new file mode 100644
index 000000000000..d703bfe687a3
--- /dev/null
+++ b/sec-policy/selinux-smartmon/selinux-smartmon-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-smartmon/selinux-smartmon-2.20140311-r5.ebuild,v 1.1 2014/08/09 19:34:21 swift Exp $
+EAPI="5"
+
+IUSE=""
+MODS="smartmon"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for smartmon"
+
+KEYWORDS="~amd64 ~x86"
diff --git a/sec-policy/selinux-smokeping/ChangeLog b/sec-policy/selinux-smokeping/ChangeLog
index 6470e1c411d5..4f17b9198364 100644
--- a/sec-policy/selinux-smokeping/ChangeLog
+++ b/sec-policy/selinux-smokeping/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sec-policy/selinux-smokeping
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-smokeping/ChangeLog,v 1.43 2014/08/08 18:49:59 swift Exp $
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-smokeping/ChangeLog,v 1.44 2014/08/09 19:34:46 swift Exp $
+
+*selinux-smokeping-2.20140311-r5 (09 Aug 2014)
+
+  09 Aug 2014; Sven Vermeulen <swift@gentoo.org>
+  +selinux-smokeping-2.20140311-r5.ebuild:
+  Bump towards r5 (fixes duplicate context for hiawatha)
 
   08 Aug 2014; Sven Vermeulen <swift@gentoo.org> selinux-smokeping-9999.ebuild:
   Make 9999 ebuilds EAPI=5 and transform to make master for version bumps
diff --git a/sec-policy/selinux-smokeping/Manifest b/sec-policy/selinux-smokeping/Manifest
index 7188cf4e0bd2..7dcca3da358b 100644
--- a/sec-policy/selinux-smokeping/Manifest
+++ b/sec-policy/selinux-smokeping/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-smokeping-2.20140311-r1.ebuild 466 SHA256 349187d68d864e8af1269cf842a1270fd308ef6d66f42ccb2c6906c3edd3559a SHA512 750f00e733503e7652822c4dbcb6a08f97f0bbf47c5f0ecbc89bba0f1ac586ae9875e89a6e6753822d013b4f0ca13ecff9bb42a236104b065b03c4912b7d725d WHIRLPOOL 20001644f035580c39a68788aa87e7f99c48978d930c77dba426b6cbe75e7070356ccf227bb10ca83b316024dde155ffae2a37da07ac872712f78a7c1ff31c9a
 EBUILD selinux-smokeping-2.20140311-r2.ebuild 466 SHA256 41fd5c25e86b4787edaefa408eff35236f69e3fed388ef7bd872d20055af1114 SHA512 e52031d2c2b9b1f5adaf2b3e77f278e8b178b57c3e472d74bbfefb7f5d22672d482d81621a74fc2e177febac7eed10914fe92ff0d86c211272d52c3e3838f40f WHIRLPOOL 048c50c5b174560a303944dd9457000b0277211fa22ad2321efae79f0366e3af0ec7005ea08d16135ed5d5e189e85bf2cc1c3eef99431f12944915d1d701a19e
 EBUILD selinux-smokeping-2.20140311-r3.ebuild 466 SHA256 f57e968f9e8aeaf691ee399781d8a6f6559e53c893d462fd926b9d7cf15199c7 SHA512 3c2d77a5ab95addb3922500b1bc3a65eafc6fc00200bcb06421f82125d3f536d2ac615cc6954d65f3d9b5aecb948924c25d48f3e90c44e0d0e295bf320d98500 WHIRLPOOL b84903f9a06a8cb70863b7f6c99f02b8a187aab25abf8b1d2c2a3916fd1bc70458fcd09e4b5d622edd79cc77597c82d347c5e7b6f7ea19cb6122e0193f984fa6
 EBUILD selinux-smokeping-2.20140311-r4.ebuild 468 SHA256 02b1ea5904d72ea47cc840bac181a13e5f2a8dd8a515229cbab34009e39f458a SHA512 ad9c5a0ffe5214a40930bb9df4c2e48bb6843fdb44ddf3a0a5551ced3bbb236d346920e45f4c0b4b18ea0a8f8aa1990a47e128ffb691f9363ca404d2e61b5091 WHIRLPOOL bd9dca1c153b9c4609085367ed5cab0a216f80c7972868c3e4062b427b5636f084977c42087ca37a76fea417a91ece07e016a0b3ca2ea052e26c01664a1e2027
+EBUILD selinux-smokeping-2.20140311-r5.ebuild 444 SHA256 8fd7aac6e186d25ff9acd1cc151687937f9aecb65bec1b6495bfa6506b284a26 SHA512 106eb541b3adee9dbcf928f8991c7500aab505f01141e30ef000188b7a90ea30c01390fa7f68660c07a51b059f3fc5e5025d184ccaa4c552e9412981cf3d2f48 WHIRLPOOL dc9d4080206794772f12e2d9a7932dd776c792a28de498decf35c76253184ba63efbee0663d5653c880d6ea5969ff73e8917097a3f02ddeac9768c850f48ff4f
 EBUILD selinux-smokeping-9999.ebuild 424 SHA256 72278c42ffc8b5dc4060951272e5380c442b7779a92af8a1d42319970fdfbc50 SHA512 1862f3d3a419cdbc0d069287a8c083c55075f353b6b061414934a7de812b0e1083eac508fdf13e0be3eb217ebee5a296be1a5a6a9780f94f9bcb6b37153722d4 WHIRLPOOL 755d6a4d77bb2161a40e7c50dded109e6969abd092138772e53328ac385ee7979eb2df4f98bee962ea91f0f8be98c4d38936bffab1d09b420db4cb22b5925809
-MISC ChangeLog 6896 SHA256 23548606b8f6a5b31cf822a43105240add984a2d17a973f144b44bff84dead15 SHA512 ec39c428b1f0d46af977a0874d9db738880d87e8c5a7525905f0a953c340212045d7905533da2c8cc7cbab19a5c7638946aa899d4af1fe4079d25ec8922fb657 WHIRLPOOL f53b6fffa43116eeccd3f77cba03560dee338a6a9a6358348dcdf4f81fad35c4dea30745a2aa69c95314a9cc92bc0b57e325aae5e0fc5c0e2acd94fec83d8597
+MISC ChangeLog 7094 SHA256 ab678a47b069a574c540a0943e2eb981620330554cb55becbea558d5d4929276 SHA512 0e715f1bab1b2c79c1d62a20ae29d36d6e0f770a1a0a1d94c794bf79395fb8a381a617984df433770ce9419083aaf66468b6f1cf4e4b3a5e0ef83e3ad655e56b WHIRLPOOL 89bdc50df67adbd68b263eaa5385145e72a130c1b96b1f004dbb9e279650b4ac731334464adfed744c29f6d6b5bae565f13e00219db405dfb107cdf48c8260a6
 MISC metadata.xml 233 SHA256 4c87c18ce11de0ad0680c859e3159c61dfe7acff14297a29e5bda3f79c6ce698 SHA512 6de1048596385c3c28cd4c5235b6b69430d5f36943b5480458e76c4b111f6b9bdaed65384b6fec35f56af101232f6d9b7900cc8620c6e63ffd397b3f8255fec1 WHIRLPOOL 4add9790d2d3e1ca618c58fc225b8c6d8b99761422156ed4500881db8dc926b13ae438bd2a6e86e2f59fec3849270be8838da01b9cbecc1605bc00b298bf9d25
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0
 
-iQIcBAEBCAAGBQJT5RybAAoJEC7dUkA7aK9HnJgQAJFMq75qkOUEdULnbMVIesc9
-CNO78QqjOQo8UErWa4QHfmAZXAYfVS1eHD2auZMMJ0QCBj0XRYhlOvu72slPur/k
-DUwAry69Qi2fyGbpJHP48hE3GBRJY3nsA/wZEDpZ21v2G0FfHDEhElgesW78Pbeg
-UMtsO0bMPtWBDa/2jsalpQWovxg4vQgwm+8TLXMgTPjefaYh6JArtXVf2A+oxLBB
-TfYiBi4JUaxgZ++Uo+Ya2bcobubohdSTspMcXfdY90PMkI5Mix3fCbiuEfzYm1nJ
-HDMExOSpUVxwkzhuBo1+b5pnz2vvUbz/HFaa7UgghNTNpCUvEKscTYbj5VinuO8e
-QBEo6n03eUJpE4uHlGESdlKf98CwYnwFUz4HwnN20IB7dg1DvOhaPsCH1EceGDgg
-m8pHwdcxN6IgMVOxWBmkWfRSkwWbllFFfrKu2gnegK+g6VI5uz9RaaJDDzPkQJxu
-NLgN2uDPtl4C40dwmjeQFLVx4MCrF0BfvJWh6yw+nDoKmKNgGZe/EocFEtWbEuEh
-oRPEZEVuyjnVB3rtDdfjSzT9W2EPXsAMOdqHuhsooOqy9GoPA/mEdi5VDRqzFtLj
-fFERCoqhlpnppc+WlK4y+wPL0nJWJ5eIpjctnhLtN2GXAl1Pty2kokfJC3Yg2mR+
-QyfkRiFsMhVavBKOen1j
-=1KSr
+iQIcBAEBCAAGBQJT5nhwAAoJEC7dUkA7aK9HwZAQAJRkYCWi+HB0nXTstSlCVwDE
+wXlymYuJ2+R7q6xzH4oaSiIw46AtmIa+dE1TtBe1Vx9QOYAb63ot8512I1oS3/s1
+UDBIwuXqBEjfbWUUPf7scCeTIT8PQHmnoKrGI5w998t/gz0y2+g1Z/2wOgAacMkA
+9OcmuxY0DIRL5HT5gxpn4U3k8aGZ1WBQf/QDjwb1JDaBAHIi4WyWEXCmrXRc/VEL
+ixQv3HOuS93kRPEK3Ga9OA4dl/l783jnoW7/aJq9KzE1QNj0sjskC5sda+5BrlmZ
+NUEFI7+ZUgsJE3Xi28LEC0fS10svYfwdUO5nkKFqpRN+8+2sbVCr1i9Odu9URCVv
+LOLGtJdsQQUYtVoVocjsRtO2dsAW7EjroGxfxpSEEzMMxIfk/QtXPJ3OkObQ2Sr9
+WuAIfCvUmMr+GnfSbe0ZaP93Ak4/3HJOwCkd51SrcuqXaqutvdJQkJ1EPAb9QgFq
+dWtNG6lXEA6kZ0u2ZPwa6egFDfyZwzhlgsmIxJ1rrIPZ54G8T1CYTCJD0Yey/oFh
+qZcHaUveOxNng87POzuTtVtCg9I2bQy5NoQT2daA/2wV0ynnfrAa9OhzJgwc+901
+zlBg6NxdD+uZ3h74KUka8qncV8J//a6aZhv3PJ8N9XUb25MHqbo4lVjrbFkQUuWn
+rzjmlzzdbL9wItY5uzzp
+=Mhl/
 -----END PGP SIGNATURE-----
diff --git a/sec-policy/selinux-smokeping/selinux-smokeping-2.20140311-r5.ebuild b/sec-policy/selinux-smokeping/selinux-smokeping-2.20140311-r5.ebuild
new file mode 100644
index 000000000000..9cb0d5d850b9
--- /dev/null
+++ b/sec-policy/selinux-smokeping/selinux-smokeping-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-smokeping/selinux-smokeping-2.20140311-r5.ebuild,v 1.1 2014/08/09 19:34:46 swift Exp $
+EAPI="5"
+
+IUSE=""
+MODS="smokeping"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for smokeping"
+
+KEYWORDS="~amd64 ~x86"
+DEPEND="${DEPEND}
+	sec-policy/selinux-apache
+"
+RDEPEND="${DEPEND}"
diff --git a/sec-policy/selinux-snmp/ChangeLog b/sec-policy/selinux-snmp/ChangeLog
index 4643b3faa8d9..93851bbc59d8 100644
--- a/sec-policy/selinux-snmp/ChangeLog
+++ b/sec-policy/selinux-snmp/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sec-policy/selinux-snmp
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-snmp/ChangeLog,v 1.40 2014/08/08 18:49:39 swift Exp $
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-snmp/ChangeLog,v 1.41 2014/08/09 19:34:07 swift Exp $
+
+*selinux-snmp-2.20140311-r5 (09 Aug 2014)
+
+  09 Aug 2014; Sven Vermeulen <swift@gentoo.org>
+  +selinux-snmp-2.20140311-r5.ebuild:
+  Bump towards r5 (fixes duplicate context for hiawatha)
 
   08 Aug 2014; Sven Vermeulen <swift@gentoo.org> selinux-snmp-9999.ebuild:
   Make 9999 ebuilds EAPI=5 and transform to make master for version bumps
diff --git a/sec-policy/selinux-snmp/Manifest b/sec-policy/selinux-snmp/Manifest
index 8a299094095e..5dd4c1455403 100644
--- a/sec-policy/selinux-snmp/Manifest
+++ b/sec-policy/selinux-snmp/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-snmp-2.20140311-r1.ebuild 379 SHA256 a50b6731053f4f2ef41526e243e5330f0dd6f4583c594fb073cb3fc233af4aa9 SHA512 cb62f1a140dfd9958d570fa291b5e75d70319e7b481703f29b1d22ad270af875e8fbc4a6035f0c9e23904d1ecd6f77abcf000f104c606c910302a573a5c98fb6 WHIRLPOOL ee1387cba3e7824712fbd3a95eeb49150c5f05c86232033763ec6b304ae429ca0afea0bcb9fb027e4cf1e94d3deab1a558375fbeef3ec4afd6cc19ae0005d91b
 EBUILD selinux-snmp-2.20140311-r2.ebuild 379 SHA256 19329995461b428052d4d38a1f14862f84ff63eea4be0ac6b6cdf769fa199e0b SHA512 fea44f36ab67454e91390c9798a5c2deaad0e0f97156e560784135287c8a019e8785c60bd95af932e3b74691e9dd5b5b9331e4c9f5172b2c8576bc8cdd76d2ad WHIRLPOOL 63f4777ec1debe623325e8c1e3bbd063b4fde3c4d58e6c3d0c68b3039363f5d606de61aa2a0b981844920d8859d61401bdd249630be3a1e74996314291800851
 EBUILD selinux-snmp-2.20140311-r3.ebuild 379 SHA256 4a023b868e93a949f474c83ef0d98df079aa9e860cc438688b12b89d06792d5e SHA512 8d25e5acc7cb257863886cc70cdc9b1cd4c15738e526ff85e5aa102e20ea2fee4d8acd595bc920a3e0811ee61fac4048b1fb19458522e7ccacad13ae236181d7 WHIRLPOOL f0d1015816195522ad2decc674cd61fa57184f44ef357a261ef7684444043a9418a2d2dd33164e2e1fbf20089ffc87fcb4d781a785248a9f3622bdf1d18ff4d4
 EBUILD selinux-snmp-2.20140311-r4.ebuild 381 SHA256 7750bcc9ec5ae28221e22fd25203c44db529d7b1f3bd8f6a073ad1643c0e82f2 SHA512 754cd68177a8d5e717f421265f70309265cfda20ff935573e8db8ec6cf05711e3c0295cf701f62f8f6fe217a61150af5808ec60af06e2ad6bf23e3386d5ea2dd WHIRLPOOL 700d2761e739e24614e8dd5b4a23b8b9efc99d5cc20b4f9830366d76a77b6604ad064eb8760c831d6008a996fbf8c555b9551b17461d9a4e2b07da6057ac0e9e
+EBUILD selinux-snmp-2.20140311-r5.ebuild 357 SHA256 d365eb3ee45611cded2f39cef54912ecc57a28816ce1d47ebf4235924ce27229 SHA512 6719ea2a11bd5eb72c609651471a0d16bc292431c4000bab4c0c24a311b237c8c4fae7a7146cc07c924eb0e17ec63b7c8b161e6d4e0f7e2eb95942479e157266 WHIRLPOOL 75db15ac04dbc44ad067512363d7732f950c90b6b81c6f469ab09a5bb86634e8206a81e18d97ea97205d3abbc64cdd8b7b1b6a7ca29898222ab781ffedfb8bba
 EBUILD selinux-snmp-9999.ebuild 337 SHA256 6efb0c0f8aeb82c304e75a5a02a6482521dc91c8917949d43a60ae852a72b7a0 SHA512 fd5df109c1896f36c7abad61cd1a46393d22b037a1fe358fae6daa765b52ab670bef626291ae35bdbffedee5233f1a8b2d1b48ab7549e8545b4f9754bdef281b WHIRLPOOL 4d7eb0f6b25405ef7023c4f44f0535bc0fbeecf420f29a7d1e58181f7e6d38d9c5eecbb635617aa2fae00bb61191ef4335dcec9a4f16569b814240a81f1588ce
-MISC ChangeLog 6400 SHA256 2050ea801912d567df252f994f5bdc7bc48aba113105e9c846b7b773c035b3a1 SHA512 731deef41b837e4a2683eb43fb4e9e65634a66cc4c9f90b21b099cdb0596fcfdc7e50398e8cadee5d75b2e0db613fd2cfa8ea5c5bfae70208e49595d98f208ed WHIRLPOOL 1e2e286bfce5cc8fbf09d83ab90cc14482203e2d66f1c0359b55acb7ae2ca61b2600d1496b3422da908445a58cf3cb206ac8492488b665492a222d10954d8153
+MISC ChangeLog 6588 SHA256 b0f02cf35425a1bbbf6264c80e9b3a283d87f44b323bfadd1f2f2298001d96fa SHA512 06b964d5a1864775b51a56212e3619fc343b5ea691a85178669f014fe446c4599d4b40db3266454f040bec100f99e7e3357f3b7e997b5b0d6b99c27c69520fac WHIRLPOOL 0dcdb65608cacc4842224fcdbfcb2a3913dd82d348ca907d422052b9570d06c872e7090d1e013ec3164699dd29f7c3d41fdeea15f65e0f78b897528cb169c236
 MISC metadata.xml 228 SHA256 7e0ecb1b89397ce2499f05c59db1cedb980f505e433efddf7df805d0847e0b12 SHA512 b17fd2fa2155180945b03abf1ff326d199b15a169c8bdb8f848fee667076d4b87d215ac000c53c2605eb61e323c70b90ac9a9bd5b74ec7f5ebe317870135e378 WHIRLPOOL 196659b574881f3463651c778402e7a2c4327b3c5d54a888760ef22b46da052484cfafb489791dbc056b1623903b468613ebeecfb9ab69ac26f933090d18294e
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0
 
-iQIcBAEBCAAGBQJT5RybAAoJEC7dUkA7aK9H564P/0E84UaUTgqDRWAb1FdjcXki
-WDmEiTC6m1fGMg4dODZE2vyOyLGoCayF1E2K74bGRKldUpOBY0GGTBSbw6AMDxbj
-xrCtcR+zEABk+Ipe9BFGFoGMNoinY74jDX1ZcnoCTv3NdxFcSlGS7NP76sbrakrB
-B6HdyTynDKLidzwX/Jnsdp4Hy9Zhtp7q8Nyr9EAL7aP3C8/1RynYluivmm7Ws5fd
-b7eEezQxTpEweP0abNbY1UWeEeriBt/HbllVjSLlZXrMB5yz1fRB5OR6RYZ/ORRw
-lzlHzDW0S/iB5IL0CIXUHKcMf+8sL7omrGnXecnh7ONmcbNdeRa5gShEK1wyk69q
-Bk0AJ2thMO3/to3E4rX6wwFqN9MuzgqqXO1wQ2KsuS75oo/bPwdS1dlf3pdv1QgT
-X0XbCH7gvSXaHHFbu6PnL93X39j7davURGwOAO6/oIphF2yEOH0CnwqBgQhNOp5Y
-mXx9m/paJboo6iBEsPp/Xmi13NKN++m4LpygEEwoarA6eH0yfK6mpk/vEkDgT+XI
-fGrPbT4z2SKe/NfEHNz/p8opPvX080dhegblLiHQKew1waGk7vyB61tIXHTHLVAg
-+GPpSPCgrPp5OvyotAr0Yv0wMAytPPV/i4BfyccBSY8UAxWhGMXYuUGkX6SBpzub
-zbpjyxjmOlIjmj6sbq8d
-=hYJW
+iQIcBAEBCAAGBQJT5nhxAAoJEC7dUkA7aK9H41gP/3AaKhOmf7cj/WUt7n+b7kIP
+nG6vQ5wP9w7UC8TVGILCANr8Gkws6iw62j/6sd941j02H712BCFybhuzzs+VUTD6
+VFsklbPRCwfREHiqnUg8spQ5bVSVX1Og0OShyB6WnXGulRs2kM1lZrgg2ufvf4yD
+ccbSDakP/C/AVJ5uGwVgtmL9SxNOCT1bUiQ+Q2HjB5dOtv2gwoVloL9JQQmnVhjg
+ece5OFPBieqKCASKmiLBQYKsQBQpqVQrNhQ/DikfIqA6Nw+dKdLn8Z2ZoMoetgIP
+HpH5U/6+Iu7KfFMqKSsfH3vxlM5Hj7EdjlTEzcranJXJqclI0a3U9+szgNVbpT1L
+fvbUt3EcuEEWLeJ8zYV9VdvIRw+hOJekHt9Xr3qIP6aDEfHW9jo2gtwskbARjVPX
+uMTRitAh/paRyeENvt0ZguzK/qdkuSH3O+SpAFiKkDIAo7yzlC+4FIbX61IHkv8V
+rxY6KYQ7VXjGmPmA5aUtbyPS45b/Gxjs+oXFvq1W6hdvt/tHZY3ApGLtGvaEdJ1o
+JTWVIqkrwS0HVfoodfSZ++RDnpxH8oxBZdrXvYHUR56bGpjwXIixcLEmNT1zZBNd
+D02sLk+ejKr92w8FrbZ4nCkLFOrXPjkybce/xD/GfNcMl3qyeiNFpGwSMwU1hjEN
+T87vV+FDltpWa/JzorJs
+=axYf
 -----END PGP SIGNATURE-----
diff --git a/sec-policy/selinux-snmp/selinux-snmp-2.20140311-r5.ebuild b/sec-policy/selinux-snmp/selinux-snmp-2.20140311-r5.ebuild
new file mode 100644
index 000000000000..4c1c45d5914f
--- /dev/null
+++ b/sec-policy/selinux-snmp/selinux-snmp-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-snmp/selinux-snmp-2.20140311-r5.ebuild,v 1.1 2014/08/09 19:34:07 swift Exp $
+EAPI="5"
+
+IUSE=""
+MODS="snmp"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for snmp"
+
+KEYWORDS="~amd64 ~x86"
diff --git a/sec-policy/selinux-snort/ChangeLog b/sec-policy/selinux-snort/ChangeLog
index 17d3180a5658..f13468ea665d 100644
--- a/sec-policy/selinux-snort/ChangeLog
+++ b/sec-policy/selinux-snort/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sec-policy/selinux-snort
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-snort/ChangeLog,v 1.65 2014/08/08 18:49:21 swift Exp $
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-snort/ChangeLog,v 1.66 2014/08/09 19:34:13 swift Exp $
+
+*selinux-snort-2.20140311-r5 (09 Aug 2014)
+
+  09 Aug 2014; Sven Vermeulen <swift@gentoo.org>
+  +selinux-snort-2.20140311-r5.ebuild:
+  Bump towards r5 (fixes duplicate context for hiawatha)
 
   08 Aug 2014; Sven Vermeulen <swift@gentoo.org> selinux-snort-9999.ebuild:
   Make 9999 ebuilds EAPI=5 and transform to make master for version bumps
diff --git a/sec-policy/selinux-snort/Manifest b/sec-policy/selinux-snort/Manifest
index 0325208aa8d6..ea477e03f928 100644
--- a/sec-policy/selinux-snort/Manifest
+++ b/sec-policy/selinux-snort/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-snort-2.20140311-r1.ebuild 383 SHA256 7c3badf92c38db7218d0511685f2c51c70523f33d9c079cdd0f4fcbf4f8b7e71 SHA512 186e21b74482d54fd091a5d775df8bdb1d4ad4ef4577af21e8b6bc963e0aabe41fa5f861bf021b38600028d234ce4a3cf6302dfc51cf83d6dadc8dd999097cb0 WHIRLPOOL a180c69006379713c1dbfa0f8d5b963b77fd6899acc89aac8496ad1a67fa2589573a553fcef3075037f9abd92f9adae585a9077bbcfb6c44f2a393fb7e9216b8
 EBUILD selinux-snort-2.20140311-r2.ebuild 383 SHA256 9e42cdd01a6d21aaed4f428e7cfad7acce65488a93c4deb476a0a6f056b99db6 SHA512 547f9db85353a0535a4a9770db5efee8a5c4417f739695a83aaf4af02549ee79c784dd7f7b7972674958818d99414cea20c5a43d8e07833bc2cb56f962341ead WHIRLPOOL 8332cc5c77806d2dbe2d37d29b4a5dedcb1b08e962580d8caf2ef180b63af3103d85b59d384e76cbd903538dc2b0022a97a29a7e9af73caaee976062098bfef0
 EBUILD selinux-snort-2.20140311-r3.ebuild 383 SHA256 9402523d0bf8ffa44f7fca547392ba289a093f59666cfa1957502133fd3eb1da SHA512 7240bbdbbbe88a093ab216b2ac4a4eadd83e69648e1f0cd22bb58ed3d876ab5bb6a0f5952206d1062c3c9a37649690ff54620ccb665eff5f59678b18eea68058 WHIRLPOOL 0c3e91782e2809b204ca2c1785704865b4d75b684e3241bd74d920bc776f8d79a7f13940febf9d4e5b6c6ced4b5ef3ebdb61e9f63f2aac684d04d23d9b3bd22e
 EBUILD selinux-snort-2.20140311-r4.ebuild 385 SHA256 476408f6b73c0e50ba103033fa20465acf95eb093b4ce2b2f8f13f7064865c79 SHA512 cad59c1fbb6f3b500dd9fa771a280573b820431b8b88097a8186177bfcca46e28e11c785468d4a2d769dcba991deabd8660e02552bcbda813b8a0416a838fb7f WHIRLPOOL d4eb893006e9602956db0671b8829ae3282953fc3d9fa65d2e8ea7c743ac96d016e0b1fbeb2db3b905dfb250d9875658258e3e09f2bbc2ad5edd88614cb830c0
+EBUILD selinux-snort-2.20140311-r5.ebuild 361 SHA256 48d017009d744be3fcd493493e0c3ef3480df837d1a53b16370a57ec081dc867 SHA512 586fd1c66a7590488c1fbc70a14491bf0fcf7a42b55e5680e51b3d8b05385f8d95329704ab71854d9b866094b110be20bbd64b01051fb61b60fcffddc632360c WHIRLPOOL c7371e329bcbf055cb6354b4b49b30bcf27c006b5408184e178b159bf477f5f0fed1ea5d42136943f47f112a1b38f68a3519daba42031ea495ee729f055b37e7
 EBUILD selinux-snort-9999.ebuild 341 SHA256 3fc1127586d069eb99cfcd658b41a7ba72c90980c9313b6870c682c9a321cfd6 SHA512 7c51f50986397caa29f08e5e9d797e2c5338a6e985e3174568c04cf9b6cec65bb733738bc8f3215daa9cc9f49c62cbad98ecf34a63051c6ce95d73cf56966e21 WHIRLPOOL bc41f49e4e0dfec0b6bf444f6e731087485399540653af131bc12dc7fd0e921242f1e1aac5bf68fe59dab33e4f532622f6b4f9c5f971d173a80d178a986a3b25
-MISC ChangeLog 9417 SHA256 764cca54f94971f517ac79cfe162b4337a44899fe62d0f6737c6653e1c3eea9e SHA512 b52bfce3d45b2d80986f5575c35d3cf8f7b7eaea55a0a3c540ea98fcbfd2f000a7d03eacf5f68d008e8d9a579035f80154707783061e5e6ff9dcdfa3b50e6b2f WHIRLPOOL 2aa4e87d08757a38c4e52e42e0cb8a7d2eb6ee82f844c0439c12e5894b55f143d6512ba988ca6c797025bef9473d1af589f4e17973ec317b438cf9c63190dc9f
+MISC ChangeLog 9607 SHA256 871eb469870f50c19b880fbca0e332befa92db32118c5f9aaf731d9e11cbc59d SHA512 5dd5aa09e020cc1bf19c5947801009834461f8c8a37582d0ab68bc5e127f4feda8cdbda7ec4870ed65bd8598bbcd24acacd9918580320b394aa6dd4206af0e77 WHIRLPOOL bf101b2aee6ee1d643ba405e814173be3163a8acbd7318ef3abe5875b9ff2f8153c80140c4db0bf2a6965d5ade50c6cd4b9ea954f7a7198bb033585abd3f9d9f
 MISC metadata.xml 229 SHA256 44334b6861bda0930bc76e0efff3bd08b6b8263ae2eb379224f9d969f056bceb SHA512 a8edb5989fa45d1b3568447f8aaae26f0b706f4fb16654c60f595c08978a3e108ad27e682391a3481c7ee83a4c66e86b565992b2bb763d3dc904478f2829c494 WHIRLPOOL 782b869d91566f5fc3fedbda599f99f53825589186c8a416fc3737b90f50f529828e0de4d2403b70be5cdf1428794b140f2d21ebcc62c6ed5a9e72dcf7aac682
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0
 
-iQIcBAEBCAAGBQJT5RycAAoJEC7dUkA7aK9HtQAQAISzbRaUhS8X8RNRw870OOFf
-CAuxUBpLcwuQsUANQbwbHjdKMSBsn2+r5crtEOA8m6yz0BmhryQgAKMOr1EoGVTg
-BW3XPRoCgNV/egE+tif+dP5gHbe3O082VtHg9pzuxlOkKmNEJ200th5CH2Xx2dgJ
-C+J77/Ta2QpQlWa8VXgbXMOzYWxXFopvvfCMXhuvf8Vkzd/GmQ4K+w2eIlnfl3D0
-zQ9pqH6vnIKcUVX/9fzqULxWUtjualVoVRJjCu5bVBk09eq7RqEuBtY6DJi2pxfL
-2P3RpeN9lS1Ihbe7mK3Sb1puWgJHiBGSdNEWo7Ph41xWubF0eKIdZb6hbN90sYtf
-HZeyebS0UcDhxuVoIrngWID/4PkhKpg2jsB/5aZyNnJXYcvEeMgKplJLI4Y4C9xE
-WVrlDYtJNDIF0Q2YWxTnjFSKQx3DqbLYlqOXBMA4Sji4gFuUJanJEjMnCQEuvK1g
-Zi7Zzb9EzZA93zl1/H6tN1fXDGzV9GS76L0bvpkyGZrlxPLQbsq6PFNoFhrQYNhf
-oteu2Xf7yqIZ08QRNvzYGg9QGhk2LX/OiON6oWRpQajRAECiBLSiWOD1w/wA3A86
-h6fpJrE+paDAWx9hOVk8xPLReuKhhLN26kpvA5+K887laJDGWNwFM7hTjPXuF+1g
-PYidmMg16na/LRiuGbvK
-=/c5U
+iQIcBAEBCAAGBQJT5nhxAAoJEC7dUkA7aK9HJYoQAKZXmehzI3UZYNcJyu0sAClw
++LS6KBwSexzE0o16Ju9e3ekrMbcJrCTVcHhDtwx21m5vQrqIkhZwWLSgctUBlmiU
+doH6BX2F4FtPBkTWVFDlDHmw92uCmFerQM/t6iSmDgK/JL6sTd3LLEidHRQWb/yw
+Tx52bDUkqA5nTJwRYmK41l2k4hcHeWV3mc3M8+pU50qJmKiH8iBuvhEJFw8iDP4e
+N7ZIChWKnBFpXLM7Ylue+pz7hpVB/miuWLLnCeFqApHdiiZT53ey56j6y/PH8Pn+
+fwmnUtsxCweGrp3NTtSWLtvTq/KT0BJiK/243796nDCYvXbpP3I6KIn2SM3GRb58
+inW4QfqZu8DbrOnQcUpofaZ9eQwE2+enAOrAByYIWyPLmxFqMoY5MKTuyhMrj49I
+OzmJgRqleQwHApwSnCKlgyljok8a4y7cuLfyzduVgyeAf4cjjyUD2MHHjjCpOD0Y
+cLBDr7Jjb9VXwqBZ2r3CuINsCqanOgFRBu/gqmItkTa+5Lebjj6SckP5l/VPdYec
+KQprcfm0tExTUEuUB2F+QaUtbEd4UsN4Emu34QdxBxI2iwA7qKccclBcExWmz1sa
+df+WTiZLoXj7uy8gyXT3Wsyp+OH8jGivddhD1tHsCBkdi6iPCzd2QXRQ6z7PUgQR
+gCX1k/xx7aeX2iNUd/Iv
+=sC1a
 -----END PGP SIGNATURE-----
diff --git a/sec-policy/selinux-snort/selinux-snort-2.20140311-r5.ebuild b/sec-policy/selinux-snort/selinux-snort-2.20140311-r5.ebuild
new file mode 100644
index 000000000000..3eae5b0fa79f
--- /dev/null
+++ b/sec-policy/selinux-snort/selinux-snort-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-snort/selinux-snort-2.20140311-r5.ebuild,v 1.1 2014/08/09 19:34:13 swift Exp $
+EAPI="5"
+
+IUSE=""
+MODS="snort"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for snort"
+
+KEYWORDS="~amd64 ~x86"
diff --git a/sec-policy/selinux-soundserver/ChangeLog b/sec-policy/selinux-soundserver/ChangeLog
index 68e5897a3dc0..720eed16de46 100644
--- a/sec-policy/selinux-soundserver/ChangeLog
+++ b/sec-policy/selinux-soundserver/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sec-policy/selinux-soundserver
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-soundserver/ChangeLog,v 1.42 2014/08/08 18:50:06 swift Exp $
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-soundserver/ChangeLog,v 1.43 2014/08/09 19:34:44 swift Exp $
+
+*selinux-soundserver-2.20140311-r5 (09 Aug 2014)
+
+  09 Aug 2014; Sven Vermeulen <swift@gentoo.org>
+  +selinux-soundserver-2.20140311-r5.ebuild:
+  Bump towards r5 (fixes duplicate context for hiawatha)
 
   08 Aug 2014; Sven Vermeulen <swift@gentoo.org>
   selinux-soundserver-9999.ebuild:
diff --git a/sec-policy/selinux-soundserver/Manifest b/sec-policy/selinux-soundserver/Manifest
index dc6777ca25da..2ec9634f97de 100644
--- a/sec-policy/selinux-soundserver/Manifest
+++ b/sec-policy/selinux-soundserver/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-soundserver-2.20140311-r1.ebuild 407 SHA256 7e65703649416bc720f1bd9d3fcdef2bb38f44f2b04be5b1a762b7c74223d708 SHA512 a1988b86b0e457f9364d68e453ea1e3a6935973cc9570659b83a8df017d3e4cfcb73ec0845d292bd208c570451850efd54365149a89455c1b4901b2e3d1d1ab0 WHIRLPOOL 28b14263920ecbe034cff000f1dc38d5e9878710d6a1231535fb509c7e4f7bd7e4b63864b2843e5e5da434cbf96862ee64ebaadf7882dd2a99a0e4a20aec2147
 EBUILD selinux-soundserver-2.20140311-r2.ebuild 407 SHA256 fb56c6032650b9f42867f707d330d2ca7499f5173d707190117c755c292f56fb SHA512 c0c68637a0a0c99f0651c5f94bef7d6e5647483feaabfe80230cb3c1a5b57489676fcf1e40b3770f843c7df86988b41ee6f8ce0d7ef334bec2d255393de5b0bd WHIRLPOOL 616c4a643a1b4c75ce1226e2ca4a09f75b0eb23adc9196ec606f96a3697e5bb9d5bc694286f1e2a092bc22aadc1a9a7797246d94cd13b3a4a29f5697fa8c3564
 EBUILD selinux-soundserver-2.20140311-r3.ebuild 407 SHA256 56b6e5d6e213c6b802ea59291e79c421103724ba676ef5b0144a13de39b81cd5 SHA512 5b7a6948f67bd9f3ba4cdef32ac5b3a2d21287dfc0c536f99c0c178ea3235995a652027e52299d837ac55c97c5228904bf8a0ceb08310fbb0added4d9646f9d5 WHIRLPOOL 5b0e0604770d51753cc293cd1f9dc78ff057ba30ea8aa55fdbafb34d84fd25e12660a579b82868a5808cee8dada9656e9a8058365d491c53415cb15153a430a5
 EBUILD selinux-soundserver-2.20140311-r4.ebuild 409 SHA256 b441cb78f9c84f2281b1f8b853b7b376b5ed189c960780d984b7bcf0f8a64b0c SHA512 8e37e6d1036b3f61aaef203e644182dc9330cf91185c783ad44ff4dc5ef295411e002a7bb7124ab9bc424c8417fb1d8415a68dc2a16ac27d482e70377f0abe8c WHIRLPOOL b32b43a98c65b885951a2835058ed013c143cc41b827cc983f6fdc65782f481165037ae85b063fa5aa2f36dd6d3b34db644bef33b2efceeff36d25a706f0d498
+EBUILD selinux-soundserver-2.20140311-r5.ebuild 385 SHA256 83ab2683314e96e8066daf9d2244a022ec7a70c5cca3fdaa2283c52d9732204f SHA512 e4555d9c25bd0d120fc1c1c66b1da238d2e15be40188bb3c2a5b255af32a6a8d33bd0bcd9aa9ba77cbd4013e9ab73782adc050fd6786fc483c64dd22f3527dd8 WHIRLPOOL e2e44cbdafe2568db1e9d356fc3dc2b58e5f866d652ad859d2e5c435c0a507fbade98525e25cfd7a71be6aa3cd723c8ad9f2fcb23ea01b4d715db96a6e4cc19d
 EBUILD selinux-soundserver-9999.ebuild 365 SHA256 b1935023b225984752188082128b7cda6187e84a87a7529d2b2fa76b99d39df7 SHA512 93d17fd9b7fa3668602d9add876acf9372fb6730e50f659ba38a1b714a122dd5676f57d35ba1678f462a9e8278cc6c1f301b076c75a977f77ecbeb32b2213629 WHIRLPOOL 0dc6d9168a62c56c6a4b424a0bcb2ad4d87197c3572b19069996d8b7031a3a475478dbc9f81cf7eccf6414b25c2f96b52c6b13e19d062ec4244a6f2513c80f18
-MISC ChangeLog 6902 SHA256 4e6d68b47e23e18e2d69dafd81de6a1449ed3ac1c50c4327d024204280f2ae13 SHA512 795ddbd9ccb2e7d6f9678b63e34327044bee3fbc865903e0047400331b38d1b7611c10577a4867ee23e85d1794702c5915dd0e15a67c9cf2a0b1c423309bdc65 WHIRLPOOL be8db19e49283dd7b05cc45a75e17fed8b5659d051c16a94b39dd813588cde2995ee621acf5408175f72d0facdf4b7ebff57952dc7e081255d307f3b15c59489
+MISC ChangeLog 7104 SHA256 8d355490bcb940e576c53f354647f300697725b17aaad8f4dda02f927c249b6c SHA512 353ade617943c9b60e9efba23e0731c320448b9ddc1ecd834fcbc103c7c7e220a914c85247b28a460571fef184e8024f5f7192a1b0dfea9593db24e08b82fd7f WHIRLPOOL aed8a52325213bc591a9b45e43e3976e2a4985ee04f426f5c0f562670c3ac526fb6415c70d2f9b183c2498c281745b4bd788c961fbe8d18ea72ffaf12d090a96
 MISC metadata.xml 235 SHA256 65ca9f197a1a9cce7db7f1d30b174c69df31f8948ed452cfc1f79e71c0024979 SHA512 39b7b8fff0665e85aabde567379ebbc7a41d00b3ca24101d1e00a0ab49a349b2b375ffb9235a592f056348b3f11b07644dd4ea2877ff6427639a3eb3e0e9177d WHIRLPOOL 4a6a9fe4c60808f12459721d7de98b4632a46d18df726da2fd2828e5936b1d2ddebd2938353500e3eb29c606637097a02bf170358655f6bc92438dd7e852fcb9
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0
 
-iQIcBAEBCAAGBQJT5RycAAoJEC7dUkA7aK9HIUIP/RI66yp68qjR/troRTSBa3W1
-NiyUgQ3Vx5PCIjmquJ42l9vhF3W3+zR3UOgWsjjtW+x6j+sbnNYOjABsRGfekD4O
-0H9PGLCc0yy59isMDBfPUT/6zFQM9FaArQxHrnpC1Ef1srKv4vHbnRCorsxr5/ad
-w5994xbKTATG5vhLTHnLksEd4U2oXBJ2AN9kX/gGrctiCST5CJVD5Nq9r3UE1xbL
-wH7gTRevUO2fNM3GHQzmJuoie+gD4tQWBfTFIFEKZpvx6pcH/caCz/JDwrTzJ4UD
-inSAkFQcJRU/cppVcDgf5dmySgVUSoVBQwb42ybrt4RB5yvW6yhMcZr1e0ueo+2v
-PWP2oXpxVwTkagKnerw6mlI2U3dlJSZk/i7SDVy2DuD7ALkNwAYdo2TmgbJXTp8T
-uFgFjiXWIWE9jTQbZ79iYkdHrjUAUvBabH1myhBScl7G7mhmCow2NlEwffcW28LT
-idpbwfLiTn+dUvXmw2NYP7DIyDHtbSg2F3EkSsci7iWuuLUlhn99YAd1gYUEUP9c
-bNrrGWA3sPEzObq7tXCtzld/N8X71PrdUBGotZ5Mef3u34K8XTD3Xg6Wgqw+jVvK
-Pdz30rnebB3qbXQy69h0rTYU4J5Ek/yKgwPygU67pBWFJtJgMQ5kHbIG5oZfnEYR
-E8lK/Y0ufWzDBg9xSFv1
-=rbky
+iQIcBAEBCAAGBQJT5nhxAAoJEC7dUkA7aK9H3nQP/1LmUMnBK5ac7UYgccmm6Fb6
+H5k4Wiu08pcLYWJUibOmSbGVZHBR5c7p8jXN+dF8dbdOsPnfQXao16TCQrLfJBmX
+dQLqezTDLYLg6IlCrOIE1MA/pwTVs3+QmOgL6amrHnsdLySp0YConIr69uf0CrGi
+uZtjYKZTfY5DfjBU6KA9MZ0U/MThs/Pby7c2/I3bUUTM8/8uAg0ElXSHbWnC/n09
+wsBN6wkePPxxxnOoZQzDdt/eFWOMt7cHW2WanW+KK2hkknZdl2eDKupBzXDwWOs6
+F3ZoC+weZqAC1PyBPHpmOwspUWBNbbNO1pW9JKr4d3C/Gsew6SSaUOHk0iBm7ZJI
+VM6kBLeUc6PbpwIHEF/HOW+r7GVJ6tshstChGvjUP6Y72TZHzArA41BSMpyEKpMw
+VGIax7/74JrDXrtfdmw7xWVy7hmo62VHdc5ftyg9Wqp+zgEQxi4s4vrrh56df73x
+vdtDiILW1rY3dD10BQCDYxZxSjPXJYirSNbcevqmeuHn3s5Oo0X6z5iH4MYIvE+3
+B+I3o6G05WIUBqKG1KCLh3BnSc1qccDSGzVDodWEFdA7Ku6k2rqxGDBpyArK2ScI
+BBY3+0azrZS/nNw+TyWbF0VsB74HpJ2d2CO7gIA7w3yXpH2NT5k00/YH79x727yv
+kDYEOnTxxxIpEyVCZb3d
+=TFQp
 -----END PGP SIGNATURE-----
diff --git a/sec-policy/selinux-soundserver/selinux-soundserver-2.20140311-r5.ebuild b/sec-policy/selinux-soundserver/selinux-soundserver-2.20140311-r5.ebuild
new file mode 100644
index 000000000000..27b534195f66
--- /dev/null
+++ b/sec-policy/selinux-soundserver/selinux-soundserver-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-soundserver/selinux-soundserver-2.20140311-r5.ebuild,v 1.1 2014/08/09 19:34:44 swift Exp $
+EAPI="5"
+
+IUSE=""
+MODS="soundserver"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for soundserver"
+
+KEYWORDS="~amd64 ~x86"
diff --git a/sec-policy/selinux-spamassassin/ChangeLog b/sec-policy/selinux-spamassassin/ChangeLog
index 83b7e00655c4..3088acfc9454 100644
--- a/sec-policy/selinux-spamassassin/ChangeLog
+++ b/sec-policy/selinux-spamassassin/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sec-policy/selinux-spamassassin
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-spamassassin/ChangeLog,v 1.70 2014/08/08 18:49:30 swift Exp $
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-spamassassin/ChangeLog,v 1.71 2014/08/09 19:34:18 swift Exp $
+
+*selinux-spamassassin-2.20140311-r5 (09 Aug 2014)
+
+  09 Aug 2014; Sven Vermeulen <swift@gentoo.org>
+  +selinux-spamassassin-2.20140311-r5.ebuild:
+  Bump towards r5 (fixes duplicate context for hiawatha)
 
   08 Aug 2014; Sven Vermeulen <swift@gentoo.org>
   selinux-spamassassin-9999.ebuild:
diff --git a/sec-policy/selinux-spamassassin/Manifest b/sec-policy/selinux-spamassassin/Manifest
index 68487ae9a9ec..f436d3b1d23a 100644
--- a/sec-policy/selinux-spamassassin/Manifest
+++ b/sec-policy/selinux-spamassassin/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-spamassassin-2.20140311-r1.ebuild 411 SHA256 554b5fa3de484ea00fa3780aebc7b77415af89256a7cdaa4abbd272e8d0d8235 SHA512 44c4e8331dcb8cca4810453b1ca1ca52c00d06a05743f0ad3d112fcebb45a4572347e404b0ff98a3ad4eabdb6c2127846ffc4c5c0a67ba2a54e10e91e4159b8a WHIRLPOOL 978f723b7ba87d36a5dc1ce5549d4c9620f4c60251bc7281570ed0d5305251dcdd397ca97dd063afc9bea806aa7b0242fbbabc82aaae8d5fcb6f7361fc97ca25
 EBUILD selinux-spamassassin-2.20140311-r2.ebuild 411 SHA256 913b1647f29936021d911d34c83ce29bcb879b4db12657db1d202a0314ef46a6 SHA512 7f38559b68bd74ea1da07074e6ad8bc9f9fc6530f78200ab0eeb1392faf0f3777289541f82ee2c986b4be2ac73f9a86b4cd94ce03fb557a6bbfd37817438a729 WHIRLPOOL 9134dfa8414931d97a134ee8d0345c5051ae6d621f6014eeba037926ef4de7d7b2816f3bdaaaa7028e71ab3a3771ed122d85404662eb852024a590387806d62f
 EBUILD selinux-spamassassin-2.20140311-r3.ebuild 411 SHA256 7409043493ac37d5c0dba12781695f21b11b988e93a173f4a1ef128de007fc1b SHA512 fc95fbd84b95ec0b6b059f4445189fa2623681f6634bc8656b5b627174c42647edd8b0fb1e4eca123694c470732e739af174f08a0298ce3c2cf4b00e4465bad2 WHIRLPOOL 900a4dbd9ae49ba17545ec6d43596eddbf71b5b320bdde7651970e44e8b46541dea502eca7901a3a61e13761c18d23d42ddcbf9ab0fad02e78af5ea3f474066d
 EBUILD selinux-spamassassin-2.20140311-r4.ebuild 413 SHA256 8bf93b69a360961d55fde3604e28a452328e526b77cc794ff58694c4bda13618 SHA512 92a2cd7c8f36287e4057569ed19188cb4e40941941505794283fb1312bb7ca03c9f7499d3e04aa991fa7126e9952543e59d2004d9ff69cd45374b4da32269168 WHIRLPOOL 2e91ebb8af5ae2b2e0764a58783e38f84b6bf9f512fcbcd0aa96172cf4148cd3c06fd81725b870ca049ead584c10ece73f55e5ec124fd510cdaf7dd1b7c705fc
+EBUILD selinux-spamassassin-2.20140311-r5.ebuild 389 SHA256 87c583a23d005fd94b44a294a6c71289ff105f41d27d9d8a971010c7a58b447a SHA512 17ac27e77e75bdd01409a8d22f27feeb98e69b5a3ce716073cde0d4bdb26dd1b6452a1c535a434f5c3fd74ecc94382600a061cd9469a188fd9eaf5e6dd71e420 WHIRLPOOL 4d717f05189243ac5ad9de4adaa951ecf3e9342ccd5ee5e4d7893f4c4108ad23ee7152c47ccc9cf110f60be7c157503e0a510e896d015efdcd3542df4974676b
 EBUILD selinux-spamassassin-9999.ebuild 369 SHA256 2cd51a514e5a3e1e78a71afb3dc015159f12080f2c05bcc37f2aba7cac394104 SHA512 516f4e3a108b3b8d8d748eee422ec4fac61aced2e79b400133e4849d28312984c5919cecb07902e37eb9864d89a9ca7028c97aaea8f109aa95f820b879b489c0 WHIRLPOOL 981fe74fc51cb3f6411885dde980b59ef966da270dd86463daca9d1300f0c68f28d3725758ee328fe6eb879e249a723ca37984d0c5fdd85641b2342fd7784c91
-MISC ChangeLog 11758 SHA256 4d648ae7ee7eaac039c209a77c3c64f543daec2a7fc4a954c0d309a2cd6f5eda SHA512 4d5516aa96b66497ec0aeda6b90b3e42daee886a48cf6559375e9e167bb34ccc7bbb7e6ce4feb616ad1298bc44ede55a4a7ef0f4220723713956a44bb1f081eb WHIRLPOOL 5984ac5fcdb54212fb88ca656d58332b09c87edec9c38b22fcc5c1b9efb556ca64822677ceec0c8660635f32f83b53caf6676487a2ed8d52dcec1c67ce3caa98
+MISC ChangeLog 11962 SHA256 2f8f9cb70eba853f1abb7e761196af5bdfc804a2a9fc9bc0c9f045cc90f21289 SHA512 14b5d7641873dae1219afbe467e460801f4674bce352332f7500e4617434562b725b849a0e3d8895bedc218e9496505c68e155ffa8dd32eafe4218136ceaaa6c WHIRLPOOL 801cba26b0fd530b84f8d22f107769168270295ffd91606fd87a58231964fba63210ac5249bd71a6b9e166bd208ff051c1ad3969c2263296562f2658c59775ed
 MISC metadata.xml 236 SHA256 f50a193dd1cb41b4b8330819fc4b8ed02d5e01b3ef7c7900a06eb6c764907753 SHA512 4e4f962ec2b12c48e3b186f909f866962284c09ddacc1b83240e77f848f44614ed7f34786a01f8bc572e55baa338e639746c1ef757d466a73fd4cdbdd82246f9 WHIRLPOOL 6257f97f5ae213adf7f41d72d76f77a9041eb779db77da03eedc345ecc3081c86f1ab321314b4410f676c4d94113881767dfdaa45b8b8de3447bef0533b82794
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0
 
-iQIcBAEBCAAGBQJT5RycAAoJEC7dUkA7aK9HsXcQAIxS6DATwnpm2tBhzpkAVw0x
-+gq58PDGvmlSSVxXvZWR0wEns+VeZCn8a9V8xMQ0GzpesnS1lIcc2gdSDv15vcK6
-YfPDOvRsBiobqX1m7eg1YdGA+kmA5PuMFYDOxIQe1MZxWDhwRH+/ksR4YPmLAdpZ
-5giBDQc4GfiOWXpTOlY1WLfOcCPVfvKCb4c67cIO5yBEHq9SZK6hI2FSgrSuvNxt
-2+IRQaE43YMatrJN0dtu40YpT2+f11z7fwhAOyMDQ5DeKO7xYT1kYjyM1O7YM9Jl
-NafKqumfiQbNozFdcABG34eBySrRsvZ85SAMhmxs8YIJXQdL5kLAhS/Mz8tarO3s
-D4Ax+YvU2Mxhm/dLHgLR/BQytUaBkSEwRQTlPR9Vv8Pjxu+Vp8LVwfMTGXYWTZ9O
-K9Y3mdyG8vXTLfO77UQWY3CAW28cZEg7R9GHozEgWgMC/t5A4NuqNIKcFQMcPkuv
-GEqtB9uJOOz8q1NU43sg+5T7vp55QXhLKqo7m0/J/0CjWaAW/FpscGHbkHR4I/ew
-bHiv9KbsJlW8M9FJIAR8rxVzX37zE5BEYdDRMHgjRMDI37gzBfFxt/A+BNwP9q8C
-S0ES7RfmcYEl5RS2h+gYvmewSloqeHEvXZdzp8ZkIblVa/OqK5uIJK5xrhelthek
-JIhOfT4NSPUK33eDCPnw
-=ol+s
+iQIcBAEBCAAGBQJT5nhyAAoJEC7dUkA7aK9HkB8P/1bv1u7kgdcQsFH72s+fot2e
+m8zUUif1FSWiWn1jChErNEeHJKkDre5VSdUOFxIncoBLRU5zkTIS00TVSn1p9ImC
+LqI1yqS4kO8UJhby6u7HPhr1On+k5H4VPiV0JTfRfI19TznGB0omw4DjdVuojWv3
+FL6eY0pzucsYsJIQvhYh7tjOtB0tIYog+DxwfdKLsxVsOg4u9mQbCgHwnafq2uyN
+5SCJFNFvmy1waALXgnlk1TqnxwEduLdNvzk3lhh+roM9QaQVmkOyUmLawvfnIfyN
+1X7LJm5lo6AFsW9PQoAO/KI5XMguIjItYmG3lQIj/aRJfcxow1drkbUiCxkGzktH
+p7l8TTHe1+IGt841TlwasDmDtwHXtJtdDGuoIohdPR3FuTCjBBkJ5NsfDNNpc6Aw
+/tBPE85ZnE9vaLOemD6A0ukKP00OzKz3Z8omPUdS2N8N8ZkmaK2EY9/yo93+gJVH
+4Zwkvk4fd5ia+BQg6TlKfUrL2yOWnaPnKFmTjlMIhrfB7LlgtMG8/j9PBcJlAxjk
+Ze4loTsczz3kg5m1XQQFYeOcqV/OzUIWVRdLkKxfecd3s8ikLX02GhLhBhJsIL6R
+wKNw4PbACSe706XgibPEzCdnVwh1G41tZSX0VM2kjUiga4OVK4I4rz7BhciaUCQi
+Cl2KlPBNe/YcVElvoZ/1
+=K45F
 -----END PGP SIGNATURE-----
diff --git a/sec-policy/selinux-spamassassin/selinux-spamassassin-2.20140311-r5.ebuild b/sec-policy/selinux-spamassassin/selinux-spamassassin-2.20140311-r5.ebuild
new file mode 100644
index 000000000000..1bd1c0f2c0c6
--- /dev/null
+++ b/sec-policy/selinux-spamassassin/selinux-spamassassin-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-spamassassin/selinux-spamassassin-2.20140311-r5.ebuild,v 1.1 2014/08/09 19:34:18 swift Exp $
+EAPI="5"
+
+IUSE=""
+MODS="spamassassin"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for spamassassin"
+
+KEYWORDS="~amd64 ~x86"
diff --git a/sec-policy/selinux-speedtouch/ChangeLog b/sec-policy/selinux-speedtouch/ChangeLog
index e63c22e96f2a..5ef28f53ea93 100644
--- a/sec-policy/selinux-speedtouch/ChangeLog
+++ b/sec-policy/selinux-speedtouch/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sec-policy/selinux-speedtouch
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-speedtouch/ChangeLog,v 1.42 2014/08/08 18:50:05 swift Exp $
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-speedtouch/ChangeLog,v 1.43 2014/08/09 19:34:34 swift Exp $
+
+*selinux-speedtouch-2.20140311-r5 (09 Aug 2014)
+
+  09 Aug 2014; Sven Vermeulen <swift@gentoo.org>
+  +selinux-speedtouch-2.20140311-r5.ebuild:
+  Bump towards r5 (fixes duplicate context for hiawatha)
 
   08 Aug 2014; Sven Vermeulen <swift@gentoo.org> selinux-speedtouch-9999.ebuild:
   Make 9999 ebuilds EAPI=5 and transform to make master for version bumps
diff --git a/sec-policy/selinux-speedtouch/Manifest b/sec-policy/selinux-speedtouch/Manifest
index a75826d1c6af..e69260fd860e 100644
--- a/sec-policy/selinux-speedtouch/Manifest
+++ b/sec-policy/selinux-speedtouch/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-speedtouch-2.20140311-r1.ebuild 403 SHA256 91c394c362145713e229f3a8bc4084206404305e4cb77041a9adb34b46cfa96e SHA512 e9203de7a1649e4221cfb064f682ac2ed81e85ac1a5d2f39c91b8168ea7ad68c902a264d7c5c58bfe98be170907640d48ef9d83051917a0a243f8ae393c61026 WHIRLPOOL a5fe33b61830dcda18957ca7165515e50662448b4c76d46b46a96b8f66074dff92742ab8b7d362375be5c41f3ceaffadbd7a4e7ed47426c1bcc6bcadf35d84b4
 EBUILD selinux-speedtouch-2.20140311-r2.ebuild 403 SHA256 1ef7c440606550e62ff1a9bc40789bd07a37cfedab7bb86568d8fb0321680143 SHA512 31b0afae6fabcd4e3123cbe043adb2ddde7bbc4a5df9bbfacd91c8a81644c5184b9e03fa145f8c1cc9f5d2b6180fce613d565b534fdb226e21c755a4bedd8854 WHIRLPOOL 39d83046b12431b67d34c3b1c05e4fbb90254c48e2d76483257604cf7fa3e8d61a605630ee9b9c9cbc58410f60c3a0c84b4e91f1a2e8bda0b68e1fba593e216a
 EBUILD selinux-speedtouch-2.20140311-r3.ebuild 403 SHA256 e97ebd9aa80077fe6fb23597a03e2b2127994a02ac3ce0f65bb50297caa6ea08 SHA512 a3d91baf704fb572db3a8d8fb373ad8fb810af24acb82277eded96cdf91c9a24839008fb4c589bf78b3cfaba1eaaec6f8ee0a0f0d05bb60ea37e61d2ec8183e2 WHIRLPOOL ed14b12a91767e64834b852425575762d081c3eee9bbaf9d0cbae96be75a05ccc1a9d710ec1906588fc5675d3634229527b50c8424f62b72b6d8ea1c05ef4528
 EBUILD selinux-speedtouch-2.20140311-r4.ebuild 405 SHA256 1f126471db2bfad3e7fb6133a6d91e53effd4b7e384c5177ca95fa4b21841325 SHA512 56eb1afcdf476195a2ba1aae031919f079e757f75290061d02f6d0dde9b6652bd292148254721b626201a92aad5c8f885c5441291806fc8ecfa9cf625586849f WHIRLPOOL 587cbbdb23c1c1b9f417d525696c0a1a38abf57e1dac4dd472500aa42fe8fca7e65c49cf3b6d26bdfbf6982ba27d1f64cb69db9ecbcd18052aabce9712d0974f
+EBUILD selinux-speedtouch-2.20140311-r5.ebuild 381 SHA256 b2744207a0da7b2377ae5f549473b68dcaa13eeddca033b537d992a991c527a6 SHA512 c23479e91377735355735038f3928a210775e2ba4892585a2c6e02bdcc6a67d57e6c57159452fa2104b3715822961e739d4ecb04d7558c8bd01676ddf1994511 WHIRLPOOL 40d0ac55d097f78c745d734cd7b30b9d54b6cc0a1c2788eef65442c5ae7b2c42ad1117296fa66b9e1c180e689c31bf830a271ac4bc529c16b3165bcf17b03ace
 EBUILD selinux-speedtouch-9999.ebuild 361 SHA256 65845dffbf8cb8d1b00b49d9985a63b7be79642edb6cb8352dbf2bd888e852d1 SHA512 21fb9227ae71e4be770a0464d95136b0322cb23886be4e4d3acaa8c3ae2c1f798b56e2cbf4f7359560fd85018bfcd7f1cf1bbb99b636622fc7c74ed8c5a0a503 WHIRLPOOL 16d661572cc2e98aecd0f26efb49a44c72b5116965dfdaa8ddd0817684ab60c78b9ecbbc7d73d228057deafa69254b4c5440ab41a86f86a285ea6bbee7123bb0
-MISC ChangeLog 6825 SHA256 6ff4d606434775c68157b1940e85a710340ad3c7c4a84dd5dd01eca50aab91f2 SHA512 db67e8ba0e284e50f5ec73c701d49250f7b37d391ec82bd7cd5a7acc00f0e1bcf94b0123ef8a575a807fb1caf3397bdf0898b153ce869658c32c52660a968521 WHIRLPOOL 34ff6701f5cc4b1f6175c8a9a546c52ba1e95d0c420abf43defa1204acb52cfd2136c14771fce69bfe84d81389207d81a46f6cefe63e3fd1afbc05526e5bdb71
+MISC ChangeLog 7025 SHA256 f385fb5ccc6ecb467e693feff3e53c20e74fba06e9c093e5da8312a25521d576 SHA512 6f74cda30aaf9f57dda55aac12f99d3f34e58b1c4f77738803f9f30db172bb0370629b4f19163ddb58b24b4d396c92d99a7a56f09669807fd06f365a4f7a72c8 WHIRLPOOL 34e736fff3a6efa48ec97a845bd20571ee7422e5738c7b2ee156326b65295d64c3a865a85b847f166d3ea9adf2bbef8aa6941fd602b550656fa0d05babe3d685
 MISC metadata.xml 234 SHA256 d1549b3264f188d47d23e429c76088a7808976ae68d5ad9048950af24afa1f9e SHA512 4549dff1d9690b1ddc259e046777240309ef21a93617924e425a7ffe7e95dbbfabf88c8cb66652a7901281e76dcdab23aa900ab3a023aed5c7bb24affeb4f305 WHIRLPOOL d7ea34cf84afc37d3321bd9bd33a85b99a1918e25d2757781f1bead20953d35fdb620d47469fa87f0bbdcbef9cc2491d27d8eb7d54ad7d2ae09adad364b907c6
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0
 
-iQIcBAEBCAAGBQJT5RydAAoJEC7dUkA7aK9HXKgQAJVNWVavGMHz3AlqC8qqOIEf
-5AhvEtAYq8xhF5WBFQtHjj6Oi3xX1FShhdzi03junrMJHvMP16jZsmqUqx3l6SIp
-9GKx5UeN8JqyKAvNhW0QWX6/3No7GKWgmsjHkHdEafl45s7zXubSEVYyGBQeREA+
-urn4+yOIM7XMb+spqypiJqEOhyzKFZNZDsrK+0i3yF2+LsYTZJEOE7hBJh0ztfeD
-+XFLMRBcHQ3jlra+FYXEchefWSmfftLj27sNVzNNnL0t4NbLN1rw9gAWuPkDGgp2
-tWkomunYDX2ufkt4EdBCWXfbVHpKfUlXsdQdC6XF3z4nYbJfnncw03hlDkg7AfWA
-zBY6eJ0fiRCWqpubwhynu56alVwzkjwWGdTaRe3tUpyWoKLXDAfdihN2KlJaIzy+
-PjKCV4HtRHlSylAuF0umcEfI/BQ7int+dftRimovw/TkGbbJG8WDyvnx0poMbtXh
-hq6TsBioP1rH3YMheCd/HOyUG9xpASCjYoWKH/yfvBmQ02gOlftYRDCTUxRxFf+K
-syZLO3FsfLf0gmoBP1Pohw38AtGgVWr1amIucmVVT4E0ip+/mb2UmS76CvMAruZk
-5ZR8KGGgFuQA2NapzBL/ZiMiFBWpRllYlJ5buUHiPc1xmJHSNF7DMb4v/JxZ3+kt
-i69I5l9XXlsiqZT5oKBV
-=kcRH
+iQIcBAEBCAAGBQJT5nhyAAoJEC7dUkA7aK9HlkMP+gIJ4vrRSkrQoqjKKvnNM1Ms
+yIi673i3nE6WhdXqI9X1CBpug5jQiZ0zN0e6pW2VzvWxfUAScBLEfGDtBQ8pk0h2
+RbI3lpevs3M/PdnOv5+brEpVplVgVYjpogs8YdDHuqpnn7RYwOmPRho9KB1mtihD
+VAU+lUFKjlPmcRc593KwGLYAX9oxZpaKWA1OyhWsqbP7TiuejKL4Z7sPjWeVNOet
+4YlW4cGKUfxRkBQ+aUYVP0ohuFWdQg3p/8Xgg1XgRilm5GnEyKQ1tjAEqajPsYi0
+oWP92/8f/IlgOQtKCxYCzWq/f8a6kcs5r+y4HKvB/H24x6DYGEANQtwcwm3txCKm
+wYsHUY1o7RGcYrMqaaGEhxBXRSXNLNs9CMZLqwNujfJBoz4QT8QYFValhb/Lhe1k
+bFZ499bpkouX52cmdZLxGDDMzWlCkmft6vfIAuLdl8Z46CCOx3T7ShDtABYRTUNJ
+NgTQEK9cNWACj1FR0pkn1h9xGNIXpUVKJbky+fcuGMyYi/uMCZX4GGR2stHLo8Eg
+L/QE2AreKrteXPOYButtsr7nSXHLeGrFyqBUCS5rYTQMuaENqcejHo6vRA9g88IC
+q3X6s449OuoDiqc+8Rs6Kgxqjv3TI6KYn34A6UTRqjup91fTbNGAOWrg92eIyJ9Y
+qcYjYbBpDt5kBHSKWR/E
+=kSsS
 -----END PGP SIGNATURE-----
diff --git a/sec-policy/selinux-speedtouch/selinux-speedtouch-2.20140311-r5.ebuild b/sec-policy/selinux-speedtouch/selinux-speedtouch-2.20140311-r5.ebuild
new file mode 100644
index 000000000000..5495132f80e1
--- /dev/null
+++ b/sec-policy/selinux-speedtouch/selinux-speedtouch-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-speedtouch/selinux-speedtouch-2.20140311-r5.ebuild,v 1.1 2014/08/09 19:34:34 swift Exp $
+EAPI="5"
+
+IUSE=""
+MODS="speedtouch"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for speedtouch"
+
+KEYWORDS="~amd64 ~x86"
diff --git a/sec-policy/selinux-squid/ChangeLog b/sec-policy/selinux-squid/ChangeLog
index 3d8f245fbebb..33032e03579e 100644
--- a/sec-policy/selinux-squid/ChangeLog
+++ b/sec-policy/selinux-squid/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sec-policy/selinux-squid
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-squid/ChangeLog,v 1.76 2014/08/08 18:49:20 swift Exp $
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-squid/ChangeLog,v 1.77 2014/08/09 19:34:30 swift Exp $
+
+*selinux-squid-2.20140311-r5 (09 Aug 2014)
+
+  09 Aug 2014; Sven Vermeulen <swift@gentoo.org>
+  +selinux-squid-2.20140311-r5.ebuild:
+  Bump towards r5 (fixes duplicate context for hiawatha)
 
   08 Aug 2014; Sven Vermeulen <swift@gentoo.org> selinux-squid-9999.ebuild:
   Make 9999 ebuilds EAPI=5 and transform to make master for version bumps
diff --git a/sec-policy/selinux-squid/Manifest b/sec-policy/selinux-squid/Manifest
index 33424422e146..297795d83dd5 100644
--- a/sec-policy/selinux-squid/Manifest
+++ b/sec-policy/selinux-squid/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-squid-2.20140311-r1.ebuild 450 SHA256 887d783027deb06bdc4bf18c36dff0b6a0777a10afc7136a543bf49dcb430f85 SHA512 3440a2f16ee5307107cb291f039f046b34c0cd52e65a7e280eab0cd90e0b1103e7738a9fa277d875ae7049f42b313072236ab3146a17905578fe91667fd081b8 WHIRLPOOL 65ff68202df78fe1051acf15b2f3a77488fbc8c097fcd008736441fd8779b51410425664d84bbcf004aa0829be8019b562d293a334e05068adef8b943ce91c0c
 EBUILD selinux-squid-2.20140311-r2.ebuild 450 SHA256 2dc64848772b5592d5c2f0574e57057930da275c619d7f76aec5cfcad519648f SHA512 5889de5dd431755bc4aefd9dfc4f408517908963a4bb10e010cdf49f73172feff8bbdd7f109062e18e26eeb4752a0a46d2e01421b35f19c0c40e8a339985e093 WHIRLPOOL 3af0c765d4e5902dd8f261d38ad72c872f2857381abe20ac9d6c386e7932bbf52e01b3261268d05aedf8f205942f437382975d5fbd58af7878f009297a1d6725
 EBUILD selinux-squid-2.20140311-r3.ebuild 450 SHA256 43888de8c16c44a3a50f7c7f511520c053a739c2db914f555ad3c3f81d5814c1 SHA512 bf77c0b5c786c24c80c7e3b9ae8cc1006ddb355e2de50c171ce737331bce62f079a56a09107099697b0ea54d2afcab8770e2972ab4ae465b39ca176bdc69f38a WHIRLPOOL 54a0dd82b351eb1c0172bd01fb6f7d5b9d381aaebfa4bbb24bcd0f2e7de6f3e51c9e5c68394751181ee45aeaa577f03a7e3aa9a38a222c52519f2405914acbaa
 EBUILD selinux-squid-2.20140311-r4.ebuild 452 SHA256 aef14f8f90b050135e5889b3b81d8b9d91978c857d8ea16a50d0e631c1179da3 SHA512 14e9c8f1bc5bad50c126fdc57d84128996ecfdd9f5cb4340d1843d8f3f16d0a595a0bca1e77620abfa632c4764147bbbf980f5281785cb399db0cc4350b0dd48 WHIRLPOOL df19a6f64e0d29a5d499db94f5df7cfa2d085acceeffe639e26ae0c02fe89a98d6f78599bcb0fe10712b8de24e7069d64b879a41f9751cf98b33e7d3875dfc9b
+EBUILD selinux-squid-2.20140311-r5.ebuild 428 SHA256 7d34c357666e29222905b9afa71be3457ed090c15fda1fd8655fbb0c2776a446 SHA512 2e1cb02cd6a50acda8e205ecc96154318243348f9ef3300d824ccafd6c362ef943947d911937786d4e788a12b4667281fadbbdb80e4e06d9f1edc35598e2b80e WHIRLPOOL 794fe8f7b49cdc06385b4ba681340d9100d11957beb9065aa03a67c2b332c277ef9c2e8e46f78bf55bb79b8f2c85307a76576e701fc9a7073c2d38bdb3dd417d
 EBUILD selinux-squid-9999.ebuild 408 SHA256 f1d991ee4a5089a9cc0b5e73140a763851536e3527165b129f9cd719c8d5aa84 SHA512 b961d3d6d83bb915251464505859ec2bde87753bf439f03900603471f327045caee1befd4adf4737e72848ce7cf81d955157daf16ce7a76d1d72894b3004911b WHIRLPOOL 63d2ea19979b4429683d6cf045cd524d3b2ef9671b1e94cbf9a0a8a32fc5f355f08b1e3f7d95ce5072f0f0cdeed480b88912ab4af4d85e4a5b55c6f2d9f10bb2
-MISC ChangeLog 11639 SHA256 1cfc22799f6e7e81b1dff86f8e2ed394cdafd00a9d0489270d7d650594dd3726 SHA512 111904a5b3066c39fe9d9b8e09f99d3fd91b89defe8e9d6b8e5d8612946afa5d800786b48b87e5008f3fb5e98ab55256b0f7dcaac0b4be518081193d0f284271 WHIRLPOOL 8f83a16025a3cef0134312a6c7bc4345c1ed598b6449aafb9a42393a25c136cd40cfa01d291db68422f78fc4d27f370b1c07a40f54a6f2a944e7ea9c403cb93f
+MISC ChangeLog 11829 SHA256 3c82c862ea94292d84dcee3afe1292eaf71c60f437eff12a41bed05f7100b261 SHA512 7cb58e43619f1dd219282838170bd9d3153963536249af64b9208f0f2bb8986a6a28108f9a33e349e7103e6d41a2592cb5132a15a2e2190109c5c21c1ddce84e WHIRLPOOL dfb8b97ee338d8c76ef861f21ed2fd18cbb0426f40b9766de8c23a8c5d52ac6d7568e5f381b0da92f95132f5e33db5b73449823b60cfff30dadb463444156d11
 MISC metadata.xml 229 SHA256 4013435083664287b3ff9887d144f0ec096623c3f4aa660c378824822709e2eb SHA512 5f16b43897e486f3fdd9364b6e30511d2d18a78ff4b77920271e615744abe512e0c42e08b76031c188032fbbe953792af5d7b7faebf24671ad41f89fdae0ee73 WHIRLPOOL 887edd949f20011a6f46926df5dfe6a8ec39dbaf4baceae872a21eab43097df2e8e89e1105411643a61a2626e06d3da04bde9d79c8f3a307d66dae9e74516d72
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0
 
-iQIcBAEBCAAGBQJT5RydAAoJEC7dUkA7aK9HZqgP/Riaox0M3WjfB5/i5Qw2MJGq
-z63yz/XOaz/bJkOaus4CQQRcMHY2PltxIx6yDQhLr1s+PpYQYUHwmClAPR+kGPEC
-KpkFnGe7dk/giOygpJ33acFmuzesaYsmXMXRUUtuDJ6pV1xPcQF64P12R2E34NmQ
-/Gu9w1P1XPl1qEpTQSQAKPk7tKTmm7/1V7KormoEIElt5xboLvxHHElPen64qoMq
-lORmh9UvehhqS5xjTdsp1Q2uw/W0M9cEvXUB+n/9SE7K3/o2Qn84fpjYIcONEYtO
-plgksb3YJJ9/nBue+Ezw9e7PfDy2XvHI19pi5LhGwGVMCTObLQUFw/EqOAhlKWA4
-D41ryM5Gre3zLhY+hIwNmmZrOkWRbtqbSK169MYYobkPHkayOUusv3PW7HX6jkDn
-RuXoRWDS+yjuCZRCuKukcYEFYksF7hMRgVFYZ7m/GCz7WQV3kVhIHDI1pniK6Gj5
-voVBlifT7L13J3cw6dCmznJbE8sCLcr3O4Ubl9IF9YBecBf0HW24jX0aygNXAuDr
-meNwOOJGeQDGcY/GvFwCwsYArumKdTpzeyGI2arMQLVcrUPXRXp/6uk0D1Qb46Gu
-6bhf9cA29tnhCS0HID4oX1UwkZNG3bsuxCgWxLt5b008bWq3cl9RzlPpf38Sw9Bw
-GajgWOoeQcWCR7YcaCl4
-=MvGy
+iQIcBAEBCAAGBQJT5nhzAAoJEC7dUkA7aK9HxEcP/jXJrJorqNmdDsXeiXqURh3C
+Aq9QFTb8xUQAk4YPNcn92dhqWpOtE5pgUui4p2L/VqbWexSBs95J8grLbde/wQSe
+tOumWpYub5Vdc1Y8/akCLedVGuRS/5bQ3a81JlD7pZi9AjIT+Gt7vfQs9GGaUROL
+TXQy/oP9+yBJlkSLHmbpTSALcD55rTWXsUkhLo3f5H3KKYFEv8ZCPoY25NUAa2NF
+JPxBUqr9TXKtG1TzKzMdcCVMjlUGVxpwEKXrIlWXUIjT0by/XCodw1eNeEptZZiE
+ZECA8WV8AKDO8hxCa5OOid0oGqz2y0hVyYVwnQSFSts0So0+rolFaRWWPfhm8ZUL
+Z6NdFddDTKqH0/pYA2Iau+8r82OWFrWxeYFKh8F7AbaYv2L/yKjulZtzfOY2uIm7
+2e/wSL2bYFF9yte70K+HciRdIVwpgDQbPkgJSA9hv0k0X4khrtreMbdLnhBekPGH
+tfkKakWWJse9zG0CkmEO/k6JIb3mXNuhhf4CNMpFuFib2MTRM8M2ia/G9mlI/g09
+7UhIdvPW6wCvti9shebRyePJSmINpvyoNdQ/hrGHMz1kM4mToBBcwHz5NTQ3fqne
+lq4ZD7xyGePRD/84KUKGLRNl8hMnwCtCy4XyS2GrJ7oVcoa0AIzGkifJ93ELx6ze
+UvG84oNbULQ0qkB1rrwb
+=onRV
 -----END PGP SIGNATURE-----
diff --git a/sec-policy/selinux-squid/selinux-squid-2.20140311-r5.ebuild b/sec-policy/selinux-squid/selinux-squid-2.20140311-r5.ebuild
new file mode 100644
index 000000000000..99b930d547ab
--- /dev/null
+++ b/sec-policy/selinux-squid/selinux-squid-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-squid/selinux-squid-2.20140311-r5.ebuild,v 1.1 2014/08/09 19:34:30 swift Exp $
+EAPI="5"
+
+IUSE=""
+MODS="squid"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for squid"
+
+KEYWORDS="~amd64 ~x86"
+DEPEND="${DEPEND}
+	sec-policy/selinux-apache
+"
+RDEPEND="${DEPEND}"
diff --git a/sec-policy/selinux-sssd/ChangeLog b/sec-policy/selinux-sssd/ChangeLog
index bb8c7ae59ab5..90553e542a21 100644
--- a/sec-policy/selinux-sssd/ChangeLog
+++ b/sec-policy/selinux-sssd/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sec-policy/selinux-sssd
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-sssd/ChangeLog,v 1.36 2014/08/08 18:49:23 swift Exp $
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-sssd/ChangeLog,v 1.37 2014/08/09 19:34:35 swift Exp $
+
+*selinux-sssd-2.20140311-r5 (09 Aug 2014)
+
+  09 Aug 2014; Sven Vermeulen <swift@gentoo.org>
+  +selinux-sssd-2.20140311-r5.ebuild:
+  Bump towards r5 (fixes duplicate context for hiawatha)
 
   08 Aug 2014; Sven Vermeulen <swift@gentoo.org> selinux-sssd-9999.ebuild:
   Make 9999 ebuilds EAPI=5 and transform to make master for version bumps
diff --git a/sec-policy/selinux-sssd/Manifest b/sec-policy/selinux-sssd/Manifest
index 157c3727d543..69bca2e46d96 100644
--- a/sec-policy/selinux-sssd/Manifest
+++ b/sec-policy/selinux-sssd/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-sssd-2.20140311-r1.ebuild 379 SHA256 0dc2190e7da09d30b1e141eb8b8203f359569b13f0e160860ac24aaca7a9dcca SHA512 493ce84cadf6b8399e5397a8dbd1a81b468f8e09954cd04e2b542c8bf342a9b1de7051c7edbe03974c286b3c9b99666c9b770246467c5fffbbf7df3254782aca WHIRLPOOL d237dc828122223820c908330c224e31dc431872d6294ea58802c6550d040928374ee3e0c302252bfec8d363e9ab63fba4791b90b0c0836fd509b2f730159727
 EBUILD selinux-sssd-2.20140311-r2.ebuild 379 SHA256 86a7da76eee7950bf929f946bc14d8d1483f0b7e17b497a6994721f782b4a5df SHA512 d82a1d2fe5d85fa882dc11ebe35c5460bb3f64d799066135aab443f20151cc800930bd142ba7755160f5a7cb5ee1b9bfc813fccbae83c5499595694826492fec WHIRLPOOL 074f42cd1fd0c370c6221e14535d8c73e4468a63d62e4d7b912ff3c7f4b4b289535a32600eb8dbff9aca85cbc06d8647db62dee1bd21bab8c4964886ecb04cbc
 EBUILD selinux-sssd-2.20140311-r3.ebuild 379 SHA256 d363cd34e28e7a9ad0b224b781c835347a3dcb81c190afac7e2102d2db6be776 SHA512 185af177a3164781321c070d527e78d4af03a80a826a77ace8f19b36d688f881877e279eee84a2250bdf40f4642c0b26a4b555022622a47fd20a3d7c71a38142 WHIRLPOOL 6a50531618009af73641dd9738d98259b652356f7a2f2add3666702570c78b744fdfb817356d3d78ed3f7a92eda725e768754d797012a92fe4ed1503ab7c4c5c
 EBUILD selinux-sssd-2.20140311-r4.ebuild 381 SHA256 a326c3f4b95ea425c56a1d7a59195ee3528b9133454746d8f56a1dade419a0e7 SHA512 034f81e35cdc6ed7421c94a7fe56fa5fb1dc7cc2146c7de577089bb9da3a3eb3655784d6245589697681366d7e110e42ab65fb488ed394a816e95636f2ebcf2b WHIRLPOOL 52dfeef98aaea916425de9fe35f28ca0e83f29db75b84b72b5839559fc9cf030274400a100d04b3890186b96a5edd8cd3016e657503c9d10388dadf4af89ac78
+EBUILD selinux-sssd-2.20140311-r5.ebuild 357 SHA256 f343f30c64eebe1e8f6e774ce1eb1027605a8e1fd4fea67a34369e742ebfb2c1 SHA512 ef4d334745f6ad5ee1f3628672bb8650826bfe8a503155c4c11ec74303dddd4870d3f6736c8471496ce17d949c1350470dadcb78b5582add2742bad782ff730b WHIRLPOOL 7b659bf02628aefeb97155d6d8452452915a0c98b568f71ffb6c198e04b8ef390cb9f3444aa1c4e83eafe34c63e09514da52295e165ac5b8fd4f946005475885
 EBUILD selinux-sssd-9999.ebuild 337 SHA256 a39ad84fd53cb8ba92653f88b441a9ad648425698c93c270ce831f1fc8fa9a37 SHA512 07cd38cbf7097ab290084319614e7f56514b3cdc709743e867aae6cdb2e0d55ec7998b67779298d0f1d40de2d3c58d78fcb564221555d41bb24139285cc56852 WHIRLPOOL 4382ce961c9245bb8216bfe2e65ef6f641406366fa2504fe43a2079a44c76363118300799fb43b90f2de99fb89df12855c2af033165a0a38b44bee4d60d66c41
-MISC ChangeLog 5783 SHA256 31a3150a0f0112504495cef727d6e264bf85fa1622e9c57bae6067eebf228f8e SHA512 e5b98878ad97f9de9ed6ad7768343d0b4e014b12653d53243382fa886e704a98ce44b05713c9a01f9b9db098439f32a5456c54455870ef874836c060241b24dd WHIRLPOOL de9aacb2ffb6cb73027eb21f18fa0d7a734ddc1d87be8a5bee8fc3443dabeae2dde70c88a05c9c4b90d79aacd2c04c15a449cc180f93ebf5ded2a00e54f154b9
+MISC ChangeLog 5971 SHA256 ebfb58f8b0779c249498f7fa1b51141762f936086c7236b617c7a29c45168f0b SHA512 2d1c7b969b1c3a4789a90d9d1a0f89ee87584f520b3adb200249cfc8762bb282122042a23081a510455691eca6167bad190d6e1d688a38bd81520cf45f7a57e6 WHIRLPOOL da431c8b1a3bb3cfbaad47ec26e2ae913835c8587c01303a7ce25ae0d4e6bde5cf6534d3a9db01558f95ab46efec4a827cb189bdd3c0cce975f487ba06a6496b
 MISC metadata.xml 228 SHA256 ca26fa205de7693f090a7d69cdf8b0c13c73d8f5573f1f56257d6669baf898f5 SHA512 6da0a1b9236ebffa3adb49d9802c31cec663443a1d3b7519d009cb7c49d50b2e1a50dafdf082df7b43e912e699e5f2711c77ebdb9227fe21bf4fe68924a251dd WHIRLPOOL 48c7f9eb47155ec64685a0a6fce9aeb404346607f6d88de7158959f5cae21dcf30a1c195930522ba5115f501d34c8e2d21c0c1cebd8dc77ee7b83194197a7e67
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0
 
-iQIcBAEBCAAGBQJT5RyeAAoJEC7dUkA7aK9HLIAP/A9sHCNrOecOa8IfuZxb4b5+
-yk0xTbCOzz4MQkOnmrUtdVOdAqnQtgkXDt/gtv4mOB3WEQkXNSAHWVuHLEsGvq1I
-cjYE/CnmxDnIcUcLMQ22MP0Orf8uwbZ6+Q2ai/Sd9xWQf18YLAfB+zvDSMInFkda
-dIS0+A0RMX0qqJw+g/r4SLy4HrNjKidcx7Ti9q6ijWVwYmzq5hatNh227Pn/s9Pk
-cysbWJZ8deYyEh8eSEUXPoF/ORk2Bs9SV8TBun78u7G/SQYbDyHmQA6CMyHnLdn6
-lnc9QQkriLUB7iJDxGwClPh22ypGsLuQea0ecud/H2vwp75uyQFq3NRkthYLEiMk
-owmI+dXN3nRfld5zt18VUOuOWJDsiEwQInB5eiJyvxTcl+gRRYOF1Yr1TbSevkdr
-schzVd8kQtDAaDlCrWmiGQbNRQENAU1bwupeseWavlws3jvmgkwbO8aS5vF9mFcf
-r1gFIKCoPRyGHIuCFv2pdMq7nJb6GgH2NRfVzTZ4FSXs4sTeo8kWIsvZi5/YhO3O
-c/yEVgHCwIZNEqumbxb3A0EK8p4W9hRvuQThd7AEMjVctiA8/QFoGAP0ouEKgjC+
-9o6d8/iibkDd1cNPrIZwZtolW4qAsGSM/qUq/VT9PhdXqI9swuaYFajNcykvYBOQ
-OLPC4KnKOMq7T4iewzzY
-=Vn47
+iQIcBAEBCAAGBQJT5nhzAAoJEC7dUkA7aK9H8FAP/2cxx+Ly1YcqooeIqQAN1R6Q
+fsZtwmjVO3f6Nv0i0ElJgfjlhg5VgB2S6uawQxd935P/ak0tqoMyc4Flz2nNa1tg
+DqFa/9PG8pDEVZgflxJ7pkmE6r7QC3BrROH5y8j0FDqKC742TSLKrKj7c2w3Nplw
+5f9HwHO8znMj/BhEP3ecx5GPkbtgO//f+n00R16cnORBcCVat1Naw3j+zqe6k7Pz
+cmsN7Msh28rnSSmCIaVvy/31Y3mxkfb66NZLlKsUZck2c/QRDnDWg1NIalg4lWRt
+d9ZRuetiipdoO7e4BvdGUxgPmMaV2Mh1CseUMCB0GlA7srRedRvpkLJg0v8Z3KT5
+CI7WgXJ+9fH+UsZbvoHgRfTlNsAEANd/VU655ZjEVhTPzObp5uIFnKrlUKH36uOM
+1AHfeh/TPtlCZXzCvIx89Y1aaVjbAWgwreEEdjsG7pwJCufngC46KBfn7katkTVi
+5doHRhewI/UWlXLbXj+Ua2PoTRGLccE6Q8eZXWShU+GRNzrOUr2JI/R+Od+s11dJ
+8nJv+OMIltQytVRmdBuM0WrBh/Gb4hfy3xqGq7VdiDlBJoYSLnlmyscSIcooEyO5
+Ti5VRYUmDhk6+W8dtcHfD3SixvHUlYHVKi9jhF11Jq5PscSV7K2Y+eWw1ZXVrFRl
+vqF1cZhav+/f6f1Nlj2R
+=+5xj
 -----END PGP SIGNATURE-----
diff --git a/sec-policy/selinux-sssd/selinux-sssd-2.20140311-r5.ebuild b/sec-policy/selinux-sssd/selinux-sssd-2.20140311-r5.ebuild
new file mode 100644
index 000000000000..98a1c46da795
--- /dev/null
+++ b/sec-policy/selinux-sssd/selinux-sssd-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-sssd/selinux-sssd-2.20140311-r5.ebuild,v 1.1 2014/08/09 19:34:35 swift Exp $
+EAPI="5"
+
+IUSE=""
+MODS="sssd"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for sssd"
+
+KEYWORDS="~amd64 ~x86"
diff --git a/sec-policy/selinux-stunnel/ChangeLog b/sec-policy/selinux-stunnel/ChangeLog
index 124660c93118..d9128e6f6bff 100644
--- a/sec-policy/selinux-stunnel/ChangeLog
+++ b/sec-policy/selinux-stunnel/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sec-policy/selinux-stunnel
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-stunnel/ChangeLog,v 1.64 2014/08/08 18:49:20 swift Exp $
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-stunnel/ChangeLog,v 1.65 2014/08/09 19:34:38 swift Exp $
+
+*selinux-stunnel-2.20140311-r5 (09 Aug 2014)
+
+  09 Aug 2014; Sven Vermeulen <swift@gentoo.org>
+  +selinux-stunnel-2.20140311-r5.ebuild:
+  Bump towards r5 (fixes duplicate context for hiawatha)
 
   08 Aug 2014; Sven Vermeulen <swift@gentoo.org> selinux-stunnel-9999.ebuild:
   Make 9999 ebuilds EAPI=5 and transform to make master for version bumps
diff --git a/sec-policy/selinux-stunnel/Manifest b/sec-policy/selinux-stunnel/Manifest
index 3eccb55c8fbd..2a84c7a20c1e 100644
--- a/sec-policy/selinux-stunnel/Manifest
+++ b/sec-policy/selinux-stunnel/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-stunnel-2.20140311-r1.ebuild 391 SHA256 8573f07241c13f7be502048b19e899d7e178ec3429fd6b49ee30f2ba99e475ff SHA512 3e471ddd5995f91e2a64ac64b8b639e6761551d6b627a4a00d2d3d50c1d8f3152e332cce52b93ad778924a0aefed05a8469744ab7d91978567bc90f002fdc06e WHIRLPOOL f2b8d95a23105a6517151e6073e016de20663f3003bdaef590e0a9398594b513473e73904c7e4bdf60689883c292a02fcfd033485115b8ac9d78022809507727
 EBUILD selinux-stunnel-2.20140311-r2.ebuild 391 SHA256 fbe3850315f0f83cdad4cc8918da119e7b32050e5c44ea5e04beb73a0fbaeb23 SHA512 3bf67dd11f2b71258e78a063cc6114a039395b238f86aa88ddb6b0c5ac588a6eed9f223b49d5640b40d4d7363e0bcefb4354ec6252857f713b5b643bfd02e800 WHIRLPOOL 6daf8269126e2caa413b8594f225e054c0ea40a8efe130dc2fe0d799941b8b798efdd94446ef64b728a465df173e09bc49c4d65edc1e2a65a3d7ea487648e169
 EBUILD selinux-stunnel-2.20140311-r3.ebuild 391 SHA256 6c03180520c46f870574161a2893f0deb901e21168b227233eeae16ec1702d0b SHA512 6759c5f6ece5858207cb5d637d569d7136622d497197ff894f06dbe6341f474b9d7f9ce6035576bb0f312a0d592968a7e8e045188cfeef6ee3c0228dad69a478 WHIRLPOOL e404caed836b4d177e280aadf24cc45bd310ec4da84fbf10b90cd7410dc3b1eade454c71c726180d5bf30c73ba7d38114cdf390a48722e006be0d24a3e99f457
 EBUILD selinux-stunnel-2.20140311-r4.ebuild 393 SHA256 35d986ea4079e35e0c4424f26b0e9376fc0ea804abf729caaf8eb532e3d58c1b SHA512 0490fbf30ee911fe6c3b00be6591152db42fd87446ed397a7116f737a608ffc7b198a01e0c4ba3c7686196ccc3406c0dce3c47d4a370f53467df3be681685521 WHIRLPOOL a0d928b550294d70bae564522260c15e2d49645c4d0308127fc5d8a60e22aeb34018603210dbfa34352b10c78f442abee51f8eefad56567487862e1f46d5035e
+EBUILD selinux-stunnel-2.20140311-r5.ebuild 369 SHA256 d8862d8b1747c541ac3c90bf3885771bceae268082d83932bbbbb7e99c2ae4e2 SHA512 6f65036535c71581569b5ce2a1c88fde63abb3b528ffadf876a25c0fc6659be252fbb0747140dc0cf8694f9e63ec7d20bbed433ce95c2ca6aa3296bf8810f731 WHIRLPOOL 855c79773de73b9a7ad75337b8671621c2158a473aace848ccd53284e72ded546aa1a06b73c0a7239a0b81b74a822ae11349d4f6e38f474672962151c2daa350
 EBUILD selinux-stunnel-9999.ebuild 349 SHA256 639e26e3bc02a6440b9032493070295394c2422e211548e76fbd78c5c53d1bcc SHA512 b6bd4cc1c372664d12e5c61d76d93a3302ac26967b5d3bbc897ddc9f37c08fdca05fb4c3d268fbd1bfc818139de28f1d17ab7710a0b241caf6a542bec35ecc7e WHIRLPOOL 46dad96a7885f2a219f3d59d44c4ab427ce95ab7ea36e331d4359a45d8e6aa711120461a178f4c6c9438f5ee3b490c0a3d04aed87ba3b4e7ac14d2f137a4d9dd
-MISC ChangeLog 9947 SHA256 468e46bd29696723907cf76da39b0166f3e3c8cbe5e9eba3a0b44cf8b8f9a70d SHA512 d4237107782b6056f27a18cae83415d2746f2d029a28f55a9a58bebe8f27996d2b9985c3db5950d085574b49f3c545e25c33dec59a58cd2af5a00138354e956b WHIRLPOOL b7da8670f33d24d1b123255996e8d6fc998076186d71bb123ff203bfdb9b702416c801bcd8b8471e684d5c04cb15e51b83d82688d554140d41457281a7886de3
+MISC ChangeLog 10141 SHA256 92620a987f1767d9f50180bb459446867820aa52f291fe274ab62bd30218b2c8 SHA512 2c38a8f77c6adf9eb307139d17a477a73a78cf08f5bcacbe6544aa96ae43c318ebfc62aec1e1d229e34beeff6b7fe1bcc8e59373f61edbd7f3bcb88980482a30 WHIRLPOOL 897d2996c10e6e05d377d402611806dbf2b5c90497305ecfa51177a1a2c5b5a13646f327ad77715fc6f315b86f686ef0ac937c92dcc90c6be1c7f09f32deeb79
 MISC metadata.xml 231 SHA256 7df1ccb513af0d96d8aff85a4a255b17527b83271894d98471e1b70c1306d08b SHA512 1461ac8c4b209580fa5973db75cacc6097f36a3269298e95887a3277b74f3eea43913c1c9747f5843fc2575695ca749495ca6078c49d504083bab48196bac13e WHIRLPOOL f867d2e3d963f5ca68e891adcba310266262106c4dc413e01e9936ffa73631b2d9be9893aa2b4f4140625fa4df6b31d60fc2d00da0e9d64630df7feaa7d1763d
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0
 
-iQIcBAEBCAAGBQJT5RyeAAoJEC7dUkA7aK9Hb0cQAJmpgioUdcjYgvVqT2GO6eEp
-J95hOxEoy1nl5rWsJwUZWKQ4L3Kkb93b/dXcqvPM20U0GiOVxDO8uf9Vhx+EgcEq
-nhsnAduebfe+u+tTRodPwH/22GiEpxlEnP5PLCqyJhKQT3UVRahM3dhWmMG9drTN
-mEdhPrCAptNhbuZIcV5OU1fvv3g1fGnTFNAYiOf2SCPZTZfoUyELXzFVDPWVAasK
-6xfKFs4iztFMYgEPZ5kIiwQ1/lwjOyUk8oQufVHHzcJkw7hYI6Y0qRO+uaZqbrSc
-nZVRe1s3d1k+AXmRnIyEkpyY4hprsqVcE1nmpJRJSUzClL39qnwkJfiEInDmGoUP
-gKYbMmuDsdiNNXqWWA24UYUx2ihQBBtGNimKuHTxp5Jg6Xtc4itzje5U92eCjpVA
-YG9Hh4QORayCcLB+pBu3Cpi1L16jZCKjpGQ0HRX9+ofKmj1Q6ARjdSAwUGEusIFL
-sVlSlHPa/YJIZXCggAcgU5APHBl3OYurWbcjIZMJyEbraSlEqP+6BeRPFuzX+Dal
-TsmfJaGpOMgLRxTTpUz3K+I5J5SHodqQKXK3lOKBhU6NqahrruTqhAolFA4zbDMk
-gg3JciMHGzMJXXnn5YZ+bT4mTv9jy30i/S5SJtGFfB74IpWQ0+yEv7OB9w/Nskjd
-0IdhVS4owIb0fTtX4LSB
-=Ul3z
+iQIcBAEBCAAGBQJT5nhzAAoJEC7dUkA7aK9HlLgP/RpMJG0qTQJTTZeqZg71FvE4
+lTYZpqxqAG0z1Xlqez+hFfnS0sIfNe4PuAzpo00xploBPYbvYFCO4M8vGODZW5zH
+1WAiC0KpMrlsSq3n9V4lO46/LDQwwVkkQYc/BIeYTjDoz0j5jQDYsa/1lrA25szc
+zagciOd7+XBddPGlT2ASpRW528FSYfDxVs24bB91wzisdrqy8bXAZAhB9seinJ9K
+6wrTQLfIlakCBUS+FqRBzTPs3KqCHd2uKMtkW9kv894A8Ke8B8cooan7HNxk4e1J
+bygoaY0E7AhfcV9zQceN+Y7enUQAW7jlDknSAK3vkm8BTfy+qkbUBxPJtiGwksgI
+BiOQlvvzQEC5FlNwqfoGJ5Xp7Bqhwzqtcp94LRqyBUWDq2BypyQF7lD8hzDgQMkj
+LViNM5aLkc+U5fUrT1h/UTDaRUogSUI6ulors99J7K9n1Ne7fmuM24ELWQnNw2Rm
+AmYq/7v+YarC5G73F1DIw+tab0e8irs5OF3jB+tCslf7q6p5TeFgKlro6sjlHHfX
+GHvp+aHjtOKxKrFs3ggDEq2pZFWHkfgdoAuTUlsXP+Qu9oTVGmkCr4jJv5Sj48Nx
+HGo0ngawMkUSiQHlBQ/GqV88Yv6MJtvvmG5y6TpAUBwnnt6E89Lbw3T8zQe18g3y
+CXcVDUHckiyErqlryxnA
+=g35k
 -----END PGP SIGNATURE-----
diff --git a/sec-policy/selinux-stunnel/selinux-stunnel-2.20140311-r5.ebuild b/sec-policy/selinux-stunnel/selinux-stunnel-2.20140311-r5.ebuild
new file mode 100644
index 000000000000..6f359ff962c1
--- /dev/null
+++ b/sec-policy/selinux-stunnel/selinux-stunnel-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-stunnel/selinux-stunnel-2.20140311-r5.ebuild,v 1.1 2014/08/09 19:34:38 swift Exp $
+EAPI="5"
+
+IUSE=""
+MODS="stunnel"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for stunnel"
+
+KEYWORDS="~amd64 ~x86"
diff --git a/sec-policy/selinux-sudo/ChangeLog b/sec-policy/selinux-sudo/ChangeLog
index 7a3df33f3ac9..2693f062d06b 100644
--- a/sec-policy/selinux-sudo/ChangeLog
+++ b/sec-policy/selinux-sudo/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sec-policy/selinux-sudo
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-sudo/ChangeLog,v 1.67 2014/08/08 18:49:28 swift Exp $
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-sudo/ChangeLog,v 1.68 2014/08/09 19:34:20 swift Exp $
+
+*selinux-sudo-2.20140311-r5 (09 Aug 2014)
+
+  09 Aug 2014; Sven Vermeulen <swift@gentoo.org>
+  +selinux-sudo-2.20140311-r5.ebuild:
+  Bump towards r5 (fixes duplicate context for hiawatha)
 
   08 Aug 2014; Sven Vermeulen <swift@gentoo.org> selinux-sudo-9999.ebuild:
   Make 9999 ebuilds EAPI=5 and transform to make master for version bumps
diff --git a/sec-policy/selinux-sudo/Manifest b/sec-policy/selinux-sudo/Manifest
index 9b920bfb4f8d..98a39ee5cb85 100644
--- a/sec-policy/selinux-sudo/Manifest
+++ b/sec-policy/selinux-sudo/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-sudo-2.20140311-r1.ebuild 379 SHA256 8853a0bde339de2469233750650ca4c47ca6a2faa57a0ed849b2c6cf4f14cd7f SHA512 2387afb85f81888727db511761bf0077fff0c1582c904b8777603a4c988d2d90d1d7ea29c30d3705b862a25cdea48458db7f8321a8067dacfffea92695969a7c WHIRLPOOL 6d16e5ca751d2d0f2138959154f57f910755325060197fe2571de2fcb68a5a7a9bad695943d57149307803895f34b2f0d85d34b5d17a060f6164dcbe0681544c
 EBUILD selinux-sudo-2.20140311-r2.ebuild 379 SHA256 1570d764202897e400cd8544955da8d9cbda8f6928341f5b5d75662a2d910a0d SHA512 79af13dac1a4af4ae4ae2f2c877379bb64cb8c4f747a6de23c288ab197d0f1a7db057a4b9147631c9eb478a7f3032274b88d0da9c30a1f1b08652e37189310db WHIRLPOOL 347f4d88e996b31fb68b78a5feec965f8e073482deb228ec8d7971f38ac6f06dbdfdbafdf4d4fabcf50f03367b7b765df2cdf0ef1010b69ed707ec4bd64fed5d
 EBUILD selinux-sudo-2.20140311-r3.ebuild 379 SHA256 9f347371612621065cc6c44e912cbb1103044a0d899043c4a391c4c33c77cfbb SHA512 ef1407a33fa9c4ce327c4ec674dbdf1176b0281b5152d1b554ceb97782dde2c714daef34175bb61f23f7a5153ebde6534ddc4907b34815d0548ead4a7f8af27f WHIRLPOOL cccbb588a829fd4833f13c88bdff27b62137ad78be6b8b2f85871509d0e649353ee15cd077c937091d5aeef6745a8c94edc96b953ff8fa87a17c232606ed96d9
 EBUILD selinux-sudo-2.20140311-r4.ebuild 381 SHA256 9e86283d2e0dda11543dbcdc23039fcac374c668061c5b4beda8a635e7680924 SHA512 33d27c34faceebf2841f3b21f4209aabf3b340bae7ad707fab0865030cecb463677997696b1f43437cc114d9ddfdefe2cf1fe1a57dc3147f8012a8772ac76abc WHIRLPOOL ce2220779661829703639af386d34fc7384cdad661d98214991e270c791febc8e31490c9f1f5ec9e0ad19dde3c1d7db0eacf790b3fcebec8fcd74d6026fdf8d2
+EBUILD selinux-sudo-2.20140311-r5.ebuild 357 SHA256 7be0d2fa83266c733827287472164a146c75949d31ec4edca84d9d5baca45865 SHA512 ccbad523aa07d76ef089c5392e3f25790233632fc5381837d13c050de459482027513315a585d718b48c5512d696596871b63fff0def6bc32b8ea1ea26cb1873 WHIRLPOOL eff2f4287c8d4bca4b0a2878b4bc9df7eb95d84197f9eadbfc2724413be0d2dfe807c97c41a4f5e0078e9d5b76c3780829db888bae421846cfc8881aa15b701d
 EBUILD selinux-sudo-9999.ebuild 337 SHA256 fd33d98d4e4f579eab4e07db27cd77a3d6715d7c49885a196ed068647b956dbb SHA512 e422a5864bf14206f16359acdbefe33f34790b31d0671acdc892ae1165a3310c32e7bd1f65941d3da38075c782c43df6f717b7603bd34aab7cf8a08e43ea7c0f WHIRLPOOL 25272cb34f3c47baf8907e3016477ec139e8dd849682fcb90323a10d91d6ddf4af08e01b88dbe20049cca2973b33985c460e78abe82c3ec6e12fc1f3bfd009db
-MISC ChangeLog 10165 SHA256 ed06e5af0adf0370c1417fa18993f6d6bf0d65a4fcdc8acad0ba0112cdaa88fb SHA512 1f787938c801084916e2a0aa721d58769a2dfd02f726158cb971952641373d1c3997006d36aa0f559240be123405b18f808ac4b33251aea079b8d4435ba1cd81 WHIRLPOOL 7653cdb1361afbafbc30ea6aea9c2f710f55853b31e981f664b5d38164e2089265ac88e3589da7ee53d2e12d3289b7403da60532b6b8f2b7e3c2955055d9940e
+MISC ChangeLog 10353 SHA256 c68cf21db5df48d5c20aa7b77db7ad2c3112e9f0e4f9a2dcbe26955e39561218 SHA512 fd7b69392d4d7a3cbc94c4de24cfee3d19e758ff09d179c08cb72799a72dda584bb761496f493ce1f83535d333945c854fe8f30ab4a9e12f4357ab05c92f7d4b WHIRLPOOL eeeacb56925f054204758bdd5222d3b5c6f2f865e1509ac5e17fb2be8c518768bb720d756b9390fcf6cf18458bb714097f24081d66cd814fe6f0c7fd06cffad3
 MISC metadata.xml 228 SHA256 6bf61981a775fd7e11011159f387615cdb96e3e8017cb802335c7b339d23ced9 SHA512 d12b0670c40061d09f8d5293c050f8aff6a0f8574ae41d10e0c4007609d332e1048aa0bef326dd2b6fce50ca855dc4b36e44eb8dac5a1eeed4883b58d685b461 WHIRLPOOL d5afe330e4ed9bfdf7712ab5e7d8521dce9dd119cc8451ebb735084ceef77794786abd7b6203ff328818fc30f5ac022a2f64acac0a3b81c13aff969902fe3dac
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0
 
-iQIcBAEBCAAGBQJT5RyeAAoJEC7dUkA7aK9HQfEP/1hlc2w6+3VUiF7qa8zVpbhP
-xgbqd2MX583dqWMIDa7Px7kwM70cGC8FBukDu1MIayn2we+mUIZmA1GDJocPDH9V
-lNS5ppBCXM2P/xAvA/sW/f0KhMT2Oi95i8IlQogbXZjFoWpt/QXbqsaYtKSyTqtp
-4Qv1KpupzX/K/j6/vFw5IQnXstR4WY4mLzHZmtv7DjxaEL5HpMF+Ed50CWzh2fFF
-D10Y6TMkycaoKZcsFrymt6QEwe7mRzuzguRXaRgivsdA0ekSxGcyYdLyQ3qANGaS
-CrJgTDWrcJlSjsMqwQ7qLDpCCJkiNZM0C03maEQuEYxlk5hEVZUlGQ9QrZsqYjmU
-A9EDviEcWYeJto2+uclUOth1Pu21ldjiyIejW+s+1M8zkV6MXZO3J0o0/SwMqFIg
-4NJCPaD05RJ76JCMTUpeRhw7+jZ7w8rvIGywHMNmsMDKe3dNTmpYDK2wnxaTj4XT
-tLf+YApXJ7mfjRysofLeqZvLQAQqpRff2xn7LpsxI7BPunXt+c0aDybahHvQEfiT
-8t0bECSPNaxZBrDzSkk9mtuPB9FG/QOw0XU9Qgr/l2ZLjGJ6jPssZ09wTrWejVgu
-2Nxl07TlrfPLwdVZAnreaAlJkeBlOUhVgk0P3AFcPFUQfNHAsX2dyzn7Res+zQmo
-T0hluiw4j3vempkWihqD
-=i0Ae
+iQIcBAEBCAAGBQJT5nh0AAoJEC7dUkA7aK9HU1YQAIcldq3CV13ICILD3s8oXi6m
+3ejInRV9aXBkVMLgmsG5XM7Uy8vo3+Kp13qv7nNJlzhGNwxGqTh4M2OeDoeCEBJB
+Pu/hEz1MUpu+uTWmpcnuQqfidcyYsZ4G/e7aQMvSyteKKCKPNclAkyilHjZ+3own
+zygP0m9TqM5tb/1Pet6TtzW1UfsitUIC4iJ6iH5fWfUJsbxulyQBPeknAspuPUKv
+i2dSlB1gN/D55jDzYjKFuuUcqbJtOIQeEJQnKIpB/QtG2utpV4lJt++yqFcWp1fz
+8r2+5I9jQY5RC3P1VQg1x8otkVP7t+fZRi4nS+c9+Dr7p4ZPuYo19cEijFvIyDtZ
+pw5ByK31dpo4pcKGSF+0ymaVb9UxifgkxvgIkbNMPioLzF+VHLEqdIYMj5OcVik9
+FIW4rMTYku3uwuHHyBxKL42pumD6SwpTnq7SMbP4O9s4jVd9jA6sM2b0tnktyMaL
+IASJexHXD20AvL8Q8/XV+E5kuJszBJ8ERtchZ8YM69WYBjzcKlptwak/DM6sx5Je
+2YQlk367dDaTnl2H4Oksq0sWJftFiF74zaJ/i6xPYv+yRiw7kxD6Vqd3WI7Afu+S
+RU5R8taHd1Qs2CXj5mmpTLOKVE9+bqe5cldxhclzGaM8fLacTj5RTXmkCKvtCrLk
+qedAvUFA/R56XEPuo3sH
+=DX/1
 -----END PGP SIGNATURE-----
diff --git a/sec-policy/selinux-sudo/selinux-sudo-2.20140311-r5.ebuild b/sec-policy/selinux-sudo/selinux-sudo-2.20140311-r5.ebuild
new file mode 100644
index 000000000000..6f602f18caf8
--- /dev/null
+++ b/sec-policy/selinux-sudo/selinux-sudo-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-sudo/selinux-sudo-2.20140311-r5.ebuild,v 1.1 2014/08/09 19:34:20 swift Exp $
+EAPI="5"
+
+IUSE=""
+MODS="sudo"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for sudo"
+
+KEYWORDS="~amd64 ~x86"
diff --git a/sec-policy/selinux-sxid/ChangeLog b/sec-policy/selinux-sxid/ChangeLog
index c29f105cedaf..2ecb7f1ddf14 100644
--- a/sec-policy/selinux-sxid/ChangeLog
+++ b/sec-policy/selinux-sxid/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sec-policy/selinux-sxid
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-sxid/ChangeLog,v 1.43 2014/08/08 18:49:34 swift Exp $
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-sxid/ChangeLog,v 1.44 2014/08/09 19:34:45 swift Exp $
+
+*selinux-sxid-2.20140311-r5 (09 Aug 2014)
+
+  09 Aug 2014; Sven Vermeulen <swift@gentoo.org>
+  +selinux-sxid-2.20140311-r5.ebuild:
+  Bump towards r5 (fixes duplicate context for hiawatha)
 
   08 Aug 2014; Sven Vermeulen <swift@gentoo.org> selinux-sxid-9999.ebuild:
   Make 9999 ebuilds EAPI=5 and transform to make master for version bumps
diff --git a/sec-policy/selinux-sxid/Manifest b/sec-policy/selinux-sxid/Manifest
index 98e6fb70439b..ccbc0159c08e 100644
--- a/sec-policy/selinux-sxid/Manifest
+++ b/sec-policy/selinux-sxid/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-sxid-2.20140311-r1.ebuild 379 SHA256 8a476698d671c36c56defc6aa304a0a66f6a02da91182367942d2465f1af9a0a SHA512 878fc7c134afe7df309ae28c7cf0be5171fb48dcf08e16be2d8bd6814e8c0f6d82e752d425663a28eb2f9196b62cb0269da2a4c53c8052aea9deefeb1b2809a7 WHIRLPOOL af1552bcc4bc24169d54465d51273d083fd4e560c177b1888b21e4ae7309b80c036d61149a099fe128cb362092ed324a36778f99b845224b5d69dcf0fdf1de55
 EBUILD selinux-sxid-2.20140311-r2.ebuild 379 SHA256 1d74a22845368534a6a7507a1ec13e49821c7f0ee04b4765541e5699e073d8d5 SHA512 8cfa5d51351d3d4ef1a6e46e0b97b8712a04a1fa394d6f606aabacc60cae7c2452867724c76f0c6ff243377053613f5a3ad4565d880acbbda7dcf03d38d460fc WHIRLPOOL 19ab9cf913eecd2a9d306c1583524d084088d05c192976aa9b63237d5e9afba00e821825c7fe649557deebccbe68a9008a39a91a26b0d508baadfad53b7d0726
 EBUILD selinux-sxid-2.20140311-r3.ebuild 379 SHA256 ba9075bcd46d57415a54d65791363516030256ec852c1f20b65e37a1995b0d14 SHA512 54073b0114e27ff70d3eab758b175a8bd11388261ec1c93ed1e147cda5418e86e21c06922c67af41d1a6d969c2e4fbb64452302c6f8f48f58be346727b8c2a5e WHIRLPOOL 5f2b9b931f2a37379adceb2e4338344d0171e1e95c3335a8fd7ebb0bf26c0824741ebb97754cf721dae801fb65e525857c0ec5d852fb61fec1f0959caefda8cc
 EBUILD selinux-sxid-2.20140311-r4.ebuild 381 SHA256 d94d27f339fd17015748927cf8c7ee98cf10d1444d9dac470a854b376af3a8a9 SHA512 562e87f66b19d5294cb7d45f74ed0ec364c702947d577196a5d23cbe98b675a97d8ff7004111a088beb964b4591958e7836aa851c927947771723995798ad5bb WHIRLPOOL 6060880844f241f384a51ccccd150f04fe18e67a2694551ccbe0dd6eb4b74f576af16b59a0f6a92bfdbbff01e7951a0a8d1852c6f1102f08c3fdccbabd601c1c
+EBUILD selinux-sxid-2.20140311-r5.ebuild 357 SHA256 962e2b53f232c58b10d8726a9b4a5bbdd7075ea04190a5dd62948aa716f14841 SHA512 fb3101bc69befe65697ad5b9abb16265ff3c77c09af95a3b0ef7c1fed896ff9c1c0aaf61907a5263188f34eb5611ffccccac3952313b84c8f73887419b126f36 WHIRLPOOL ae4c98a50b6525d07127aad246bc4492ece3d48c7f4f3b39e86876108a83d4a4f414596e9a9a85ae0b1f6d7b8181c6d239a4bc45619f4b93089770c171740bf9
 EBUILD selinux-sxid-9999.ebuild 337 SHA256 aa60568a26d211b4a2df08003f9911f9ba8a6d727312f353138b6e008b2801f7 SHA512 7b17d89a7f59433bf2972ba014a09765789c541537ac35f594ac3a0775e93b4799f4b92453e9d580d9471690d6e0e930e453d462543b01b4eb72bbf0e957cfe9 WHIRLPOOL 82946f53763d793091b5f9384ff886c6d2b2633e128d67a1cabc2bf59692fd9b2735a0a7986f9b8e0c727e01ff5cd84fe9cfb43d485b07aad4994c1a3d5c7ef8
-MISC ChangeLog 6545 SHA256 f29301093dc56f55e1e63b022dc23808fc39db2192ba8b101d3357f3943c9a35 SHA512 9cc14ebc0b8d77cee9d0ec5b39dc58429869ce0d7f0fbf13870434ccd28f2b4e28ad8c76d3ddf92ec76369c6645fa075743925f3bc0239e49db9526b00a1becd WHIRLPOOL dffa12a1bc84a75206106e78504e6841f6475da323b8545de7523e12998ea4d38f785d1f740952fb7059c475cfe8ea0ed367218ca902c8eba2a096c4de249877
+MISC ChangeLog 6733 SHA256 e79686e0ccb88901d3695ba1026ffb4eab66a4db33d373f4682a499ec1356799 SHA512 0d7c827b88fa14811dbe6a986c3547bfc25309676817e43c2d0ea5557d97c2fddffa4f0d4089f8518954e9b41cb2271d6ae8be3f616cfbda1fde79bb6bc5190c WHIRLPOOL 531fd1d1396e97c549d2cecf7388dbca46ffa9716aab85755f0d3a195e53f7dce4ae45b6ae5d42c0baf246d400a352833080297379de7c00d7098d1cfa2c80e2
 MISC metadata.xml 228 SHA256 8b8396d08e990c755e8a254611499c4fc4d76d6af274b53c853dc1dcd03cfb27 SHA512 0810823f15cc977abc40659423a657c126b5413314fb0e7440125ce742502492f44592e800b039b1623e110b2bab44a94566ee79e7ae253fdcf2a74de37e9d91 WHIRLPOOL 4243e9d35876b2166f151adbb7da1ad2ae4fbbe365561804dbf0a143fec2f432c42290a09d8cda87d35add8e4b69faa83ed8a0230e0c7eccee7a2a90a46789aa
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0
 
-iQIcBAEBCAAGBQJT5RyfAAoJEC7dUkA7aK9HDj0QAJV/jh8em2TF/eb7JDPqxBbB
-Dxum/jxTHfKeDq87DXCmCwsA59Tp6oMlwz3zMZOuPWCxJwDm0knTisJg8/sEXhKp
-n2O1z3v8wmBQj+gFwWSqV8nByFTG+DdjCsCLcghD1WtzyCYsouyRFyDOZXxKacvE
-L+pmYzWwhJeMKOwWpc4XMFLvn+VbaBDXh5M1G7GA1As14AMqH/+lM+IB8slUVY/5
-W3g1IcmYuji46td3CbaDX+6jZe/Po3tqkNJqSXwbP7nNfw0uv+vA/TIKjfWjJcXE
-Pl5mAVw5IunebY0lx+e/nnYRVrjXCmfEYGrF+tioPm3o0fN83uN8VtYmIrjQIz9m
-immDt+iiefa/SWLySh6xl/fg/cmqDKoPbZO4OCNTouE+le7URfC10xO0Wlojrs9E
-cpE74NmtBGN02WZptZICPsXJI2Jw0pk9wY/4Okg9pqVlLLQ6Nfobh9VjmCh3RXfT
-qc7FSj//KZ97OQlyDQMFdHf9qCO3+pFmKREpC7jOqDQC5b4ka6UemRlm0h3wUYNX
-yYT9kV+ca2xfJsrrOK7mMb+WVjLTy/CspxwKzKMfwoqq5zmMLMKJvwT6qnYjC0M7
-UFnVn5E99Z8L18n+veY5ON1yjugwcJzYFRlLgiwN5P610q38lR3kEo+AfrfXrFhJ
-ZpobrQvNA/DnG3F68JL3
-=QVpN
+iQIcBAEBCAAGBQJT5nh0AAoJEC7dUkA7aK9HrjoP/j76EIr2jc740iUUhra6C86N
+TDMaLUfLXPdr640ZgE4Jqvf3fgVxaItvRGc4hg9zUs1Fn5WKL+MhPG5Q+DIz+DNN
+qgyMwsDatQ+ETHLf2E+nqm4lYPZOgMryJL5p7FOFTtYoC02vhXpZyhrQnJabp4LM
+L6YE7eXxYeJmSGd45fQed0nZANqpBP5aVBsszrIF3s6nJAwHriF0+va/W1N7Pv5K
+8p5uujggW9rtkEKdXymlsqQrVDVY5nEI8ihhwg2GdGxTTvXIDMsx3vYzbANl52Bp
+GaqFyq9dRUJkBYGLivGy115sjz8kIuGyzby19zKLoXozLiL2OyUU6xPAbMIMgqzg
+W0pAwUZraj4JOnne422NqUyTevNRTPT0DJro+xM+JmWkxPZO6nNHcuqe5UGQs48A
+xbRjsWIg2QU+owIUOLLMJPLS6iw+zaAeUVVy5+XR6AV4AUuYKtoJXUbi9odzkWYW
+R2yhbYD8DokZk4ZBTHThptgOOrC/jRKu5eZYzSJpbz78LundfYEqSvMsq1Bnce2T
+96VweKHXV53WVpxqZH2hj/Xol/dIu5EB++5ghMkctl75NrRhfrs5jjGoHYXoETQ4
+CX5lp6N3kHE6ivY8oi3/9nY8l4xd91o3N28iFbNWIe7SPhsSXc2Lw5m56tX0dKr8
+2CGfX4vtJPIOcwCdIPln
+=Y7KV
 -----END PGP SIGNATURE-----
diff --git a/sec-policy/selinux-sxid/selinux-sxid-2.20140311-r5.ebuild b/sec-policy/selinux-sxid/selinux-sxid-2.20140311-r5.ebuild
new file mode 100644
index 000000000000..f82d43668869
--- /dev/null
+++ b/sec-policy/selinux-sxid/selinux-sxid-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-sxid/selinux-sxid-2.20140311-r5.ebuild,v 1.1 2014/08/09 19:34:45 swift Exp $
+EAPI="5"
+
+IUSE=""
+MODS="sxid"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for sxid"
+
+KEYWORDS="~amd64 ~x86"
diff --git a/sec-policy/selinux-sysstat/ChangeLog b/sec-policy/selinux-sysstat/ChangeLog
index ebd28dfef058..a2a88c3a37b7 100644
--- a/sec-policy/selinux-sysstat/ChangeLog
+++ b/sec-policy/selinux-sysstat/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sec-policy/selinux-sysstat
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-sysstat/ChangeLog,v 1.43 2014/08/08 18:49:27 swift Exp $
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-sysstat/ChangeLog,v 1.44 2014/08/09 19:34:24 swift Exp $
+
+*selinux-sysstat-2.20140311-r5 (09 Aug 2014)
+
+  09 Aug 2014; Sven Vermeulen <swift@gentoo.org>
+  +selinux-sysstat-2.20140311-r5.ebuild:
+  Bump towards r5 (fixes duplicate context for hiawatha)
 
   08 Aug 2014; Sven Vermeulen <swift@gentoo.org> selinux-sysstat-9999.ebuild:
   Make 9999 ebuilds EAPI=5 and transform to make master for version bumps
diff --git a/sec-policy/selinux-sysstat/Manifest b/sec-policy/selinux-sysstat/Manifest
index fab078d42862..e48d983ea83e 100644
--- a/sec-policy/selinux-sysstat/Manifest
+++ b/sec-policy/selinux-sysstat/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-sysstat-2.20140311-r1.ebuild 391 SHA256 c7a6f9b7fac81c10b273ccceb5b220eb7d4180035af890f7ab56a5d1d31992cd SHA512 d7bb7970d24b3ec9966698f7104f23f4fd3a3f19f6a58b4bbecfe0649590dde9ee02495afb19ec12c10c6999122916a3837563bc79118345ca125d1949c6d6ce WHIRLPOOL b1e561e962676ed87e0f744da38b6d16ac9b90a6a7f1e246f17083b2bd03199c56d65543b9d00de221e8745406b03d9d8ea7373627d9f3b2b647f71645ad7a71
 EBUILD selinux-sysstat-2.20140311-r2.ebuild 391 SHA256 dd7e35b2867569f72a78efdb18eee1f9c74007af86bab8026b21c50a54adb2f1 SHA512 2b403c1c36e22d9aedcad33e59c8d8f9d2a9e5e3dc4e4f7864a474acac08ee3770f95e3201d7ff735498c1f92b4e893640782ab5fdcc2cce84909ecf69a7f99d WHIRLPOOL 03e422487ce45dd3042d185ff0a5b659c4438153269bdf8f795833778141e4d5371fd1283ba32351648480359cca6a2da7053f0e4d52fda4b548d60c56804a6e
 EBUILD selinux-sysstat-2.20140311-r3.ebuild 391 SHA256 42b29d4544b6776d419c3d3245dd8bd69230f0373603e09935dc8a3a8118aa6c SHA512 4c02137bbf98903acca455af97188d2859894ea958fd0c0ecde1d1e7a2b016034ca58a219baf0d14c95a0a988d706a5b34b04c28d2e638bc88b7393b94fb5456 WHIRLPOOL c2b4b740777fcc5efccd2d673fa9ec1ef90cee1950509d9ee728ed5cc51c697723e634c5f8d945b14560dd4d0c8d407067a04c5a366ada5591bc0215be60ff53
 EBUILD selinux-sysstat-2.20140311-r4.ebuild 393 SHA256 d71440bf51b8318401e870cfdb9b5698d6b3ec581375f2c23b89d32bf4ba87d6 SHA512 754823f38300525e749d05ec1858b3ca384879e4111e984c7ae9aee58c09e5c26b2d3730f45c9642da3c2287b0ad4be320c19a4674b7d3047977c44d565c2eb0 WHIRLPOOL 4ee9abfa970ed5eb675192c9397b4a5a37ff4d5a4f5ed93ff2c1ff8bd8d8d15e7158b071568101beaa591cd14b520ae737d080d1c1f870046c326d75df162745
+EBUILD selinux-sysstat-2.20140311-r5.ebuild 369 SHA256 6cf68f14f99f3d494d6580208143514be149d98bc89d3b86e52068d1a1e6e852 SHA512 7b8e635c4cc618be7d7c5def3b6f8e3434a1e064371a92ae06149da6b5b4199a3a97e9cc3f87b4cfc8845110a21a4d2d62cad53fe9914d98f7731ecac925f222 WHIRLPOOL ec6cd03910dbdc80f6553af2a7cd2e39c128097bc24ec6b4a7851c4e5690696609a5f123b42004628179740a95f873de1a961f4e1016e35abc7985f9cb94a6e1
 EBUILD selinux-sysstat-9999.ebuild 349 SHA256 8cada35882f8452ff997b58b9370fbcf375f910bde2fed9efc9be18f190059f7 SHA512 31cad575502fe58f9c1af2265036a27c3255e99c53ab281ca3933714039d0118ebdc35089d25b45adc75fbc5ab3454b2f246574a18fbc8f4d2cd95c767c06218 WHIRLPOOL 81ebd9d9b2287be45d2b4ea33de06d87c74e69501ec8df65be06e05b4b3c57713b160cc8403878697b429e56a9fbc2142f67692df6894b43ca8b6c3678380456
-MISC ChangeLog 6783 SHA256 b6231a7521ad78e0fe6cfc5770ccf661551c063e3b8e261ee7abe89d82ac8a1e SHA512 2c44a90ff48c378a048396eb7b4b889c22de1f3c538d200a3d51504548ff273ed3bf7d680ff7cf88de1a331ca5a42ac2673b3193321ac8381b7262266253e7c8 WHIRLPOOL 24c0634db8290641bfb087a353275e34c63bd7bb9a9f274da948cf37205ad2680a1b5aa4cca30d1f2c4b83f0a9c409cd0d6b87ac81b8e51153c7dde16619bd51
+MISC ChangeLog 6977 SHA256 b839593f0995ae153060458b2c1ce8172e77557d28600d0b300a352f6b7b6bae SHA512 d0eafa24a7a3eadc7862b0a0accef16b3c611834dfb2dab998824a34f818c23923182d9a9c7b0d208283e0e41aed90f69c851767e0aba6a9d2d6008d738edf8e WHIRLPOOL b9356b521a19658ba7d5974251f93bf842c106873c8fd2c2a1fe8b25b6241799bf0785f5b22ec4582ab4993252aac2fd4247a8732cf136cfd4a6960b4920e3d6
 MISC metadata.xml 231 SHA256 03d949e47473350e53074c85deb18a3a35304eb1024f8e4ddb2b19b6294ffe31 SHA512 086e6f41a2744a9cc534f64c03ca1e91655a92664b03435b2ea51f2929a916e147f46bebec0534ffaf6327ee53e911966aacd34fa96c9c9bf5d8541ea0216d8b WHIRLPOOL c5259ed068bb2072582a3d3f0e7a5c453b801d786eccd687dcd9f69821ccf176045bbf7533d52cbfe2d268b8c080f58ac36419e42ff5425c374b32b13e147a92
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0
 
-iQIcBAEBCAAGBQJT5RyfAAoJEC7dUkA7aK9HYrIP/AgjhIiFwGbN7fEErpEuMmmA
-ARdmXFzUulnJDVVnBu5mMiJwHdsZFFC7sxoPSKMSyV6VnIVQ09x684f6H1pjurIY
-QVorW6KU/R6haeFy+Ef0R6ZupjS9yf5MGv4j8FxZRaoR4HrnvIwjW9WiQ0xyLS9+
-TtN24NkV/NRgG/I3qsK5RtUTPmrxIQFAlVFhwbK5Cz37HsoQpnoP8kxaDYw8327O
-KRu9iw+qjjTrRxW/etgFYdCRkZ0I8phzM5Dtm+Tndxl6BqHAup/4Z1IDuJl4iFJQ
-lVE4sFx9LLWqsowwOczaJ9qVKKSY/ujPP/pFErDJsACMm5QJkv1GTy3jwbDSjcbc
-yrqPmlhIJU8UQzp9G5t9rK+oOjSivnW6XF7oiAZwmHc4Qy5ukbsLv1HMunrwuC7P
-ObyiC/hcFfIkhgTBfRYddX2FI8JOARloPRsPARRoO7SPldkUK6g4z58VczwxOQwe
-nGK2qcQc//wl9TwCzqXT3QiL8FwVhtyjsuayGpZtncEYiYlP+BvWVRgut/yR6ecW
-JloH99KbhN9GdzmkDarN2ZVuCiQx/hLYl31rC05KdQ/fOyvC1qVam6E6INZtZ2nn
-ap7mK5LKcex42yxOMzSnmjsuEiE11eHf9CbUv9ICZptlQyMRG1Bl4YQl0Wo7KXtk
-6iGTRevS56fGkYC8ZAH/
-=/Jew
+iQIcBAEBCAAGBQJT5nh0AAoJEC7dUkA7aK9HfRIP/icEDnTzW8rqiNEitE1u4IKA
+vwGv/YLOO/KVw2xRrtaM4DZZriW7cEvIlkgSAnlYwcO+L92i+EbFrF7aKB5BAUGE
+HE9jGzctZZyqVVC4x4S1TGCSW/HmGxQZZgdZqK2PahrppvNzBZ9FURMhyw7UXxGI
+640iDHvx77Dav01sbVb3N8o3YMimFvNqWNcSIHhdrLaxJrmuUAezQrBUD1AvTs3L
+RwXw2lSbX8mEhEVoTEiqV7lH0c/qHM24G6sSCpIKz7Zxby7dNmyi4Td0b+vVQxDW
+pK52oDdV5/Y0+D0dLlWIELJvwk4tFcqE0I2uxgStsjBPNZWV35F8MWwqL3+4MFbm
+tEAsZAyFu1/dDzq8Jor8ubJVcXWj/YGbevzHNvxv1Z4djOC9Ta5GluqdacR44mJO
+n1W41jE5y/HySLcqci55TTZgHJuKq1tj6WJml6rYs+4CKGvhW/4Xi3cvoWXQdk53
+oaqUf3NoKeSIYWSYDUVL/8a/R0OakLxGcf0vDti7ZWqFk/LzBZyj1Ehak5euVkC+
+SykQet9shUCpvBTQV/lFLVNvYXIZzD7R7yNCJxacQombRUo1zviVs7o5gA2sbTZm
+0k5GWNr/kttjD0e+mQy7xKYme97p3BiHAgwke+NXbJB0e+pW/kvZIzQEyGoAlk5F
+C6zNmh/2AL8vpUrAc0IL
+=JgNN
 -----END PGP SIGNATURE-----
diff --git a/sec-policy/selinux-sysstat/selinux-sysstat-2.20140311-r5.ebuild b/sec-policy/selinux-sysstat/selinux-sysstat-2.20140311-r5.ebuild
new file mode 100644
index 000000000000..00b4249ac9e9
--- /dev/null
+++ b/sec-policy/selinux-sysstat/selinux-sysstat-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-sysstat/selinux-sysstat-2.20140311-r5.ebuild,v 1.1 2014/08/09 19:34:24 swift Exp $
+EAPI="5"
+
+IUSE=""
+MODS="sysstat"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for sysstat"
+
+KEYWORDS="~amd64 ~x86"
diff --git a/sec-policy/selinux-tcpd/ChangeLog b/sec-policy/selinux-tcpd/ChangeLog
index 1703c2e08f36..bf2c15a806db 100644
--- a/sec-policy/selinux-tcpd/ChangeLog
+++ b/sec-policy/selinux-tcpd/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sec-policy/selinux-tcpd
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-tcpd/ChangeLog,v 1.51 2014/08/08 18:49:39 swift Exp $
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-tcpd/ChangeLog,v 1.52 2014/08/09 19:34:49 swift Exp $
+
+*selinux-tcpd-2.20140311-r5 (09 Aug 2014)
+
+  09 Aug 2014; Sven Vermeulen <swift@gentoo.org>
+  +selinux-tcpd-2.20140311-r5.ebuild:
+  Bump towards r5 (fixes duplicate context for hiawatha)
 
   08 Aug 2014; Sven Vermeulen <swift@gentoo.org> selinux-tcpd-9999.ebuild:
   Make 9999 ebuilds EAPI=5 and transform to make master for version bumps
diff --git a/sec-policy/selinux-tcpd/Manifest b/sec-policy/selinux-tcpd/Manifest
index bffebf457734..5891e2267a34 100644
--- a/sec-policy/selinux-tcpd/Manifest
+++ b/sec-policy/selinux-tcpd/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-tcpd-2.20140311-r1.ebuild 445 SHA256 b58b6e8dd11feb75b59b76a8840aea380dcc505b9126850682b56fdf57e846ca SHA512 9d86805d5381389cf42a6224f0ea235bc437515c47b39199dedb9fbba12f5c586cb8d007e65e8b9d4c8e4923ddf79bd8ffb7ac8116f5b18d95e7cb2c59084bea WHIRLPOOL 53d8e48e323cc02a7b52215d573bcea99f76768137d78d32519b8501fb00f8add8ff13ab87c98af8f318248a3faac38be961cab33a49feae0a7a7d43c605b85e
 EBUILD selinux-tcpd-2.20140311-r2.ebuild 445 SHA256 b506339a5d2f137a1a5e33f3e8f28e00aa4a2a88b5ad80b9b00cb1e5fe296ae0 SHA512 555d5bf65007146197377ac36beb4d6521a0c8cd65be9625c499e4fbcb4262d5c955ec476f4fe149c69dc028f0a2f580341ea1a93e934e52851be28c89863272 WHIRLPOOL 0a860065e12f5ee523a65f104b3bc7b9490809383190c6358fe4aaeec57727a7b6c9672e17331c1dd31aaea149ae5a8436cf40ff8aa2dfba407c1c74b8c99b8d
 EBUILD selinux-tcpd-2.20140311-r3.ebuild 445 SHA256 c6910779796928112cef2ffdfb5d6335752efc938e4b38356a0ab6a1099f0130 SHA512 c839472ba7bb9917134279eef2c7c7eb95c91de852cd14f7c37632f73ecf911088edfe20be621cc7cbb351cda78c0ff423c5ef4f1f7b374abb46a7925ace8dcf WHIRLPOOL c57ea53434b2efc0880b2328703d11ff2e5f1e4f79768afa928453076296ad43fd208e75671eb64e75ee2e9c369f57d7cc1b0f0daefc44f100230f9ef1d75ce0
 EBUILD selinux-tcpd-2.20140311-r4.ebuild 447 SHA256 c987fcf371e81331f8c00761b6f4dce8ed2a3afa8553d5c066239f5905fcbe34 SHA512 e2ffcac0ca2c85ae5af9c748324605a5ceb467b3daf0e182e9bee394091969e37b32fe44976955c48a04005b0c1c7160106c8b8df1b3fcf3b7edbc4505c9fd1d WHIRLPOOL 6ed65a4af62d6a92e594ee429e0da0fb7002ffca977b4e55b7850be61e9f3286dc9fac4fd558484e2a24c2b84f4e3aa3f447aea0ddfec8c4d151feacb7846e19
+EBUILD selinux-tcpd-2.20140311-r5.ebuild 423 SHA256 394f7de231b0c640fab1907797b17be246773333a2e75906bccdce5acd9c8d31 SHA512 2f924a86c2b646aa122bf60b93ad2a611394df8609462bfa4f8fd07207f7dd2361f50efe4193e079235033da0279788f1a66adcd005b5ffab0dd4b00a66e681a WHIRLPOOL b902befa3ea242df38dfe4f216a3cae0b398966a1d0970462f963fbe35e5644f362ad0a992ac26261d828910a155633118adde17fdd38a9f575fcc0bad0e9fe1
 EBUILD selinux-tcpd-9999.ebuild 403 SHA256 8e833da80b139b4a49c35d366c20525a1d6443e5481b901bb83464d27df0e25d SHA512 062479c55b047afd3e8799c45a2c4b044e66bc2f86d0fddf74b3e54c29df2b167612fea83a53e59be2785e3471ff9a11d356b0a1a4e92a00ceda9467ea5a7404 WHIRLPOOL 4b7c3adfa3f7f6be709568cf38f3ee1d9bda13036734c517385cc4f581520f8a79e7d8de5cf5cb5604b19a7275ffe7b423e738f21580dbbef77fddd9859807d8
-MISC ChangeLog 7837 SHA256 c000e503378b665c6473c1ee1583449738a26a5566d88549cc164ee8dd822237 SHA512 cf5a7a5c3e58e82dc71056117f88f69a1c21e47d90a0cc40d0dc73381296df539cd6f601dd43ea6bbb85fa5737fb3f3d94242a4507bfc0cf9df0830573bc5fc1 WHIRLPOOL b1eae8931fb3e3e984bb227786385852838db80c6866d05f8ac53a46f151ac65de7263438f7af58f72daf7bab27cb9d15503f3c4b51e87e91c234c9eb235da48
+MISC ChangeLog 8025 SHA256 e2c26b91c46908c454711cea3f2163a89e1f74594ec4895b1bad05c7a965915d SHA512 eb9cb7ec930a3eee5e84f6553e3f21f69466a01ab7428ec90ec9f1f3899f3f8fcdfcf5c05a2aa1168a1105a393145c52df94dc3e5614c512694cb616b13c7f35 WHIRLPOOL da1558ec8188aeb1fae782d0b10f705293a7819c18750dc91c6c0972a738606a9b3840325e676458cda0c3d10f183e2cbc6aac3d147557290111b1c51ec08a1c
 MISC metadata.xml 228 SHA256 b2f77c726a0ab7e5bd4fcd7a14b708b82e8cf1692a0a11ebbcfedbd2a24b75b3 SHA512 c692a0b090362d124eab4bb78ec4fd3da10682539e9942bf612834880023a2d1d82bb38f9e615aff877b32cc407215ce9eaa9e0e70c55e78a5a6b72e81a2d580 WHIRLPOOL c973953d591cb515f5a55d1eb2067a2cadea09321d623ed45573247b2bedfaf7e439d4ec12f572ec61c07fe9611fc115ae842cc1b715501be0b6677281f2cc99
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0
 
-iQIcBAEBCAAGBQJT5RyfAAoJEC7dUkA7aK9H9v4P/R6KO5GueVKG4J3AZYfoMGJY
-7zM2RtM8vMHtYECza1h5FftgGp3na6ipBINTg/Ub6T65hRihZrKwLTO9AM4XGrpu
-JE/Ody5US+fTcbVerAHrRrRm9/GFnD/h38jIPcmbD2ugDAOpUj8OImpsS0hwI735
-U+Zb50X/oIgGnMqD8Xg8guhuuE1F7Pn6fRGy5M9mkoVqoXS1ni1+WSYKRKYSLyaT
-5oxpOVId7o4ZxkPfyHilsM5o7xuHExH7H2tjqdAZPNxCfrGrExMc40CdE02ek9Rg
-aLloQ1QB0Pr4JLiIS1nz6SC9b+99zCx9hHWB2gGH8KtshIO1JpzI/6cWvrxkXwaa
-sh2EnnUXA6TvyzKZcBm/jw0ZP/mGunGnLUkrUnW4Krj1tg54q7dqEHjkAFEWlCwY
-s8q7iKLusMNVMYsD9FLWbJyvGbIR+zc/b29ESjEjuX4YyViaseH6MsUHR/mdMyKo
-cy226egf6lXrF4Z1NiUbekTNH7UFITt23q3Gtm02vIFg9bBZeYnVx70V74FO9kMZ
-0IqghkXAzpGy0d19CrmHjE6hLiLSSH8xcgOc2JosNMROl+p4F5jCJTq+LvNJsH9d
-77kbzROjNE2eZN9xipbKlDwKZSf0zM5XC2WR8lTR1uqidcXdaxG6oZaIHX4sBPKh
-bFgBhCnQtIkaU2c3zAn4
-=6rUb
+iQIcBAEBCAAGBQJT5nh1AAoJEC7dUkA7aK9Hb2kP/3ME/8RSslcUfrT9DLe3luY+
+hiXS+/kQD5D63OdV3f/OxD0TBl9t5m5HZk/PVr9pcdRXGiNTf42Rst7tBMhQdix2
+yShMtjWblnak0d5r24py5mR5e/BpFHbTWSr+lifDy5FmuwOCSi6LuBbYVXtBGD9y
+8VAhoNHDsLcI+rzNHiIseo73Qa3auYCWfHxunS/o8MjFjXx+8nGro3HVCfP68mC2
+RFFUn2Lw9uxwW8BeR9IxWZmXIqEZqY9Ec4a5fI3d/RL6rHKIMYEGbp+X+mE61cGc
+2B0JCb+wYqcbs/glOpsF5S2w9RJ/otYKMaA0/++anF30IcRrZXhy4pTW6JZs1+dC
+a/WTbGnzGAxNZ7FvcWOqfTWYJsGL4UeW+L04DeJ/xI1VCC0ymHmNRfedZy/13M7o
+hTLZJWfyfLlpuJCNy53+toNabyo6RSPZ9J7NVOa9JKStdtwvATHuGPT64JG8U8SO
+Ok3yPfVszVkbgCmqJAkJWA/sb428TR8nJeapH4zl9Mw+k34nE8Y+gxuPtU5ITnki
+yd85UMRZ6Fk3y+h8EqmKhv7WNvZeMtJ/axaSfiiSQwd/0VCr/P7aNJHcbkFyPPOD
+Wr7EyASkNvnlt9GhHSNlDwGzd9oi6GPsXkUsdjM4lLlXSPir5YEMj/ZIs4nUsYBo
+cK5w+3EM4gg2culhHRj8
+=hexW
 -----END PGP SIGNATURE-----
diff --git a/sec-policy/selinux-tcpd/selinux-tcpd-2.20140311-r5.ebuild b/sec-policy/selinux-tcpd/selinux-tcpd-2.20140311-r5.ebuild
new file mode 100644
index 000000000000..27db7e593978
--- /dev/null
+++ b/sec-policy/selinux-tcpd/selinux-tcpd-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-tcpd/selinux-tcpd-2.20140311-r5.ebuild,v 1.1 2014/08/09 19:34:49 swift Exp $
+EAPI="5"
+
+IUSE=""
+MODS="tcpd"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for tcpd"
+
+KEYWORDS="~amd64 ~x86"
+DEPEND="${DEPEND}
+	sec-policy/selinux-inetd
+"
+RDEPEND="${DEPEND}"
diff --git a/sec-policy/selinux-tcsd/ChangeLog b/sec-policy/selinux-tcsd/ChangeLog
index 47757c2cc0e0..6efba3f2bc31 100644
--- a/sec-policy/selinux-tcsd/ChangeLog
+++ b/sec-policy/selinux-tcsd/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sec-policy/selinux-tcsd
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-tcsd/ChangeLog,v 1.4 2014/08/08 18:50:01 swift Exp $
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-tcsd/ChangeLog,v 1.5 2014/08/09 19:34:26 swift Exp $
+
+*selinux-tcsd-2.20140311-r5 (09 Aug 2014)
+
+  09 Aug 2014; Sven Vermeulen <swift@gentoo.org>
+  +selinux-tcsd-2.20140311-r5.ebuild:
+  Bump towards r5 (fixes duplicate context for hiawatha)
 
   08 Aug 2014; Sven Vermeulen <swift@gentoo.org> selinux-tcsd-9999.ebuild:
   Make 9999 ebuilds EAPI=5 and transform to make master for version bumps
diff --git a/sec-policy/selinux-tcsd/Manifest b/sec-policy/selinux-tcsd/Manifest
index 4034d204bace..3cc75cf762be 100644
--- a/sec-policy/selinux-tcsd/Manifest
+++ b/sec-policy/selinux-tcsd/Manifest
@@ -4,27 +4,29 @@ Hash: SHA256
 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-tcsd-2.20140311-r2.ebuild 379 SHA256 6378a369422b0e78ce8e082760969f5aa7b913f0f1634cbf70b025ada353c8a0 SHA512 7aa4da1b1013f9e92614632836209013a4af04d6c23fb6e8418157c7662ddeadd30b82cd6f212b6dab82c95c18388ed4ab374151308d16d5c1b4d29b3d8aa501 WHIRLPOOL f1585bed939d584538cd78afb6c3e7f9cce44f7ae3153096ff8e26bc88c1dded7f06bcc8fb0520cf6f6713a46719d5ea98b1f3b260da512780cc0674dcdda1e5
 EBUILD selinux-tcsd-2.20140311-r3.ebuild 379 SHA256 ed9f4042dd32617b0c1d483b39f85838662d829977ac35c00aaa9b55529cb52e SHA512 0fa9a408e138dd08bdddba8691fd90371f64fad59704998eabb478dddf3dfd93e3e1c5f7b1c6c1cca0d35fb17f048051b809f0b158bd0aceb60badd32e793550 WHIRLPOOL dc742bba88faa217fec88a58b0f2a7cbc7a66d6fc320ebfbe69e0ab11c4faf77e49016092d48a288b0f7a9a0d303e0990807464b11f8961e28a03cf8e59672c2
 EBUILD selinux-tcsd-2.20140311-r4.ebuild 381 SHA256 4e25cf913ab06ef97fe971a160df4ce0fe63aa6243bc5772259dda276d4e332a SHA512 c835261b5455aff8a1c4fb95539918d70f3f7054e10d12aab0ddd3b38ff680ccc2b93bde57a9b83c8141947388dbb0bf5b121ea95460a5900ae5a1558bcc1ff0 WHIRLPOOL 7398c7c47556bcb9b7b991c4cee41d745f7344ecc208c59370541c35675dc2210988280e500ca97b8e283d801ca020ed5b2906dcb2104e4265b49cc1554cc983
+EBUILD selinux-tcsd-2.20140311-r5.ebuild 357 SHA256 156d16e8e1e11974dd8588f4645792849641ec9e574eff9975b168aa69bde686 SHA512 c50a86acf49999b6891d4cc234091fb40db229130bcdf8d93a0b63724937c2aebbb6a85c295887287ab515d9af21cbb8137333220a7e21eb78992d3c05b5325d WHIRLPOOL 9675c1f6899502a17028d1f9b2d42d8b545b3038c6c6dafed999d576ca30a574e46a89a7fd5a31de512785b6154620c648a8b967607eb33e9b321f19afdabfc1
 EBUILD selinux-tcsd-9999.ebuild 337 SHA256 c064058b3498ec1c2e7ee23127745c58642cd9f5aaa28af0dbdabdd45fa23e66 SHA512 15823a1979920236595e55bea4d81e9609e3e64f2afa771b964fe5969adb0c3b7e94e5bea531dc021c8d3339066f96072c781d722ab9c96f079ee7f9289a5577 WHIRLPOOL abcd90c107781352485ec981631a975a516867198b1bbe7fc74728f0565f595093a93767f18809bc6cc4771400a6efbca545443e9bd2c5382a7a1651ef4f3fe6
-MISC ChangeLog 1036 SHA256 75ddfe31668c1df061cb34deb76f7687ac1fc807f04df394ccc625044b285f82 SHA512 ad1944a1a872eeaec5f02d1bf6c461cafb0847e5425c58235ac5f21544291c00c2a1e6436d2cb418ea6c35c742adf11b4a985fe51323a9fbbc5d84ee267eaafe WHIRLPOOL b841fe781cd1064f1ba1a00d34d7b73037f191329884fa65076e35f99a7e3877c683a88dc9189bfb058f956cdf8722a6ddbc5ff481d7269b00ff83e617f5607a
+MISC ChangeLog 1224 SHA256 f6abf00769c9d5e20cb118800e90c5fcc552e368fdb148988ef23cb7613fef97 SHA512 d9a39ba696e05c5b50b69a3c7c565be9f73ca2d1ff79aa9d2477f80e2016fce33a46133990199fbca57958b78c3c886ce939f80e18076dc3f2d8c1067e8e62a1 WHIRLPOOL 4ee5e7ce7bd18d228455e55e28e06b5b13d12752f08dbc950435ff968da94b1f380ba145f3ff20e1799665ceadd32da1377d7f5182dc72c377f1024c79b79be8
 MISC metadata.xml 228 SHA256 b9918a47f1d9bc94745a28b108fe205d00f518d26e8c232d01f02cecbdc999b5 SHA512 6d8c20e16a353a05e2bc19dd3eb7c21672621784210bf41344aa0bd61ba8f0731ad2f392a368a61ec7bafa3b9b04cac14520f9e398db7641c2cd9898a09a3cff WHIRLPOOL 1c488fbaec99f076f197b17c430a8dfb964d1f2d3b3476b980d775706ac7590800cd8fe214134a78754bbdd6b425ba214a33e85d372a15d1d23fcceba267e070
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0
 
-iQIcBAEBCAAGBQJT5RygAAoJEC7dUkA7aK9H3UQP/1ktZBfLt4WFFHFTZc+CA+Aa
-l9yRgEMjf+5+iNgF8zS1nR6ru0tKgOa9WklfY34MMWLxXsxYPZhFKBN7+eLy0Hs4
-5upPi+0NUQCXXlHDzSwrGtPRprKL+m+D+XLHc1AkQP+7V41QT0T04QqhhRKutSSS
-6fgBo25pRKEfGUYwUDhGAGxd+gXcqwVonxLBoCcrMAoAiTzkwvLhLvGx0Y3UKt2o
-i9AhUfOc5GjZfMib0xnHS/7RbM5Wu+jf9zuf352LMgWVl0rGEkiBEP8EttLWQ3gZ
-3L8KAyZcsN1SuLKL5GYmKfS/CBW4RRCgTQtfJNZLg66Ttm9xKsWRxdyCUW2VMCZA
-eqxIStTCvPf/5FndDgUuyrEqZgKoYfsyJeILjAmZHpkH8Y37TvOFrN7gLdpwRU8Q
-DeG+yG44MAZp2ppICqcXOsMsAbhbDWrro+UA83Wc3lLshXquRpwSD5nDYGYLMp+R
-h7UsTC0vWCIZlDHzvmoDp+FtyqQiRLx1CMxRAXUgCil93vaAifNlTo2mGSr2OzJ9
-XpIVc+b3sZo32KoAatQa9kb1wGYgxiour8l9j6sCLmKyXRQxAeRctbdhYr4BM2OD
-8uu9zDZyFKkJCVDGYGLjOqs72k3Du268eDwTdegxg/gIb+YgkbQYodPxkg9++qoP
-Gt/me/MLr3sRRgHWK/hR
-=FrI+
+iQIcBAEBCAAGBQJT5nh1AAoJEC7dUkA7aK9H0a0QAIM3X5dRZWBjI4dc1PMpUrvy
+mKORW6jOn5BV6vbLHx0Z4VJsJc58cWpaIIRz7HJ4/is/dmHmf+BV5GbR4BvxhMt9
+3d5rwejbiVfUOGQKe1xWY0KpUDZMvaJmNss+4BbzEb72uljQW8BBgyNooGI5YHEv
+r8ogJGEudqH1ibRDiBzQu8COwV3aeAq0HYR9vdOXUKvzGRvMTQPe6g/aPgjJ/LsT
+1N92l91t5OrKlg+RXtq7HvRA1Ip297mfYxvINy/9x0hXeUMi6b6Og5HZ1tsX7f/Q
+INtzcN1EsAlX+Gb6HRKoQZnMrJpQd6mnEi/xG6cJQ13l91rbZyk3zGAhn+6QUpK7
+5mlKH9EcMsQzFeHuCxEpkmTnF+g/+LJZF35/Pb0ZjbmX5YHU1weQ8FJ9WMVmy3b6
+NR69A6OZW4ir04wZfjvFDkm6mWkfhH+7ara1LJ6awbt5WYlxile2LLwwPqV5Em1i
+gy+y6JpTqE+cCRo20pS0MPQjHR5piTecAbxnFAgadb545Yycx5DsWlMK+gwT+5M+
+npr6eHU9+wN9aaCnF0GbDfXaKTBQ0X8JLHdtGMt6udLRveeWEHLGUWqD7Pa681X7
+vVc2VUYFz541101tkYdDQ5MHzyOzuCPj1+PQ/xk3DBoh9efxNvSyr0VWUorTkIVW
+sZXbWyOWZEkvSaCbaMqJ
+=l3rD
 -----END PGP SIGNATURE-----
diff --git a/sec-policy/selinux-tcsd/selinux-tcsd-2.20140311-r5.ebuild b/sec-policy/selinux-tcsd/selinux-tcsd-2.20140311-r5.ebuild
new file mode 100644
index 000000000000..68b258cd11c5
--- /dev/null
+++ b/sec-policy/selinux-tcsd/selinux-tcsd-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-tcsd/selinux-tcsd-2.20140311-r5.ebuild,v 1.1 2014/08/09 19:34:26 swift Exp $
+EAPI="5"
+
+IUSE=""
+MODS="tcsd"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for tcsd"
+
+KEYWORDS="~amd64 ~x86"
diff --git a/sec-policy/selinux-telnet/ChangeLog b/sec-policy/selinux-telnet/ChangeLog
index c848bd332253..e51c6cde3eaa 100644
--- a/sec-policy/selinux-telnet/ChangeLog
+++ b/sec-policy/selinux-telnet/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sec-policy/selinux-telnet
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-telnet/ChangeLog,v 1.45 2014/08/08 18:50:07 swift Exp $
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-telnet/ChangeLog,v 1.46 2014/08/09 19:34:33 swift Exp $
+
+*selinux-telnet-2.20140311-r5 (09 Aug 2014)
+
+  09 Aug 2014; Sven Vermeulen <swift@gentoo.org>
+  +selinux-telnet-2.20140311-r5.ebuild:
+  Bump towards r5 (fixes duplicate context for hiawatha)
 
   08 Aug 2014; Sven Vermeulen <swift@gentoo.org> selinux-telnet-9999.ebuild:
   Make 9999 ebuilds EAPI=5 and transform to make master for version bumps
diff --git a/sec-policy/selinux-telnet/Manifest b/sec-policy/selinux-telnet/Manifest
index 14b6e072f0a3..ec3d363df77e 100644
--- a/sec-policy/selinux-telnet/Manifest
+++ b/sec-policy/selinux-telnet/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-telnet-2.20140311-r1.ebuild 485 SHA256 862cc6f89d5a67fa2f2e2d76f9e6a5eb00f2f7b677f33cdd889f4ea296b0b43e SHA512 a50f5d079e5038ded0cf4a6242b8349ce4fe0527a7661a30176ead9ab7d00d4d37a40cd49f234486efa12fbe1ef97fbebec7804c0ffe5fd3a2eb7bbd1de64652 WHIRLPOOL 414e1eeae0b22370805d7ebab5c4f4dcc8fcecedb467bdb71bb976a23b9e2e0469d49793badf7b972ed825b79e61439d0130d210224abee55ee6c2deda6a2ced
 EBUILD selinux-telnet-2.20140311-r2.ebuild 485 SHA256 78e6e6ee8c7cfba83c7c8b80ddca9554d9787457700b3e0f26735a8b55b67dc0 SHA512 20b4e6d943d7233129d9946daac97accc067e15c629c379cb72380dc060c42c3d8c46dc01f23763bd9ab3c47df54046e8e089ab5ee611b8e88145fc419855d80 WHIRLPOOL 174a493aa75b9659be59088dad37598eefa184e3871c8749e2c55f80462e5d99f3a214d6106a42bbea6335a4f9da25aef555cf7a57290cee175a1e0f6bcf899b
 EBUILD selinux-telnet-2.20140311-r3.ebuild 485 SHA256 826742736c86f21be46688db0a36d948d0a26ae7b58ec01166d73fb57ac952db SHA512 dcc225273b8f990333eb05963a0f3bc1cf1a80455086e8cdec4bdac3e732bdce5529eb94b47ca1f9ae7b9ded9a78c6ea843c8bb53f7f3ff66b209e8ff01bad28 WHIRLPOOL bd590900948c5fdbbbc87dd47a366e9740f51f491480acd5e871ac6382151b88455875a2df2a55fd599ca79ed5a7bf665e18d0cc59a8e61c96c62096cba01e48
 EBUILD selinux-telnet-2.20140311-r4.ebuild 487 SHA256 3ddbe82fad277d89a4b46af4084cd33dac46320836c1e05a3eac141d4669f425 SHA512 ae2a953b3d5069e45c810f880984712b78a1b4f05e1e20603104b30585507a5d95484576f8268dff4eb95b59c7809312b9a94bd8d1ac46168c0db25c789ba50e WHIRLPOOL 7b6ee9accbd41ef117b5457a7f46c28b2357f1ce7f86c7ff7a9586db8a1e2c7a18c085b1a86ec99126f26a46fbec7aa47ad97d75fbf6bee981653eb819595553
+EBUILD selinux-telnet-2.20140311-r5.ebuild 437 SHA256 78e0139eb57b35cdb288db6e17be21154057186fd99c40d881be35aa0e79184a SHA512 0c2d67d167e5c333494dd0d1a37a480106725dad74e1410e1976afa6ac91323a9b10a9b16435933115ba98dadc30cad51d21d52d421f49203b00ae9abfd38c7c WHIRLPOOL 1e44037d184caa80b2dbb6e46778ebaec8814266c4dd6f5dca8204c0bd3129c2507d4a10f75bdd6c4bed01b198135c847d9dced10b56efec0a683e32c958e87e
 EBUILD selinux-telnet-9999.ebuild 417 SHA256 07a7643c222c0b8bff5f773ee43eb93b316d7c46e47ca1aabcde2240265ba6f8 SHA512 a35983de99824b3f219ac8c3513b34476fcd9d66b5fd518c51617805ab03967362dc022b09531e10f66389fbbec3d45a121a362a94d1f7e64e8b0bf197683144 WHIRLPOOL f7fabc13cbb3736c53422d033b90e4c192449fcc02d4dd75f679c2c0bdc0cde302955448b51a922ece1c7425fed9d976ff7155a58a4660ccdfcb5ab1b505f5e9
-MISC ChangeLog 6908 SHA256 76d3ca3eb941f71bee5103bde689c16c4ea52c43475e66c0163d1f35ffbfd1ea SHA512 0a1b095f0e812e11bee8994adc945f171fd10fd1fa5c0cb465e230574042a05fcf80d961e5a35ccdcfc351a7132292087aa7b427404286332b71cd81c6a3279c WHIRLPOOL e2c1b5b8df0670794b79ed6587eaada092dad6fc7ce1ba315ac0f685487a69e5426c3a344f3cce203ca26d4dabf816ebf99f8d971459328ad6f6e33c2c467732
+MISC ChangeLog 7100 SHA256 a9780b8a268763e16a33c2f39501acbc80abca7900507e564028c182e06b8406 SHA512 ca007152d5cf0ce0498587abab0e5b21f1251f40b691a16505dd387089066c50d8a072123e1c9de1329a96e0e497baee2bf091eab8d3c5c7d51e45909caeed13 WHIRLPOOL 33261671cc01acdb35551f17d9133d20d2af0d0272ef5e7e362a0f56bb4d2e5872a6b7333275db87aad2086612cb796f7bfd1e31e02ec0a227f2608cbc6629d2
 MISC metadata.xml 230 SHA256 bdb78bf1fb0f2f777712d340da70ca82a419fac58ce160ac69a230a2456e4b62 SHA512 bf0269c91d3d9f549d154c3abedb473318dbcf2fb70b49a6b41e86a54bc51991eaf1bd8b9687d20ca47d1bf0c8eb4ba4282392d4140a023fc61098104753fac4 WHIRLPOOL d0e8f2f8f446949b63e90cbf7073b6a0d47361966ac96ee5ded4381be4d2b0c0598c761727f08411985570bb009c54be24a7b3185eaf9ad358668b14301b8d7c
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0
 
-iQIcBAEBCAAGBQJT5RygAAoJEC7dUkA7aK9H3k0P+QGB5OH20FbXVZxCesqIzJ66
-j7mfp4ajo6YTegnGGj0BZsqiuyjuEsFSlhAfKpzXqKyTaGIwrX1ZzAtgErjVW5Io
-yjiDQbTmy1LFlwX5Epi4uP89FveiF/SHdFfX62cyutvOYnCGSLLaFEU5ePtdMxhd
-WDYpLb5x2mcfkheKObIMNrSP40kN9HIQKYuzrijbpBqnPjMZkBzkByG90cQ3uYn0
-ZhBsUzSgnPDVISIzrpsA0cHrq6qTc/qMr4DVF10r8VLwJ7beGMzfZRYz8XzTyGdX
-EpY/vptd1XqkMGlm0Lc45uuT6PsI+286/Yt1jUGfF6NeevV8nI7Ye3hdm3oITuYA
-9TJzpxK3daz1Shp3JZ3tB+NMBLo6nbS+mCqGw0Dcbof1Qxxf2qMefnn8oHcaWVdk
-31MjUg872EVxpBd8YnaTo10q1tkIyLnk1mezHrUp2bVJqXs9yoPyjCCiOgxgrSf/
-hTPdRz93cwGEWeiKdl+p/BJrKZTWHuRiWAeehJNI1LBaQ6HA8g3OJqcXG7ex2r2A
-vhxXCfflKOEJQ+I9etg+PaWKyJn1PiRFr1n4BVjSfStshR0dHx0Oe506Px9JSq+D
-nd9qioub/Zpw7SZnsum0d5xzAb6OGcf7ygLALwmX6kyE9vThU5InuG3OoZbn7I7W
-owy5anCisDuVmSF+HfZP
-=Amwv
+iQIcBAEBCAAGBQJT5nh1AAoJEC7dUkA7aK9Hv9EP/03m96ocHXTkbfJI4ue3HVOd
+Bc1ddpJY2L+8r2//0JCzDmk5WCMulxcRyGOqbqWr4g6cE28L/a18ZKPEtPAaD4JB
+SFDAp56zz29R0FdwdhAMkgNTd4qYTZ6dCfdrnhUgviZa2MMgOlZkD4gi3XnI/GLz
+60xOvbJvVuY2Bgf1h1sN/PedTHn6xTQ593dK/pSOjqN4E+i8z5G1jzLlQOflHb+x
+0gg+Ytcsq0RSmvtBjDguKNWvQFDUGzOI6ZpUtAqI3f898YL0zSQvuNYDpkYr5uwT
+ZyQaU63pLziKCjQsQMJkUZuCuAft8evAnswktSGSWT6pqcl37x5wEoIjSQekE1f3
+pZHsn9ziIFKQazT3+1gy5bh2vuFVoT2aOwUfLtgE4oYb5FFBQjj6OCaupW2qbkPW
+CbF1YCOPPQteTfq9/Uy/SFyq9tNr9mS8nDuBR8l6aUSQI3lWwA06MX8B/JooLVod
+aVRhEq5drSRHvKFqGjBr/FZyReN+e2PtV9PS/Qng3UXUW8zDD00QTdYmvVAi7S7N
+QOFdsDxeC/gKVYBpWF2uSyrjtsNI6DFoH2/aqo4SAK2A/v4EXg1Tt1nZ5jUp2gcQ
+4LrTEscnBwZ2BMWeeJTujm5QxSoy+3+CIbipH9J2n/1xwgbrCnLt9yJjztgi2AFE
+8+vXCg0lzY7oTjXkcJP0
+=GVH5
 -----END PGP SIGNATURE-----
diff --git a/sec-policy/selinux-telnet/selinux-telnet-2.20140311-r5.ebuild b/sec-policy/selinux-telnet/selinux-telnet-2.20140311-r5.ebuild
new file mode 100644
index 000000000000..c9162192d2dd
--- /dev/null
+++ b/sec-policy/selinux-telnet/selinux-telnet-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-telnet/selinux-telnet-2.20140311-r5.ebuild,v 1.1 2014/08/09 19:34:33 swift Exp $
+EAPI="5"
+
+IUSE=""
+MODS="telnet"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for telnet"
+
+KEYWORDS="~amd64 ~x86"
+DEPEND="${DEPEND}
+	sec-policy/selinux-remotelogin
+"
+RDEPEND="${DEPEND}"
diff --git a/sec-policy/selinux-tftp/ChangeLog b/sec-policy/selinux-tftp/ChangeLog
index abf961619cc8..ee7db73b6bd3 100644
--- a/sec-policy/selinux-tftp/ChangeLog
+++ b/sec-policy/selinux-tftp/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sec-policy/selinux-tftp
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-tftp/ChangeLog,v 1.39 2014/08/08 18:50:05 swift Exp $
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-tftp/ChangeLog,v 1.40 2014/08/09 19:34:40 swift Exp $
+
+*selinux-tftp-2.20140311-r5 (09 Aug 2014)
+
+  09 Aug 2014; Sven Vermeulen <swift@gentoo.org>
+  +selinux-tftp-2.20140311-r5.ebuild:
+  Bump towards r5 (fixes duplicate context for hiawatha)
 
   08 Aug 2014; Sven Vermeulen <swift@gentoo.org> selinux-tftp-9999.ebuild:
   Make 9999 ebuilds EAPI=5 and transform to make master for version bumps
diff --git a/sec-policy/selinux-tftp/Manifest b/sec-policy/selinux-tftp/Manifest
index 5ca7eb4f327a..0c4d07093d3d 100644
--- a/sec-policy/selinux-tftp/Manifest
+++ b/sec-policy/selinux-tftp/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-tftp-2.20140311-r1.ebuild 379 SHA256 f4974fd2e78a5ba69bf04fdfc0d907c4fed10302b558d9dd2c9696378a538053 SHA512 510a5f89e5eb2d811345dc43dbb6c99423db66d750cfe2d98b1e38d28f237198c9d3c35e98bfa308eec1c61c2b1a225f9585ec64ebfecb2dabf47ad062408462 WHIRLPOOL af29e170aba24f8049ce87dc70b13ce7172b0f188073c28c5af7da3441ebe4c8138095d5731c5dd69f12d88e58c3b968e461b1d1ee2a95f5a112894a0065465f
 EBUILD selinux-tftp-2.20140311-r2.ebuild 379 SHA256 72c1475e67ace72eba1e2d39020225268c6dc3811b154a89b0389c05a2013b83 SHA512 5539d8829351c22e0fb6f8bbd197c86804547e20e21b5f041b9d627541080729f05ae12be40ebd1855f19995589ce6f9b859d454b492d60f4ea6197b5de2fa5a WHIRLPOOL 6c229b94d0acfe04614f4dbc68b6e4e5804574a26c617df2a1b7e7827b41021226decb5cb5ae0ad86c1b25078986b2d974b84c938c2fcb34ce2c0c54292475c6
 EBUILD selinux-tftp-2.20140311-r3.ebuild 379 SHA256 376675418a1ed142d070d58e9728612f760679d0062e56499fc8837015bc904f SHA512 fb839ce7feb27ffd15ba17d77ca23cba637a2e06f1933e3225b343d2f9934e838e19467556a0bc3a576ceaad3e7d65262ab305e06c765ff83fc767b1777acb41 WHIRLPOOL 0c293154494065f779d69c6f8fab8ba5c5fd7cb172f4e76c5899da5377cdf8d567dc3e175fb28b1a34887a7a6277ae7312d87276a1bddf833dad607b97d7f45c
 EBUILD selinux-tftp-2.20140311-r4.ebuild 381 SHA256 480df1884600848e3f1f558ae5fe8d14bba38aba7d5a9503dd90d39a0b166a24 SHA512 005c4da3c303a7597ef333ee7b6d4f71e0f79f0ecc3e4a12c502d04a6956574f21039cd086096e6b33fa1ccd205940ae3eb40befa3a95ab8059e425c04eff3b6 WHIRLPOOL 930b68e6ced43a854ae7dbc9fb7c1179fe7d068076bd00b43e755bae6bea1f906bef618016e3e2fa3e9232fd2e34560046d6a047c522bd8f59081bc2d0f219e0
+EBUILD selinux-tftp-2.20140311-r5.ebuild 357 SHA256 46b017454d6f32a14ec456b99b50f87a762e6fb0373e7d3243313f0ecc5d9d1c SHA512 c65ec756f46972fd3458d9d58279eab52c52474117119ee565aa6cbd01be96b6945871dbd1568a9b2727bdab97c4b0e322ddead1010103496e32a23e8d45cbe1 WHIRLPOOL 1035d4a84a88a489e9299252d8181403ec46a5ff088cdda5b9097509d721debb12a791670768b571c8ecb31249e82f2b3701514866706c35bd90242ee3915a17
 EBUILD selinux-tftp-9999.ebuild 337 SHA256 8624d824adb20a754e992b846c8cb5479cd4c4b83989bef261e84a27e6671a62 SHA512 0596a4a988fe7134d7ece00502d2e95fa566516d22758b7ea896ce1d4b6bb327d228f3aefc27d498b6472a042c3e43e721a9613a39d4414bf2a41b5fe906d896 WHIRLPOOL bedc5de56470324cdbd6bb5a420f54efe787e1f5b57c2d5573559de0e50b79f70f1b722751fd20a336f858895e6f137a0fe9ad5b0a75fbb7d29c5c31f219a2de
-MISC ChangeLog 6058 SHA256 d3d46e922809b01405881c02616e24100010e2d9f68fa7b05141b40b47ad101e SHA512 be7db55b1b99d7af641210d3a238c0fb1d7427147577c87d9b6d0f1f40551d64c12f8327819b02516aded9a66bd37cba3dcc2fa948cb8b619ce170afa1334d7e WHIRLPOOL 6b2a7b32f4e34a07efbf8e6310a4943d93cf5cfa36acc08df506419438b87f220fae10d8340b5a916351b809e93dce94cd95a6a60291f3a221cd9f689d9537a3
+MISC ChangeLog 6246 SHA256 fd0039f5fde9256a3b60c467f307a63da31057329e8e58b6f3c575115e0c510c SHA512 bc78f0f45864a1d212c4655d8e28dc91bcad44d48f7a9abd56389e3eb6779807d4e90604ea1591dabbe72364cb4a581117903599ae5ed70fe59fc5f66fe7458c WHIRLPOOL 1a36dfc4b99e3c822c0dc15675951398301d6ce92427d24f8cfb66b8dbbf7fc231a0a6fb8b370e0d774893e0e5efdec592e504eba8e1bb7dfeef703e6744ae9f
 MISC metadata.xml 228 SHA256 3e03eea5b5a75c123dc19dada7d457ed48dcd3dc3d6886d0e7d6542fe03c4064 SHA512 d12c84f25fe486521f94f375e1a0582870010b55ffb52b48943be759540eb7e9ca673b6ecb34ebb7961c9046f07d3579c4035ba45b2582e76ca3dc5289be7bf8 WHIRLPOOL bbb0d9fbe420a946123cd860a61191100bc178fed3b95cac302a737b885b8de3b9637dc73d23fe8c17f04c44348b0c01ccdd992df421fd79b624822e000fb6e2
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0
 
-iQIcBAEBCAAGBQJT5RygAAoJEC7dUkA7aK9H2YgP/iWdLYJTihvNXMWWlRGUWg/G
-j5CSA9hMaaxrkYaPTkcgSqBNbRFiblBepTdIdTvSO5Y6t5E7P1pA36/zR+C65Yeu
-dLSQtoSX0+5YPzD815AhKuBrqIPUc8DuDL4/eTrzYPEEGzFRNJ8a8sScWEElnqs1
-pVfGa8rY9GkVaI/B5riSB6ZTC4M0u7WiZDViksXIWOyaaii82YGMwiqD9BWqxSNf
-HKBcmcuDO/k35OalNYxTs5y18hVAi68UrCXG4xqfGjs5ZNjeyACS7JxvYPV6jOV/
-GUOMAQ5W575GGXKxnM/FPhTqD+FRL6p2hCMLnNXVpiI9/xb6neTnKtHIy1qyRGjN
-QQr+cwItsxaJ1CS4wjs0XCe+FHvbmWFPx3UsQWM2qJjjJAHqU7d2R8Ygb/2Jkc5/
-z/s2m6nRRkyspIwVrWoXXQAPgMSDjJJws2+pHI79joBt4R4CCHk9ENiiomZ6q1dP
-mHBvY3XNZCESr+UiAaONDEOoydpdaxO9oLifcf8WX7g13vcgMyqfWkqD+QYg3341
-6z9ycb1yuSVY/6ZL94ii2p6+RyCJuhauyh6/3uj5bnROd9C/EMUrpsldASzuQqA2
-dqt+e2KPjyqQVMpzbAqNHy97CpOkV1Sp9Y21CwbOJoHxbV32MwynLeu190Ig50W9
-bHkbjsIhMGR6VJ6j3UBw
-=IksD
+iQIcBAEBCAAGBQJT5nh2AAoJEC7dUkA7aK9HYHUP/3upxBKu/6kqqX0RYbe/BDTA
+FskZQSlc6tWUtm+v5kYjX9xT8SK8MfvRPdp2lcYh66CzV2XubeEZ0c+mqNTUmE+F
+EeuPsX1fV6rU+CE5nSd3A/6la4YKDRo3cRzAbavFS4gbY30wPLcvnLNyc+rUuPcz
+Zwg7yGXTVa6W0nLox4Jpk0AIRH2mFKVtDzWIZ2JN1A6PVVk8DHp6zgrCvXkIVcCv
+x37+iTGfPQntH/EE0LVbu0oyICqjv8KzTvZluB+88+izNf0Kte0sEPY0rAemEk8l
+DQ5aph/WoByYDVYiwfn+OJdiYyywAl+mqfbT/O/KGFVQi8I9vFJWBfe4kya2p2jc
+csUoOuTBXp16xdZUZz6hXePcbDT+E4RglBd+XQCpy2HXLeGn+eWqZY9R1xeQz2KZ
+TJkW2aJ8DU9INnGVwfs0KqR4n21oaDdQmf8RfEM6m5wk3Oz+tenCmeuXdH2OWSyL
+rFDEr/hePuWBuaUZPNrNZ4k9qGDA/FYtmY472D12UpR/XuupP+Na8aqk9XgGMeVZ
+q88q1wLOLj0vcBeWq9mp7kexFh8kESl1oZyFsZsPn1JmZ1mz8Yz51i+UncVhsDHk
+Aebglhj+PbPDEaRYYZnLMRjFfXFq3tsAIVMxQpRAN26AlxmsUPfU6s3txDGzrsRZ
+Lrq2GkfdKHqhSDLazrGa
+=x4hJ
 -----END PGP SIGNATURE-----
diff --git a/sec-policy/selinux-tftp/selinux-tftp-2.20140311-r5.ebuild b/sec-policy/selinux-tftp/selinux-tftp-2.20140311-r5.ebuild
new file mode 100644
index 000000000000..a6c923b11743
--- /dev/null
+++ b/sec-policy/selinux-tftp/selinux-tftp-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-tftp/selinux-tftp-2.20140311-r5.ebuild,v 1.1 2014/08/09 19:34:40 swift Exp $
+EAPI="5"
+
+IUSE=""
+MODS="tftp"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for tftp"
+
+KEYWORDS="~amd64 ~x86"
diff --git a/sec-policy/selinux-tgtd/ChangeLog b/sec-policy/selinux-tgtd/ChangeLog
index 4e1ab94e8947..af3ba4e989e2 100644
--- a/sec-policy/selinux-tgtd/ChangeLog
+++ b/sec-policy/selinux-tgtd/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sec-policy/selinux-tgtd
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-tgtd/ChangeLog,v 1.42 2014/08/08 18:49:28 swift Exp $
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-tgtd/ChangeLog,v 1.43 2014/08/09 19:34:43 swift Exp $
+
+*selinux-tgtd-2.20140311-r5 (09 Aug 2014)
+
+  09 Aug 2014; Sven Vermeulen <swift@gentoo.org>
+  +selinux-tgtd-2.20140311-r5.ebuild:
+  Bump towards r5 (fixes duplicate context for hiawatha)
 
   08 Aug 2014; Sven Vermeulen <swift@gentoo.org> selinux-tgtd-9999.ebuild:
   Make 9999 ebuilds EAPI=5 and transform to make master for version bumps
diff --git a/sec-policy/selinux-tgtd/Manifest b/sec-policy/selinux-tgtd/Manifest
index 38eb527e10cc..859537f81351 100644
--- a/sec-policy/selinux-tgtd/Manifest
+++ b/sec-policy/selinux-tgtd/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-tgtd-2.20140311-r1.ebuild 379 SHA256 f5d9c4aa25b4cb69b6e082a4c3aecddf55b35dc86cb2895a8cfc6ed978053e3d SHA512 99f29d5383fc17882b187e52bed99bab9a44387c3e94a7b34206cc21896b5ffc561c50922f87b9db21a607540e18ac5df7b67fa7b9875b2057450e88bfd54a09 WHIRLPOOL d7499fdbfe6c1662dccbf1f6219f55a6fff8c1effcb7ac9fb7f24b04f73b7ecf010a172d20b41a9d50390554e4b4a981cc86fe80aa5a5622779fa6c4f02e3f07
 EBUILD selinux-tgtd-2.20140311-r2.ebuild 379 SHA256 dbf53c58209fe72942878295530ecda56b0a55e72c07a42a5f0ba2609ce73a12 SHA512 6c09f4280a5393a39512443b0d668e7f94766af9d461ee29cfea6e99e466dda5ef7b8b2375133c61ac352a061d4e1c5d144705a766533e9ff1004a72043d0687 WHIRLPOOL 3f93203530db3c5a5d52317e39fb26303473c19eb040da404a7c0ddb446f01b01d444b720313dec266586af00049250fc636b30fd0f9a30227c918a26b9677cd
 EBUILD selinux-tgtd-2.20140311-r3.ebuild 379 SHA256 cb8adec09db3fc44944be2851b16db7ad4da14859c5f44b0da621e343533b96b SHA512 8653f96f97301c3c13de943288b86c3ab8712d510d7c96263fc9e15a6333ac1ba1dd850eb9fa78a310e97a1b7193a526f99653527496cb0263c4a29b163bc813 WHIRLPOOL c90bd459499acf0bbfb193320192c8902d3043da8da49d98ebbdafb0f82d6c56fda70bb5ee0c9601f64679a0af0a2033718b87607a8ddc4eb718d2ab17e4e7f2
 EBUILD selinux-tgtd-2.20140311-r4.ebuild 381 SHA256 a5fd63e50d69d6540082c52f3d406fc81f4d9a322eb7d9ea6cc5d40e862e0a4a SHA512 8a9171b7955935d10207db61b80d038bcee95b61c32146e52cb7861aa0f5dc790206bed24cf8f1f29926dc59daa0167bd15c978ac18c88f0fec075c9ed38eb11 WHIRLPOOL a03f1514bf072f6a41f24da09c03366b37b2902833d75a41992044b0b8954340d74a0657696025cc18fb08a863f1d534979c07d25b0a05ece72fdc7642cfdd2a
+EBUILD selinux-tgtd-2.20140311-r5.ebuild 357 SHA256 83b081d8e59b3d5ac66d53ac076aa1d5ba84ae6c681a0ae6c7efcee274d28415 SHA512 ae067926857cc6f87a21fcc16f0d36e1e9839cb0c4a98481a558329155e67fe7675f814794639ae1d21e6e6bdbf0583c5a79c939b463104e139704cf783cf5bf WHIRLPOOL e614e4d639c7b437f8f128a619324771642615f9a8ea605636e449555d8321894ba4023d8455d633d51f67a05dd79aaaabdb4beb52fa690c5f91435197603bbe
 EBUILD selinux-tgtd-9999.ebuild 337 SHA256 ba1f72a40bd3af5d497bf12f419467641d8d42785fae3b11a08f39198b1ad897 SHA512 4fac912cb6d0b4ea1209d5a736575f127404f0e16b7ab8dcaa4e0ec032acc81bd71a07f9af539dacb2467b2b431e6ee13660d604ebf00c4b4386449db3f4ff3a WHIRLPOOL 11b46539f7905cdc1ea80ede7657c393fc1636814bc17cac658f30f1cfcca33dd3573dbd18711bf5033bcdec19f11cf7499e8a6cb83704975efd6dab0ecd13b6
-MISC ChangeLog 6361 SHA256 4f88999fdc71256c4b6ad976737f80b62d6d689e6c1f0cc120a04f371b429cc8 SHA512 edf1db5459f4ae340c29a6e40cd5a5ea7c932c21a26b0fe4342ace291d186833fa83cca21d5ed4550dc365a154dae8761056e594b6301b3441808b03c85f5761 WHIRLPOOL 697e64497dc3955b633758551ea1ffac3b1a818371f6403a92c2bb8e442a0ca6a4d98ba09ae08713b60a564026a94f2dad7834169135eb76662f93a040f984d3
+MISC ChangeLog 6549 SHA256 58917536798661b058088590db9f0b3ec1e74c0508eef822735673c661b7c01a SHA512 5140456e5384f02c669d2ec364279d7ac4986c4e607b00d5e601dab06a80106a5981e8a0f8b265f129a9c64c3bdbf04417b33f0b380499f97ff31f6f3c778fef WHIRLPOOL 8870bc79a7f084209dc82e3809ec54603377d57b4b66a225024d649a68e9431e12a0bc66904344baf7a1e16128c45b83597e0006387cb63bd3873637e0eeb31f
 MISC metadata.xml 228 SHA256 5c2d27372be7c33e6e8cf173582c3aefa3c3206294348ad277832cc809b097e9 SHA512 f5ee6f860838624910a33d39184d5abe3122575428ded09a60335b9210d3a087a552295b91c71aaafe5f57ba9979b8c5f2a46e7636b98a521ccc03f178f36093 WHIRLPOOL 3877cf133ccbeccbae646439d58c984ffc8eb2c5b41113a178d0decb762da44a4cd5c3222092bb6385a12b70fd1e3e72c47af1c18c46fc6e1a38d849159c0f88
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0
 
-iQIcBAEBCAAGBQJT5RyhAAoJEC7dUkA7aK9HC18QAJim9FTmVPai083ngwz050/r
-2Mb7A+zFFlMa3ogQJtz+o7//OXhFxht2P6s+ZHAsMJJQHvzU70MrPl414lDl7gsG
-eh6tn1y0aKUb57Y6dmD96kT7lDpVTSnHfvwGk60E3YHcMzM+mk7aizoKsnGZ4bBF
-S+nq2Cc9EzzhADFNVzZCEDrJ7VsDDDw2VntxlhqAiKGRhq61H3v1OSWKtVCnG/hm
-jTuFoWNx2NNAFGxqIKXNOeuzSnhX1f+VIvvnK4jwN0/LMx3RNDbBPQ4aP6mm6OQs
-DxRpydROs5jSiKuEJ4X0IPclamAeDl98w3gQpfdk+Zu0qrmDkT+X9xoZJND5+yL9
-7kRscy0ef9viBHhfj+vO2XA4tA6ews/sAujcwA/U/nfhli9fa2o4rDxWHRXRJRIY
-dE2dox6b/Vw9qMfUZppFWGCi5bv4EjEg0crs1vO8/jpB3J/oKor0fmm6kypKemGu
-9CJkKxl3Fc4P8nxuekJ6CeId9sDXyVFTLDMxdVhU6QeBJVyTpYzHHNnx7Hpfgm7x
-0CEj6sLfOgVd/iSOyp0x1ZeY+/vHn8o/38RTqxHMVvehqaqiDeL0ojYjRMDYlCON
-9iJC32aejm+sw55ujbSNPtVgH8W4bt3RAnBrvxL6IFoMCllYE/uV7EK9/WcQrKA1
-hm8frTrlUN9x8GtghGE1
-=D5Mc
+iQIcBAEBCAAGBQJT5nh2AAoJEC7dUkA7aK9HGCEQAIgErcDsQ99AFMOV2fEavWSx
+DdVSoKAHsB/zZyNFOIyqj3fCfWKwyAtsCdPcFolpRf+1rfvD8AdPxJ+a1EH/JBC7
+8OKUCR/g7xFto4qYbtEkXxzk7uMaLH2kyD+cuZrf5BbuMmPF6dLyFhUx8/Mi+O/b
+Ta95gTi9nLF+I38GAzZ+GrI34IxIU/65P7GEmhAvRR/MfLUYzUfcN4Qd/lbmh3os
+ttD/fDUenvwyC083KjV9IX6LGsUypzX1t+iFAquz25KjIqssdI1XPLbHTOXFIKtS
+O4D9CVof4hQu4RafpJpYHp7CtpknVZz4XH4tWaLEku5F8SuGw1H9HnYPSUtQni6w
+Ivzx0xghzrNwisp2yaWaiVbu+tqFV1XBYm0+2qNKWFK5hGAp4Y/cFEfDLGfzAcFD
+NuWVqyxeqV8/0KxZbqyVsWeSDXtd3bVdyZ5rWR+88Vlm9S2zsgjR3UJoWjrrJGQ1
+La3zHbw8/AeObE02e1a8JrgarA1Hsbii/q6pnSnNxXa/ZsWlr5uM7eOmrYoNAwJ5
+d547kT9oXcyH2RrWEfl4Hv2T4vLhRWFJFmlnrUAX2eTY9bjx6B2OqUoumBD0glY7
+86Y/RlN/fW8lGtdR05dHne1HSylCAEQADNwkn0Bt0bWdEubBUgDII664lgd8nSCf
+bkIv5G/RWrkuGIXYWWkM
+=4/Ar
 -----END PGP SIGNATURE-----
diff --git a/sec-policy/selinux-tgtd/selinux-tgtd-2.20140311-r5.ebuild b/sec-policy/selinux-tgtd/selinux-tgtd-2.20140311-r5.ebuild
new file mode 100644
index 000000000000..b0682f05af93
--- /dev/null
+++ b/sec-policy/selinux-tgtd/selinux-tgtd-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-tgtd/selinux-tgtd-2.20140311-r5.ebuild,v 1.1 2014/08/09 19:34:43 swift Exp $
+EAPI="5"
+
+IUSE=""
+MODS="tgtd"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for tgtd"
+
+KEYWORDS="~amd64 ~x86"
diff --git a/sec-policy/selinux-thunderbird/ChangeLog b/sec-policy/selinux-thunderbird/ChangeLog
index 14191edbcbf6..d4841497794d 100644
--- a/sec-policy/selinux-thunderbird/ChangeLog
+++ b/sec-policy/selinux-thunderbird/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sec-policy/selinux-thunderbird
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-thunderbird/ChangeLog,v 1.43 2014/08/08 18:49:19 swift Exp $
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-thunderbird/ChangeLog,v 1.44 2014/08/09 19:34:47 swift Exp $
+
+*selinux-thunderbird-2.20140311-r5 (09 Aug 2014)
+
+  09 Aug 2014; Sven Vermeulen <swift@gentoo.org>
+  +selinux-thunderbird-2.20140311-r5.ebuild:
+  Bump towards r5 (fixes duplicate context for hiawatha)
 
   08 Aug 2014; Sven Vermeulen <swift@gentoo.org>
   selinux-thunderbird-9999.ebuild:
diff --git a/sec-policy/selinux-thunderbird/Manifest b/sec-policy/selinux-thunderbird/Manifest
index 8fc3fa4eb859..daf95773611d 100644
--- a/sec-policy/selinux-thunderbird/Manifest
+++ b/sec-policy/selinux-thunderbird/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-thunderbird-2.20140311-r1.ebuild 475 SHA256 8eb3eead3bb30d30132d6c53259ba2ecb5c45fb694d017ad7914cb8ed71bd976 SHA512 da67433929c9b49fe560fe9371ca0ca662dc51dd9cb62d190ceefbc3ceaf81972de13f5d0896d720017dd9b60c63962982266e312ceae3a856e5accc0ee86de6 WHIRLPOOL 89fbd3ce92269495f1f42ae9b7c22a5a7790e64d26d04d54b27d3b9584b63e527b8fdb982fe3e0b27be33b846c323676bd5ae7f9785076750473145822f302ac
 EBUILD selinux-thunderbird-2.20140311-r2.ebuild 475 SHA256 43c9429efd9055a9040ceb15fbada54aab730d78d25cc40dd8c6a519890f9c3b SHA512 94d7967584b7bf9176d5715d9eef041b751910719c1256fa012065ac0d8474504dbe2478d16250c82994777d068072badd41d18062181754e96a11b8f968e872 WHIRLPOOL e5832cb9fdcd36d4e6be21435f830f47f3b6cc405cca3a9e29ce266e698087cdd63776d973adb77288c41dc0a8c70f0d4cd309fa155e0a59cfebf547845ce488
 EBUILD selinux-thunderbird-2.20140311-r3.ebuild 475 SHA256 c8d1ed7c7cd4fc8a78407e5e462a04a77a3147b7251afe7903f055ab213b40d7 SHA512 b0dc04469fcb89db758093c18326933c6959ba61e8f63b1006e5e2a1248579cf23ad46f64ff7c76386c5673381ceff976030b09074725053da221939a57f7d30 WHIRLPOOL ad4c74b6d4017e34a99fdc6646af5c6d42a1cd6a27ace851f61560faa2ad42c57416ce4702366ca5068a0808d41e04de683dd62f2194cb66a84b26d43b5fa8a4
 EBUILD selinux-thunderbird-2.20140311-r4.ebuild 477 SHA256 b6b1a787e44ddd74b7a6872e5743c8c85fa8a25023acfc5ef04fad9a6108ed6b SHA512 aff25dc82d56bf0e13f0c6909b101e10ce9a35f62a9690d166c51dc449c8007222c128a4cf11eedc90b7976b88cb367f5e1a140cc2a993d49ada114809560bca WHIRLPOOL 7eb17053b5436b7abb379d0e8fedec9a0384763b54287ae7f68b8b27669ec435afe48ddc467522d65f64c33abc0490681587ac0a04f26f60a0bcf44bb8a58505
+EBUILD selinux-thunderbird-2.20140311-r5.ebuild 453 SHA256 f2432c740828c288b540c28a5b14db83ab1012e1f0f75e89f3d5548cf4f7fb77 SHA512 8240a82cab3d000849d338c4e4a868da5c6100dacb399984045ec27e3c356697895b6484258cc8de8edc99f11ffed9f2756552f175e095beafbf9a2ee29ab83b WHIRLPOOL ea062235799a0a0c2c332d8dc5674a4f81b6ad55fa675a7dcb6d4764ee8aab499e7f248177d06a3c8e975ac48ca6794ad1e61b18525e00400a615ddad9963c77
 EBUILD selinux-thunderbird-9999.ebuild 433 SHA256 910065fa601b1bf6b30e10d81e1e6d535b2672cf0598679d6091b4f1457e5553 SHA512 e380ad097468851827725c6cc357b814aa964506d6b97f9a5d629477533d5ed38f5d44073c1562ff5afc914f5bd3952dbf322a5a416d0b63f4ed212b66aebeb8 WHIRLPOOL 4f5d16b0717aaedd77cf8fa9fe0ed115d0728e11fa500433c47cb16060a980eaa58047701490eb9edc81db2bcfe3351b4c5ffd2bd52f586680ca0a317bb065f8
-MISC ChangeLog 7051 SHA256 2c6654c9e849d6e300b5a81c97db82e3f8288ce20872ae79cde91dbbd20f8c95 SHA512 ba60d95eb557836466ddc6259c4578e0fb1c26dc59f58a02ad6eec9dc195532c2dfa7260cf5b4661466b40b062d5b761162f7d76ce4d465cdb01b63627dd0b33 WHIRLPOOL 21868f8f3067bef11b2e8aa8fddc422fc1a3c29937c1e7fe657135cd29487728fa116417af13a6b7d26b9ab1ed7c3c23eecd177c9bbf9e5fdb797e2b861c5a1c
+MISC ChangeLog 7253 SHA256 30aa8b5f8ba65d6af57cf2ca473cd05173cdf12d8cd02fef9f36123725a024de SHA512 825f017206c4f47b533b91e305d1196d4b45fb6e4b9f331d907445afc62ca08ec7de29e4cdaf96c9d019bc5b172282f61a2d975b623199131b314349102b7bed WHIRLPOOL 6bbbf27c3a7f8906a2f9627b245c4001735bc8258481e7413c77cef811347ed79df5443ced3be1234a6ca03fde45cf36e42f74e66257d00e26642f2f50df4e94
 MISC metadata.xml 235 SHA256 b5f641bf0ea3ca65f6365f41663c4d1fc618601216ece911cb10294bd0896dbb SHA512 91af757f98fec9664ead2dd6c588ce0cbbe6393f3a0fd986d366187d31c3420950586eba98ee8f0f95702c41b9b86c02a58c1e1e31d65a2cd09c11545df8a621 WHIRLPOOL 7af44560367ae7e230ca5f0e6b2449c998ed3b3dc11a3379b68c525493c5bf100519d7110e61cc810830eb0c97a4da4a026ea88372d0d0a2182476daa367010d
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0
 
-iQIcBAEBCAAGBQJT5RyhAAoJEC7dUkA7aK9HWsQQAJa8IwfgPWJimNjJv0N8rrbw
-vKLlVgriQo/qQexmohJqhtFwVLDUzfmCvakUl+sBT43ALUUnvMUkrkZafI0aFxAB
-9aCGjsR+xwKzUEKtH9aGcSUYRjVNkUe5e82sb/J60JbLGjaR3D/4PTU5kParX/KS
-S8dvwnTLSElN1OadIGUXWEn1k3CUDnyAixsabL/K4HEor4QPSVYVODxCrzZuXhFP
-Yb/01yBZbbAWLeXeXx6GDt0/RkMB0xTP1N8wFLOyTdykzD/4vb2zeoZf72MycxpU
-sHDH/hRjGV852v8wkiP3v2kW2IgWwxqjnVOwMUz2pJBjOuZJWwfidZh4miiM+9r9
-3nr6E5fGt+ueLhLoIK8+O8w3FuG0B0H9rMM4LR1XZNNJfJ9j96Yy6DilAHYzdLdw
-Wp7Aq9RnToYOoGibUy8JJl48NGBE9VTjEh9TFSGdE7HQdA9Z3UIbX6fockhYwShf
-DD3GJdTjhPjrPmOU+fgekvlBzV0H9gzWjm8WosysvreSYuubsK+Nab0u1FqWq68M
-+YHpJ5pU94WU+9wL6t4WTdNtMxQbcLYJ09uVm9YOveZA6Js+bP6NZDyYUeFsTvVX
-BteExLZcstGnIt6oM+eQy0mXWf2dQNWZy/Ux3WvA85UqntKMnZkpwlG3el0hEmyA
-VE3RcG+LvhdOn5Blp2IA
-=Z5GS
+iQIcBAEBCAAGBQJT5nh3AAoJEC7dUkA7aK9Hc+EP/3hYYsjh0VF/7gstZUgjmYod
+d2/oQLNUxbm/wBkUwiMx+e7fgD5LbXmepQw0+VIlH9V5sj0piYTGTgTeyzVP4ytE
+h/qYhTuia75Dk9DZCStosboS1IsebG/DJy3joufuC+pD28VtUQP2qG62ERHmXP3t
+WwUznj0zHV5MzhdAr7lAR8kE4nHVYLn3HnUqYjzAxhjDzSl56hGIUFKfPfTG8hFX
+Q0yKfjO8NTNSDzmKstviidDH1252U1JXJ1g/fc79z4+BaQ0yd3sKL5uxVGjuSxWy
+tQobi1DYhN70mBE4iHi90hQFxP78gcOPhXc3YUgjOJIpTViW8wp5mK4fnTj3kZnc
+NQ+jhjb9EicJgP32ZGtZjHIrHLLWwNUnzr2vdp9jFPwFzwBhjesOEwvW65G8dI79
+HA1xaC2yIJHsavb8R3asQrIb4b73CxjBfH3c9rWOiHK/n+Dc/QLl/ZQKKVcG9vC8
+zQciIOIl1TEp98ICo3a/b4fjS7JeQ4+/AdlHtU+niBNt+h+kQI4LidF+VcxgnEZE
+ndQ3M6A6Q8PZtKxEENyuHwFiqvPQVw1BHw5Dt0os50TNxWgK587WiaJ3S/O6LEEw
+pTOKqyKSzAHOiiB3+fPZd0jA4l+n6SwMEqndQaDDYl5VPAjBUHmGb6Qc2+MzEPxs
+bv5+g9cfmhCppD5mGcMF
+=GNLI
 -----END PGP SIGNATURE-----
diff --git a/sec-policy/selinux-thunderbird/selinux-thunderbird-2.20140311-r5.ebuild b/sec-policy/selinux-thunderbird/selinux-thunderbird-2.20140311-r5.ebuild
new file mode 100644
index 000000000000..88372c538b00
--- /dev/null
+++ b/sec-policy/selinux-thunderbird/selinux-thunderbird-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-thunderbird/selinux-thunderbird-2.20140311-r5.ebuild,v 1.1 2014/08/09 19:34:47 swift Exp $
+EAPI="5"
+
+IUSE=""
+MODS="thunderbird"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for thunderbird"
+
+KEYWORDS="~amd64 ~x86"
+DEPEND="${DEPEND}
+	sec-policy/selinux-xserver
+"
+RDEPEND="${DEPEND}"
diff --git a/sec-policy/selinux-timidity/ChangeLog b/sec-policy/selinux-timidity/ChangeLog
index 5ee1f12e2a6f..d636770e09d6 100644
--- a/sec-policy/selinux-timidity/ChangeLog
+++ b/sec-policy/selinux-timidity/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sec-policy/selinux-timidity
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-timidity/ChangeLog,v 1.42 2014/08/08 18:49:59 swift Exp $
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-timidity/ChangeLog,v 1.43 2014/08/09 19:34:24 swift Exp $
+
+*selinux-timidity-2.20140311-r5 (09 Aug 2014)
+
+  09 Aug 2014; Sven Vermeulen <swift@gentoo.org>
+  +selinux-timidity-2.20140311-r5.ebuild:
+  Bump towards r5 (fixes duplicate context for hiawatha)
 
   08 Aug 2014; Sven Vermeulen <swift@gentoo.org> selinux-timidity-9999.ebuild:
   Make 9999 ebuilds EAPI=5 and transform to make master for version bumps
diff --git a/sec-policy/selinux-timidity/Manifest b/sec-policy/selinux-timidity/Manifest
index 086dbc88e3e3..675bcfcb4df7 100644
--- a/sec-policy/selinux-timidity/Manifest
+++ b/sec-policy/selinux-timidity/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-timidity-2.20140311-r1.ebuild 395 SHA256 2118b41a64bc2c25d69c5bc702c229e6b7f6840775fc6ff894c282f69b1b3603 SHA512 3c44064c1fa5ebf4df20d96ad8c6748a27559bad68c382513cf63783cd27df3e23a51592a0286c549726d0335cf8e2177b1cc793bb2ffffe2840d0254040d22e WHIRLPOOL 78497bda5c2e255d70df755465f4b31d2b16a05d0214e4b8bd3a44df303dd384392b683d3148f7f9e90a50029ac14e695770730678446f67d8f04668787b9d02
 EBUILD selinux-timidity-2.20140311-r2.ebuild 395 SHA256 fe78c16de0805fdcbf4ccfe362cd18b119a91e8260bf23fae04a0f64ea16093c SHA512 e49b3df619d1d0b2d096d2df85babd5dd4c23b75cd7287a7384e7589a59606f0d2b7976bc3ceea0d8c520337c1c7e84d6a7953d38ca70e6a293375f7bd9ad3f7 WHIRLPOOL e7a113c18d4c6d705860729521225396b96964792c6b0033947e26e8e44e8ac03f0fc498d237bdcb444e19c99ffa73f5ad377ac54f372415c317a1c0626a76b6
 EBUILD selinux-timidity-2.20140311-r3.ebuild 395 SHA256 4a86b50494aa12c72e8da5ca27cd60fff724d645410a87e33a78baed79089bdb SHA512 2dcfb72b5fe7c81776d8a5047ba07fbfb106933d58fdbe9278a8928ce7f20b365ebca9126af686d8e68f179e777961f39a9961f5d81c1334c95481eae99b2da4 WHIRLPOOL ecf5ae05ea08445d99f92b57fa5c2aaf2ccfe18b36bdf2a03359d6678ee366a1780c3591108d432d917516ed34085b213a85d9feab829aa9efa2ac23e000f022
 EBUILD selinux-timidity-2.20140311-r4.ebuild 397 SHA256 4bea8ca3643790eb7f56fe262b82b0885b40079553d2a91cf7afb69402bae4e0 SHA512 da239a816889f15b1163050c7eb1cd263420a7f7a79d86bbbe275ee9065f89ac207ced72bbeecfd4ce6c7544a8c9a9b0f9c830739079bac3ba32a72eca0a6632 WHIRLPOOL fa06a3982aa6fb2b568f562767dc3fb390b9f0ae5ec3dde54b23626d09cb55fa765c18a97ba1309f6ae4402d550bba28ba04d312cfdd165f096c83360f21411d
+EBUILD selinux-timidity-2.20140311-r5.ebuild 373 SHA256 dee1c752aa13c586af68b1dd41cad5fac771860283ad42cdb9f49372c55ed45f SHA512 641a957cfe4c90edf6595c5612f443732a249b14e14c6d8fd266a7c21acb161a4b06a54bf783c88a10494355ddc16bfe36470ebb99344a9941b4905591636ed0 WHIRLPOOL 5441a186b3ab4a37d693cd84aa9c9675499d1d2955d1c1d66ee045cbc845d52be17bf5e394ccbc11f2aadda96522753ad98aaa2cfbff4bd63662b9177466ae1c
 EBUILD selinux-timidity-9999.ebuild 353 SHA256 0d37b3322d4189d5871e08d2a87962e7003a7469c86ea6541f87fea0140d14d3 SHA512 147017470361e011ffa8c13ace88d04f339673fd8484e85286e8fa2851f7565e06a4369190ff0a3c393887c7a810ef7be69274f3d4ef0c464ca3cb7f2203260f WHIRLPOOL 10b11fb07c25b189401e7cf2c37633cebe34f3954accf596e1f144f18cf13f32437c636adbf2f8011064a52fbb8d099413e0c4f01dac7974d33f617361f0c8e6
-MISC ChangeLog 6671 SHA256 7289559927b39d3a3cf7c44e9cdbd5c01ad6eaba92b26085462b0fb7bdd8190b SHA512 0c58b1499c43d08999061375eac5f28ec24824335af99a58210024c95d5dcad73a1068e4414411025ae4c1806d1a82c85c051397c65a9a08950fca2790435028 WHIRLPOOL a0e5250b19793594ed883fd9d432667fb0d96db51ad867e17bd7b160bb5be42c6e794525f33cdec8899f285be03e0449c3ce700385134259b9a1c509540012ad
+MISC ChangeLog 6867 SHA256 ba6589507f01ec1b64c10761b07bf0a514af713ea45e577c6e53d30697c156b4 SHA512 6a9e8f498fb5b3cee3b828af7aac2702905dac657a2d37f99ed3657480dd3e7f7efdc8b21303cc1a8f479bbf61e4d2a6a66485dd3fcd865ec3fe9f9b88547135 WHIRLPOOL cf3b1ab80a8744d3e764b67dd0344531f2ebec61d43996d25f255f35ed08ad7a3cc2ac97f52255768b76b4d1459f82aa7d1714478242f5defa186f07f6a7a299
 MISC metadata.xml 232 SHA256 ef43b77e6f3a36897672aba8cc7eedfdea8147b7b29e03b2b3194414c1f9d880 SHA512 1b9cb93f6aef7c8e6e60c4ecd2c5c972b706cf4dcd60d204b0a335e365cce7b024ea430a35bc8e58ff54e8caf12edb730b6dcfbc7353822daea0d2e9fdd65c19 WHIRLPOOL ff8455bea2e1dd774d0ee731ca23151d1ff8819542688df09cacac8d6d8955be5e70b6e1d4d3a7910eef15683413ff25f3d94d684ae772ae72cd0f15c1aa40bc
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0
 
-iQIcBAEBCAAGBQJT5RyiAAoJEC7dUkA7aK9HhhwP/iryq+wYVfk27QwpjsjDLpK1
-MxINGPc7Mb+jYvwLvQEixpLlp4Gl2MEct5uCB/f7azb3fA9hyrOvNi3/wQaiRgAK
-uO685J0yK+1mpwBMukIY9N8fQdIaZkR4sFX0/mLSw1axfxMk5EEqTk2tgCi0YEPl
-cgiL/+8bBJUvVrOpMBVkSlV7gUheRGZfGJbZ+Y5ZkFwwotx8tw9N1czAm0Izd0LX
-zK3EyBtLiG9vhChh6NceWrAl4JREJoIcUD2iLWP+dSmEySyLpWqKwyqN8eBBSb8J
-cZd0OSzGsxxfQkh9pAhRllIwbMajiFvsz/pNwSb+1hxN16k7yK79+PyjYfh0Tvqn
-hSAWbtkCIz60py1VPAkw9m2ckXocYCq4K7OsrkLMpat2vVwEYpH9U6rZvbMW2JvT
-t8x7YSWHTE3EZtzFjBpMlan0Uoo21RDaQGQvgbw0g2DbmMUq5y8Se+vWc3QjMhQA
-csUqP60QT17/5sttV2RCC8/gVDyaxhJwgHI5hW6fxyeRES8myAavgkfP91aNTGEw
-+LbbRElRZ/sYzfWO30Y375UWyEc7oTAUBvLkVQGYIeuXMr9bxfaAYM/MnXPVP8fn
-jM74tRP3/2h9KFDumr3nea+WnEl751nbkns5g8KW3UY3DGk8FSak+/XsI+i/zqt4
-bjF7U0boi3io9VX4f2NP
-=bicz
+iQIcBAEBCAAGBQJT5nh3AAoJEC7dUkA7aK9H/OcP/jJWbuVLBy+wLPR/tSmOyuGW
+Kbu6/pS9x5y4g7RoOAmqs3NIQxKpT8Bu1+azCrKWsigYsnISZYTPqwfG8XqdCgN+
+QsGfFzyGtfkJzTeH3GXjNDizdBzfd06IKlN6Y9LJ2tcwcU581FtzIVRjy+CywKns
+bnDcqBhZYPVSlTiKgu31n4LvpKW3Shxe95wwh+7P18rkC2cc5e+7woUL6gLCTD5G
+SICxqEQILWUG3bPywyl8WQUQFB1dorZN+/TfgqQB55qP1EGS6X9paAY4cmKMf04m
+IrjWAKwMjbFhQ+3b2GCAP90AFSS1KnG+yl4EvC4sbKR71X9SlhYLozvrKHyN7OkS
+pbIPiHoWaC2vh8SVkO/GTfrdUBXK1K/4Vw4tXzBgHygJlVfElL2kPl+YCIqPH5C6
+g+tt0xlZnlJ1EEyE6f53EJ/n9xheHhD/9KQpV6VNNNVTABZ9Lb4OG3tkVkKQFT52
+yxVb3KAZdRNfIfT8LZlfXP5dy0EG1WUNJcmcWWSFZYb7CVT0GpVCmSJs7okf2WF1
+UtNpM7C6xzBW91xy03MchzyIKV+Q0eHCKRRvdDaxrb5fjGpk9JsctZeq4D0IExN5
+uzvuyyTMRLEL7KFiEs4/7kEaxOP8pn9Zm104PZD5mmFUdxQEB0HSK7RkBAAH98hF
+8pSYtAhkN7ydT0hts4Wt
+=7Iur
 -----END PGP SIGNATURE-----
diff --git a/sec-policy/selinux-timidity/selinux-timidity-2.20140311-r5.ebuild b/sec-policy/selinux-timidity/selinux-timidity-2.20140311-r5.ebuild
new file mode 100644
index 000000000000..56ca08c12f7c
--- /dev/null
+++ b/sec-policy/selinux-timidity/selinux-timidity-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-timidity/selinux-timidity-2.20140311-r5.ebuild,v 1.1 2014/08/09 19:34:24 swift Exp $
+EAPI="5"
+
+IUSE=""
+MODS="timidity"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for timidity"
+
+KEYWORDS="~amd64 ~x86"
diff --git a/sec-policy/selinux-tmpreaper/ChangeLog b/sec-policy/selinux-tmpreaper/ChangeLog
index dbeef1676a28..219793762e26 100644
--- a/sec-policy/selinux-tmpreaper/ChangeLog
+++ b/sec-policy/selinux-tmpreaper/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sec-policy/selinux-tmpreaper
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-tmpreaper/ChangeLog,v 1.42 2014/08/08 18:49:31 swift Exp $
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-tmpreaper/ChangeLog,v 1.43 2014/08/09 19:34:22 swift Exp $
+
+*selinux-tmpreaper-2.20140311-r5 (09 Aug 2014)
+
+  09 Aug 2014; Sven Vermeulen <swift@gentoo.org>
+  +selinux-tmpreaper-2.20140311-r5.ebuild:
+  Bump towards r5 (fixes duplicate context for hiawatha)
 
   08 Aug 2014; Sven Vermeulen <swift@gentoo.org> selinux-tmpreaper-9999.ebuild:
   Make 9999 ebuilds EAPI=5 and transform to make master for version bumps
diff --git a/sec-policy/selinux-tmpreaper/Manifest b/sec-policy/selinux-tmpreaper/Manifest
index a583f095cfbf..7fb6bf9f25e7 100644
--- a/sec-policy/selinux-tmpreaper/Manifest
+++ b/sec-policy/selinux-tmpreaper/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-tmpreaper-2.20140311-r1.ebuild 399 SHA256 ffc787889178f286663202d0109944477ab65dd9402aa5e58e4c0eb22e660fe7 SHA512 44e031c096f49599e178aad519f11a8563cb5c85868d35a069c181d150614e7bc5d2d786c69458b48357a926557fe3152734b2f65540c2226cad4cb420fdb62e WHIRLPOOL 468a3239c9904ad33fa5b73206d4f106585f35b17d466413be0174a0db8fc84594cc6e2421e8668c85a07fb887a1c9a18e89a49c934ae54650e08baa5ac59a65
 EBUILD selinux-tmpreaper-2.20140311-r2.ebuild 399 SHA256 adbd2094d9530bfb6c001d9f90a32a7d34e3de94e33a460b097863379e31293a SHA512 7a1475fe7ccabf2bb3c3eb1f0675bf5a4b1edd665d5ca92ba094425e3d642856faa87365cc3461f579fd39a20604230ee1df869ecc10e2379c14017de862a977 WHIRLPOOL 09b9a86b82f0ecaeadebc16bd667810c1b94d79ddca80e4ae63d2c40e0b1ab938c18a90c2da1eb8852d98ebb5a4f28d59db3082e9f8b1242e92b3e5fdf48f36b
 EBUILD selinux-tmpreaper-2.20140311-r3.ebuild 399 SHA256 b569e5cd3a7b527718325e4c6945f2e5e166634713e263fefbb4abb93f82ae49 SHA512 030299853e1668d102b81d39fad6eaae89100de10d5c9641e39b3eca7a8852a51b1274365665dd7bba164b0ce9c46fa55b915c314f1fd380c7e0ba88c45c3170 WHIRLPOOL 1ebf2fde77fbcbd4ae060d510c6f2b15626459c45134954ce9b98dd6a659800b1ac9795ceb7185994b2ebef2441ab8c3f8a0e72438b134adbf30e7924e72b197
 EBUILD selinux-tmpreaper-2.20140311-r4.ebuild 401 SHA256 276981bfe543ad2ad5cbfef57c4d2176a848dd0206444948e08d2bd57c3db5e9 SHA512 d95403d45400ad44774ed3e68007e90688ce7a2208e8fc0f85788480d51e9f9c2b2afc6448493b4e895479ea06f50d4f55e39d04ac107a9f6827197cbd715885 WHIRLPOOL c7ac584f9649ac3764c3c836af89029054098b069fc7e2f1f332280877f996b47c85abbbba9a106fde6d31acd48cb2659ed49d7e2e9dba16a9dc94c32e45ae42
+EBUILD selinux-tmpreaper-2.20140311-r5.ebuild 377 SHA256 e832ddf89d078c11c96d9e5be0fa4e2f1b636e824fd14e265bff6e7b1e937f95 SHA512 ab6ae88ce684a6c10a2590110d7c5beefb4399e1f9ba03b89c6646548c88bd23154a44d3867fe2558fc7e7f71f91f06757b81f5719bc0deb5287b14d5f4a8c1a WHIRLPOOL dd514a64cd9ad81dc06b94d86f7c2c8816c69ea91d5ab1a0bc3674e7918190834cb034f2d41374f31f5245b36cdf846cfbdd1b5052cf7d9c3de0dbbc9ad58c52
 EBUILD selinux-tmpreaper-9999.ebuild 357 SHA256 f3571e0f246bb6811e0abed2efc173a05693ffbb4fed61a54d92455115a219e1 SHA512 1cc65dc33a7aa5f1304c3e7f3b28abaedccf938a64337fff8729a4245b76e08c35e5acbb7d614e1b69f5eb2ec9383f33594420b94d6050190fefb8b252e49c74 WHIRLPOOL 737ffa274282cf561a58d52a25fe53204d8ebf95bc5c83549bbdb0da7a09505dfaadd51720b5f14e1119867a87e9aaa4e3342918a053448eb18502ab0697c0f9
-MISC ChangeLog 6750 SHA256 8f5d3648e442a2cf6cdb04c0e138317ef0a5366fa65d5936b39309d46e9b7290 SHA512 6b28a35b33ee27f0fc2f7c44b4c88233d0b39b674df568b726c7735bac00217d576bbe616998503fc3c2a16e5ab343889006b500c7d7c80a8f6b8f0e70c8278f WHIRLPOOL 8e08145c77d760847e5cdb11c2d3c3b3603bffcabb170d0e60cf9f5905285d985ec95ae3cfc85e00c66189720ed7786cd590a599d481dab555b1a35204a4d910
+MISC ChangeLog 6948 SHA256 10a8fcdbcaa6f66fbe0d713a6ddaac4d2f8d07cb04d253794df0903f72bdbd8f SHA512 617961311cd112be63760449aa4bb659015f17acbe437c4848c2cce6a81f7135edf21927d25a25e649d91cc6ffdf4b7e348c4dfebc8a92c63b562c88c0b62887 WHIRLPOOL 25f899a662d8b86df8ddd381466379b7080fe642fd4bdbc1def792b3632f67b82179bf1bcb19e133037a9369df23a69256be255aa5fd948909180de8a5203e0f
 MISC metadata.xml 233 SHA256 b8497e8a86f7f6e9ed30f1fa22d68965bfc98316840fd3a8b2fe1eab8d7cd831 SHA512 586df7d784e136070d8e7f3b275b7d21766431cf8be23ccb71c73f4d14da84a420aa0a5327e62acc8b581f24aa0adefdb274c7f33d8a0f4f37d7f6d8b9e06551 WHIRLPOOL c172c53d64485c2e44888449ace11dac44cb504f341975908c801fa8f92c47f364e436c2aa678c829ebfa48e0c43cc7bc86c1d150e13b4dca9b95f337fdd5a72
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0
 
-iQIcBAEBCAAGBQJT5RyiAAoJEC7dUkA7aK9H+GgP/jAwO02zk5S+zVYqgjvZPdHF
-3lO0VQAX3CFFZRpu9aBH3di4LZitCNI0nSijrQKs4P5xZ6oPYHVyuqaQTzN+evLL
-owcqW43C56DF8zM7c5Mm4yK6Bz5MalJW64uquJnIFjJGbSXKWaHLK3VqRDZJ2Kcf
-zDl5+XCuolt9p8Sz5rQc85QmCNCMDZMn7BWFq5NvxYEmYVsC/1umRhbbz+DmSepO
-PiXJGh7/dyIGwiPawMVHAbfmMDdh7cu7Qr9elz9NSAUF7uaRguqPvhH0S/Q1eOdi
-1V7yDWEuRrWXplxwCQSDgYKWAihnzdzojwgJbRamhmKzzDGEhcT33Bwl6zbjdlnB
-Fjqslu9OwDGZk02hnc7snf/nkrVok2b8SwpqhKLVKodvHPkmb+wsriYGjbSMEjyQ
-8aEdW+DUZBUu7fhKvotrCmzW2Iq38ZHkPc0rvrPnvfcFqhnwOG0buOQG39iFwLHH
-bmIH4WbTEycdSL6Eloi9X94PTzJPwtagiRz7cSrz+BtEw8OPSFWzl6q2h2/SGj9r
-asveEK1yeIPfLlNyf9MYr/sqNmO1FoebaZmdrXtDLPX5qYbb+zhLHTa4P5U1Oycw
-BJGE5hcCZnSypWBX1fd3qkNOntgETjvTLrzltIInaLs6zw0oSdgLxoOD3euJElU5
-pj4/9L6Sb6bbtmQ9i9eA
-=9XqZ
+iQIcBAEBCAAGBQJT5nh3AAoJEC7dUkA7aK9HBRQP/jvXHoQQ7MictzvzpmKIQLyc
+bTSWHFSK41KNTvYcBV0tK6XG22pHugA/7Vc0vojkRZ9ltXhZUTWcoj1URsl1/AxP
+3pXQT/9VIeuXno/6r2aDMBVl93AVsINo3s3G//16wbyl2PNOlsCpFNfQCAS9nnK6
+/iv/Pg7pBZ2Z981r47Kp0Wv2Szy5p1g3JlDP6cToewU8JZ6NzpWEFoaaqmZg6yt7
+JxcYVrLTezFPQ9zyIBHv+yaevN/1htI3r/w3TfEj+H8DRgwvsjZK/y+AG9XGbQWQ
+NQW3yEcFcCKcf2q/V+uUHTK0CHfdrp1eRMEJ1yTmaSXYnHUl4VMTiKttSuED7h1/
+ugliXh+iLjjetHLCZuxcPH4dRvbP539VyQJ4l+A/48nlD06cKdXw0VD16IKktX3O
+gA/ihVUsStcd94i4dN44EoWqsvgU8WkoDCclMZh2OKoYzI01JitGKoXXSINLM1Nr
+nDnpqqpFwVf1cDyNgAItYk6asp1wMccmqgeXjal+jxMlAh1URPWaHWGXaQJM5epy
+1eRVKB5uon+8HXwLflJ17LL3fwlutAXeWokyLZAxfuoRyBK8b/qvnv9kIY5CQHuj
+cgWdgopEnOe+r4nRzEVgcSsdLNbNrsmyHZ4My14DxhV7yyejoalM+7SiiKrCvvxL
+LZxYbQfy21a/Vy1we2h4
+=EJav
 -----END PGP SIGNATURE-----
diff --git a/sec-policy/selinux-tmpreaper/selinux-tmpreaper-2.20140311-r5.ebuild b/sec-policy/selinux-tmpreaper/selinux-tmpreaper-2.20140311-r5.ebuild
new file mode 100644
index 000000000000..98a2a510138a
--- /dev/null
+++ b/sec-policy/selinux-tmpreaper/selinux-tmpreaper-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-tmpreaper/selinux-tmpreaper-2.20140311-r5.ebuild,v 1.1 2014/08/09 19:34:22 swift Exp $
+EAPI="5"
+
+IUSE=""
+MODS="tmpreaper"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for tmpreaper"
+
+KEYWORDS="~amd64 ~x86"
diff --git a/sec-policy/selinux-tor/ChangeLog b/sec-policy/selinux-tor/ChangeLog
index b103cea18638..88e8a2d1271d 100644
--- a/sec-policy/selinux-tor/ChangeLog
+++ b/sec-policy/selinux-tor/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sec-policy/selinux-tor
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-tor/ChangeLog,v 1.42 2014/08/08 18:49:41 swift Exp $
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-tor/ChangeLog,v 1.43 2014/08/09 19:34:21 swift Exp $
+
+*selinux-tor-2.20140311-r5 (09 Aug 2014)
+
+  09 Aug 2014; Sven Vermeulen <swift@gentoo.org>
+  +selinux-tor-2.20140311-r5.ebuild:
+  Bump towards r5 (fixes duplicate context for hiawatha)
 
   08 Aug 2014; Sven Vermeulen <swift@gentoo.org> selinux-tor-9999.ebuild:
   Make 9999 ebuilds EAPI=5 and transform to make master for version bumps
diff --git a/sec-policy/selinux-tor/Manifest b/sec-policy/selinux-tor/Manifest
index b75919b9911c..034fd790b2d3 100644
--- a/sec-policy/selinux-tor/Manifest
+++ b/sec-policy/selinux-tor/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-tor-2.20140311-r1.ebuild 375 SHA256 464f8a47e788e7ebd0bbaa0d740734b0f498c9b3db9de9e340916ad205da3dc8 SHA512 bf9f8da7dc85e7b8cfa7ff84e2b9f4657b65f7e25753eaecb25286ccaec5c7441de92d3df7f5615ccaae1483bceec8b804d6d7112e2c1443fc12917402381e36 WHIRLPOOL 2e74ef7a20168c850cd7e770e450631f0a7b2940195b05fb4b1ccbec66441397c928a73eafb4a7c0fc772b5cc334e1ac53609af69b4bad7136226d62d6e6ceaa
 EBUILD selinux-tor-2.20140311-r2.ebuild 375 SHA256 17fa10034eaf4f734d9d80153f9766510c6b1b418a00760d8456ecc8e2fba5e8 SHA512 9fece57be216c376588f352a950aea9736372c2237afe340031343c605bb044b74adc92555fe95906ccd781dcf638f94575d13b86bcffac76be14222f9b2f4bc WHIRLPOOL 450705d3d5eb5f370b66f28686e964766a5643b654d61ea71f3ce1b68e6a034f86bf8ffb448a1b99355eb9a3a6b7532b559ddbf8ad4fd2744c86e0f4e731137a
 EBUILD selinux-tor-2.20140311-r3.ebuild 375 SHA256 e2baf4cba72b398c74422539e1db75bcd8daeafc6923d77152c334a3491a2ce6 SHA512 5657fb06d131c57c780b87b7910eae896ed6999521c9d7230af8c98a262505637acf635071f024c41128bdc84b635b0f3110ea843f2ba3bcdfa032730cab9cde WHIRLPOOL f920e634aeaaed0e5e58b123c7067959a4741fa40ee590050c95ec07581d7560f6ee78d048a694ef683f084bd776f177e67be47d101577292f7870b5cd1e6ad4
 EBUILD selinux-tor-2.20140311-r4.ebuild 377 SHA256 d1eab9a9021281be8cafb75dd82a634a0cd2ec00c19342c1f2c288575825cbb3 SHA512 21d60744485afd04353a0d04e069a91a04d1b6f79a8f3b3816e150de8cc7ee08a1401d9ce2b2a712de985b1d6b341b5b4c1067059a0488b863399d85125e6b2e WHIRLPOOL d23e3672e117df9a67876e768e7a5bb912751662e66c1647cf6ec511a407a7dcb557a6fe08e2305889a9901270e2da8f07cd94ca8a8ab92aad1fadd827ddd82c
+EBUILD selinux-tor-2.20140311-r5.ebuild 353 SHA256 46754e4de9923e538b0a5141452b5eb61031c7fd83a89ed5b60f2c9bb35385e6 SHA512 2884f5f934438c4e66f0158add98af854e0aabf945f6edec5bc0a60d7e8831fd0ad1cc15221c55ecd26fdd8688f52a5eb5910c7f47689f60f50f17de1ccc4da5 WHIRLPOOL 54214c59ddceb63d6e5be11caec1c70fa9ab225a3d36e2ee3ca4739b39ebd566ed16e0bd10d67a7da524eb1106bbe465191c8a63ebd65c66ae01f66cc0f6668b
 EBUILD selinux-tor-9999.ebuild 333 SHA256 7c6b8644befb1569dad8e172449d2545baca4f0b6807ffcba3047fedbef8c14e SHA512 795c64e8d9f234e6da58110b722b49f39c6692d06d89c6e14c7572aaff1e8506a1e3db9b8adce32af21be0c2b4fa3f58bba72361e4b3360587de9e92d4c063e5 WHIRLPOOL 30cee6700235eee685cd332b759fe4f7b180ea2023600025c67cac98a085aff687d0a37d9693e3d7ec16354a979c0a63e98983ac8e7307af6fb9f03467ccec03
-MISC ChangeLog 6286 SHA256 abe4eccb6ad0dfd2c1fbb27d4c8f05ac35ca9d6be918c7381100f33df08e93ce SHA512 cf4b2a80e5f01a83ff02c6cbc0e59e9de6d9af289c3f193e7a2a6a2fe49c4e74bbb685682468604d54ec6dd7aebbedaf94c47e9a58ffdcaa57c3d2522cbcf423 WHIRLPOOL 275447a9ebc3d2eae31262690551057666f3e8e9f8efaf24a363fba1888b69ec3e5487ecc61c2910f0566d365df92ccbc3243a2d2804a7cafcddcf501dd4001b
+MISC ChangeLog 6472 SHA256 d11a332484e312b19105fa343bb79f4b8b61332b41b85cc34689bb1cd5ea1b2c SHA512 008084b054db7fac04e9f185af8321a6de47ec3c50313ef04f4ea93e61a99f5f9bf7c2cea22d79480af8b37cc43e97bb2e3690b2946524579aab1b9baa08d61e WHIRLPOOL 5e783bec2b287d0d60fb46080aa3c5638064c1fbaa334ad4bc01720c1ef6202b6e8d866554dbb3aa5c00c4f68d3b3537401d4b6c533183ef296178fb86a1b06b
 MISC metadata.xml 227 SHA256 0c4c43cd641db10ebfd814a827b3d95fc5de340bb66bfc22936640b741894b58 SHA512 3cf67e252f15db95a19bc9d89d287459ae4729e55114b711132eeba5e9962a9d1e1f9e62a8da4c8f99180596e259e08eda21fbe8903abdf3f8991353a3551f10 WHIRLPOOL 7c77457b4950469f1920f3e1f9c1d7d2bbba1c732e5a34dc6f900ade6b025c2d80ff3f309c89c46aad58487125c545dcde091fc1e0547b9c2292c57306a77b2b
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0
 
-iQIcBAEBCAAGBQJT5RyiAAoJEC7dUkA7aK9HZEEP+QHRROOS405eb7MmV2zugUrc
-NJa6yHjFLY91winnjSXsx3YsQRliO9ZBs58uLx1C4d68n5yOT+IqfSIW0j58/7/W
-GzaKhZtZvYtfS/4vLah/zGoOqaYd2hXruPriBLYwRQAHcDoTRraPEizfM+NUbxKP
-UwYW7JNe3npjDgMvhfCL+kN8j370jXe+RuJQaqDyamzUqXIQIAfSows5DIQp4Qs1
-Q6rYwXl49NzKxTIpVPJCa+nfLiy854NBcaFVhnrkblL7zIsT+Ex5bWZac1oCIiY2
-sJsKLhWEwZNJKLL5jNXGqzo6LFziKGYemC81o8KnvW/O0ZHI9cad1DK7F4PnQYvv
-MqRZNNHSTQUJBc7aWwSVDTHpV3qfXh8sOc/ZdUhw/1l1qOYnTToP3KFMMOyXadSt
-BzV5/enjLAd6Q3hzwsmbXB6/0x9ANUOjk/k4Kuh+HNBrVSNnIsIaMn42p+KULdSJ
-ax0P71foxZ6GZwdV/Vgm1ezK8G7yPSC4QeuEB7lXMW+R32HbcPdLp3NM+ywN2NS0
-6EDM+wwVp5uHhqBA70fTHu+nqQ50MI+mWUTjo5s3DrWklLtiExBeH6wEoUEn/BRX
-ihRvx5j2rtgu+e06jbBViOtUTeLRofVbknIyGQF3qBUec0ghi3XPfXNIU/dSByqd
-a/+jmcSdK1DB4ituNJLl
-=izRc
+iQIcBAEBCAAGBQJT5nh4AAoJEC7dUkA7aK9HFcsQAKPIEC2hlY9g8qmPzVQ/wQ6v
+5v2I+Q3IPjCSiJGGjwALjEL8k7x4ItX9ypDxKDT0ikdlxgc29jruzqPTDkBkb7BP
+lQTl1tr6weMrV/bW+oP1NifSimZBBDIzAwBYpDP6TRUO2lJfPn9GPPmHmygbNR1q
+tyFW0ePDFq1OxxE1BOfdSwP15QyPPwrbYGAs5AQNxwB5PMdRXzD34v+i88YLoaCR
+F1jRZR93tSn7NpJVHhoGTkCUk6TV/v4+p7B4fwz+r+2I4p9YirVrMZMDhpdrOxml
+a5cEM8+wu4AttDsywMX8ZcgJmt0VWkfFGw2/pSHL/Gj/hRXvnxWpcsxsQ40RbKD9
+18q2R6KptAdy2kDHg8TeJMLj6o4cn5tgcFJNc0AnOyzsbO9SZz5EYRspjemP5+as
+0Fwq1tJVei4sctO7sjbdKLDqi5bjY7xCO2DLBEEzUsYS0kgIE+ozH1X5wfficm86
+xX9w7F5XfIrck1okXweCSjsbd/rwJfn0UIOaBqZKtsTIju6xzqx4u00aZJU5x/jF
+ksFWbC8INuisHIQ3hhLK/3IwXiridJga+BxvTXVsjV/qRyK+TouKmCuX47Oo+Hr8
+qBS8lu8PGJZpq4EvJsJz17bkANcYE3N9mC5uIOSic/CQVPU7GM5oFfbKfWP7tstg
+NsRq0sUrpEfubGAqdFzh
+=RzyD
 -----END PGP SIGNATURE-----
diff --git a/sec-policy/selinux-tor/selinux-tor-2.20140311-r5.ebuild b/sec-policy/selinux-tor/selinux-tor-2.20140311-r5.ebuild
new file mode 100644
index 000000000000..c4caca7f2f5b
--- /dev/null
+++ b/sec-policy/selinux-tor/selinux-tor-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-tor/selinux-tor-2.20140311-r5.ebuild,v 1.1 2014/08/09 19:34:21 swift Exp $
+EAPI="5"
+
+IUSE=""
+MODS="tor"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for tor"
+
+KEYWORDS="~amd64 ~x86"
diff --git a/sec-policy/selinux-tripwire/ChangeLog b/sec-policy/selinux-tripwire/ChangeLog
index b7a79d0fa356..cd22e0ab79f5 100644
--- a/sec-policy/selinux-tripwire/ChangeLog
+++ b/sec-policy/selinux-tripwire/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sec-policy/selinux-tripwire
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-tripwire/ChangeLog,v 1.42 2014/08/08 18:49:55 swift Exp $
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-tripwire/ChangeLog,v 1.43 2014/08/09 19:34:46 swift Exp $
+
+*selinux-tripwire-2.20140311-r5 (09 Aug 2014)
+
+  09 Aug 2014; Sven Vermeulen <swift@gentoo.org>
+  +selinux-tripwire-2.20140311-r5.ebuild:
+  Bump towards r5 (fixes duplicate context for hiawatha)
 
   08 Aug 2014; Sven Vermeulen <swift@gentoo.org> selinux-tripwire-9999.ebuild:
   Make 9999 ebuilds EAPI=5 and transform to make master for version bumps
diff --git a/sec-policy/selinux-tripwire/Manifest b/sec-policy/selinux-tripwire/Manifest
index d66508b568d0..4a77ff195678 100644
--- a/sec-policy/selinux-tripwire/Manifest
+++ b/sec-policy/selinux-tripwire/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-tripwire-2.20140311-r1.ebuild 395 SHA256 31269d2a45bc734499b7266c35040a525c96862b93896e15b1e5bc9eb64a4548 SHA512 d04aac6eb4c047d29fffe489054efc0fa83399a2298ad85387989c4ba240631a5fdeba3670baebf7b83baadce5d9e7cb9072c307d5827e5b89d78a93095af991 WHIRLPOOL 25269e61bee1714f852b744dc71ab6961d8bbc2e9945b8ae4f9031394e2750cac7b110ac0a12e3cba8339649a790fc63720548de91bdde7269d0bd7c058a566b
 EBUILD selinux-tripwire-2.20140311-r2.ebuild 395 SHA256 d7815968bd59d1bbac341faa8682d9cdada830b6ff26e69281dd902c9ad1a15f SHA512 4a88688050eb539c5ef0c82415480615313f92fd046fa2318cae7b446d0f68a7ec3cf6d61e8b51f1d9545fe64121f38c7bd81df5f36aa58cde1c6ef8068b47ed WHIRLPOOL 76b22b8a8699376921dea1e9db3a7ea50b1d3e5fb46ef0e5824c2a09e6779f6cfb962daa0ea42cfb409264c311f1f3ca7217a7845c6daf113e10ff6d249fcd40
 EBUILD selinux-tripwire-2.20140311-r3.ebuild 395 SHA256 a09afb82bd0d382f77243498ce8747e74c051511ac5542a7fa1426e1d666e060 SHA512 4a0030f656dae65bd9f7b53d47d6e9b7d30f2a2a3d364a1ccd356e3e53aeb845a18582617d19d6efe59d6c0804a76d7c4e1fc651e00190e79c182603327cbb8a WHIRLPOOL c685163eb59b9f5e0d610667edd452fdce88f3fe3faca1228914480ee0dab08cfb64eb6a1218ffd9b8d3d44637a0da97c8fdf248335da68e98b102fa5bd5e7d2
 EBUILD selinux-tripwire-2.20140311-r4.ebuild 397 SHA256 9ea6deb6db33d4dc8a373e1c94961acd8016a9fa780c6c2d499690d6d05036e7 SHA512 700f44a3cdbe9752b731c0f1ea7bc2d1593ee5c64fc98f9aa1506b9857c9be8a2e5036b76d9b4aa36bb4878445fe31d2207cffd82fd9d23c00cb49daa526363f WHIRLPOOL 968751641e2f0b6e31d67b289aae2c2c0b1326fd6c4e221d06c2c0605441efd5042439053f7244e6efb1b74115d069da9af4dabe6b7c26efe7d1640e1161100f
+EBUILD selinux-tripwire-2.20140311-r5.ebuild 373 SHA256 99ac3908ab4d6cab043a3aaba0f804b5d5d3d507c17089cfac10eef074ef1b45 SHA512 f43edac333cd6f59a79b82b2de533c0fd805ac99b68a757c710dbf48c68d080f26d09c92d15bf534344f8e9db0f7190e5088b0023870e13337919f13db7045e7 WHIRLPOOL 656313c07e85a3a60f2d36c355cfd971a5d4c4cfa26c3098a1a3ade523c7c4b7c2d20b8f7884f561fbd6d19f84982f31f4e4128562db91ae27d14e4e19297375
 EBUILD selinux-tripwire-9999.ebuild 353 SHA256 1cbbbde9b66b74e584f520766ccb5d8880ad78b05379df0c9709edc8d7423cd9 SHA512 ed73087ce0962034aeb3989ce2c0026d06bb341fc2ed13cf6d362f9ae28a88a54b12f6e78cf0d70cb359792185663637e5712cbf725ac1ad77fbf4f34ed2192b WHIRLPOOL c9d3a2b92df12406dc3fd0b2995d48321142a7e018c9001324fba8adefb76d841c77f63b54e2eab6062d439ae17686e4d66e9d38aa50427dda457bc3fcdef0fb
-MISC ChangeLog 6671 SHA256 cdbfe80f2d20389389098b48b23bb2ac0ab65744105df7404c394c089bf52744 SHA512 93f773e8b4c52386450f2c97f77785899e18ae4cd4f90b115197ac90ec8dcd7766c6134c2c9804ff6b513205e34efb2e16cf679d0a36e8d584d2e17cb3e286be WHIRLPOOL e78a50e5c47b83f82e430cc8157f4c1f1980704a87494bf11b36bacd0ad4b6aa3c36e19acf507dc67354bf5eeebf907a304a611efeb06d0c4766de44dea44e12
+MISC ChangeLog 6867 SHA256 0c391f12ff565892faf9f64a9b7c4cca1badf6b60a06c9dd45c981437b233b7a SHA512 3afa904f3c94f5440d1f4a3289172a4586c59bd485de0def226c3df242eef2ec89f0781859a353a29c43a29689ad229d3398bab4ea0dfc9f4577c35ef137c699 WHIRLPOOL 96d6c7b8793e774733fe199b38dc68369361a03f141bdfa1698624fcf158a1fb4eb6f25ce71e9a9f1ed5790c16aaf7b6cb0e74a85fa913a0d0477e0826938b2b
 MISC metadata.xml 232 SHA256 fb916aad6f7db20c7a41063e7a6501379f15dbbd452732528c671593332d78c0 SHA512 decfb0a1122d3bae24e718370303653ec976d74efe4adb4a8c2a8ceced4cd62f89118ec16829fbad16b863c3d9bb91b94c4056beecb82ac16d73ba708234e12a WHIRLPOOL 66c4c1b2f094bc9ab5a1332e4bc51f9ec45607470a326a91e7c3879180cc579139b4778b252dcfda1928d377b2c09da4b647c2eb7ab9716bc742663077f710c8
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0
 
-iQIcBAEBCAAGBQJT5RyjAAoJEC7dUkA7aK9H2pAQAJAfWWYyBieTsfGbUzfYkxlA
-14EqJM4n+0Uvq4gIRxkrdREedNncO+AK2Xbtj+qhpffjHnmQWnZ+xw8e4P7exOtm
-LSK18wZ/1xheVWrTQGkrsbqE4PWCHnStseixiWwhC/PjG7CCyVoiyhAGSApFU1Rd
-K5rtAx7sGduH2a2oMR6m3V32Di8ZyFS1DyIu2mNSw/6JKGe9IEnWC+ruR5OJnnqm
-xLFBrTTXVfdVsWRJAycE4VJt3nDuzfPHkxaMo0sl2jYT+QkWNl5LK+MqRSUKqZ7O
-n3hnn76ungmwljLHSuUUdRyhMTRdkzM+IPpshW6Z5UkyIQswPLkholkl+UgpTU2l
-GOVJg9RoAJL5WxkIvdAeINfGfKHoja+UuZNgo0dGBO/cjqFrRYCnUi7j4l14aPNp
-QqYRq1RuaOinVaGLmvzD3bJHdrxcSo34FqfZowKpTT/VwjNx7Q7FZkK92w+TpmzA
-mUQEB01dWIs03hpdmdc/ePFktknT3Qe3vikP/rHazrdGfNlzjKLYkLpVoiFdpDgu
-st5po+y+/hJ6Pq9ErHiCfkVg7yJSEgM72u8Q0Pq+TAYNqFhIGkFvdbnpilLflVKn
-VTnaK5iAW0pS+aD1rCwixLjn66PDXunNgoAHXp05rLCcQt3kE+b1xYp0UbtN67Es
-mXC8br0R6Mzgu7PP7d3h
-=1lMj
+iQIcBAEBCAAGBQJT5nh4AAoJEC7dUkA7aK9HmtUP/1Jv4kSDxby9bT5FMu9sEibX
+mW3ltC4uF0+nWeI9lx33MV9/hKoSj/Kfr+rB7GDstSxRJitsusKrvnxOrE6+J4RI
+aQXHYPRdKuioAHtsisAPoHn9UB8EkBToC/Kru5AU6nXE4DMKHqBFbtPLbGtKMils
+NnuRBmNakWR6OMku8D5+rvEijPStWgLI9zLg9EHORp0qF5XzSFlccIr47zdxUckn
+34agKwU/o/muRfeQeX5L0KMOXwa8zwt1jb2FDlFmd/gYucu8mPLmbqnoonTLgOcr
+LWn0Qdrs7Hiy/y+WMUJDeuYUNWsuewrtpdmO3KlAZfk6OEopU4XkEPXSm5Ym5+PD
+8q6YXQkC1lq8Ud98ZqEZ27ntoQT0a/BGC1fZktOzAQRhJYcKpC5X5lhYEtoF8FHV
+I+vF4tRkzUXH1U6hM4/6mNvni0fBmk0EyO4SERSduXQ90BuNP4gLaxaa4/QIv+qf
+SZujU6HMk6+fZKvmivygpVsiMD7siZweJEoGsweOVYBXgH3arhXyAdtntu2PFH45
+BEGbAFoKFdjxKpt9R12ENf0nBfa6Bslcpj6TfBV3jp2aq2tIMlHec4J3mPZ4cmUu
+hnuSPNeje2Mksw0eyekUCG/qiyYDqoERSq4bsrL/VFDlRyXyahr7cKPgyKtIBtKx
+UbiYMHslMoP+eQhXZk9E
+=MFup
 -----END PGP SIGNATURE-----
diff --git a/sec-policy/selinux-tripwire/selinux-tripwire-2.20140311-r5.ebuild b/sec-policy/selinux-tripwire/selinux-tripwire-2.20140311-r5.ebuild
new file mode 100644
index 000000000000..07742a9ba767
--- /dev/null
+++ b/sec-policy/selinux-tripwire/selinux-tripwire-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-tripwire/selinux-tripwire-2.20140311-r5.ebuild,v 1.1 2014/08/09 19:34:46 swift Exp $
+EAPI="5"
+
+IUSE=""
+MODS="tripwire"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for tripwire"
+
+KEYWORDS="~amd64 ~x86"
diff --git a/sec-policy/selinux-ucspitcp/ChangeLog b/sec-policy/selinux-ucspitcp/ChangeLog
index 90feec02f174..463a708948d7 100644
--- a/sec-policy/selinux-ucspitcp/ChangeLog
+++ b/sec-policy/selinux-ucspitcp/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sec-policy/selinux-ucspitcp
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-ucspitcp/ChangeLog,v 1.41 2014/08/08 18:49:40 swift Exp $
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-ucspitcp/ChangeLog,v 1.42 2014/08/09 19:34:31 swift Exp $
+
+*selinux-ucspitcp-2.20140311-r5 (09 Aug 2014)
+
+  09 Aug 2014; Sven Vermeulen <swift@gentoo.org>
+  +selinux-ucspitcp-2.20140311-r5.ebuild:
+  Bump towards r5 (fixes duplicate context for hiawatha)
 
   08 Aug 2014; Sven Vermeulen <swift@gentoo.org> selinux-ucspitcp-9999.ebuild:
   Make 9999 ebuilds EAPI=5 and transform to make master for version bumps
diff --git a/sec-policy/selinux-ucspitcp/Manifest b/sec-policy/selinux-ucspitcp/Manifest
index 0dfcdca28ccf..076ef7f95076 100644
--- a/sec-policy/selinux-ucspitcp/Manifest
+++ b/sec-policy/selinux-ucspitcp/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-ucspitcp-2.20140311-r1.ebuild 395 SHA256 f212611d1eaca48c0ac278d55ef7c1e365bf53700792d5f93f81ec2c563faddc SHA512 d743c199341a7ed6b0377e529bf26f7c382a044a2d15dfa7d7e2ad927bf0253439045727bf0122fe1d85004595b39a0a10db2ef8ef9eac9b0e7988a73880a652 WHIRLPOOL ba047766d6d0fc6199c21bf494aeb378c049f76b9c89527fe9b710b3b9fc3511459247941b051bdb9d9d25e77bd3886baaeb1d25968737c54c403cfe606fb070
 EBUILD selinux-ucspitcp-2.20140311-r2.ebuild 395 SHA256 0c1453bc15ddc5aa7f2aa492d815dd3c11c2bc830c218cef3bdbd5b932253ffc SHA512 b5eecc95669d6bb531599928c79137fd50b4b2476c1ab14afe8d889cf9383fcc5c86105dc5e0c1a77dcd02ab469256b898b0de660cd83c8cab6673ed2ce4b716 WHIRLPOOL ab77fca6ea73066e8bccbf75022429d841dab2b39ea59f50d099d872c3dfd0eacbc79c5eaf8a89bbb3b7baf6741c10044a9ee8993d4824b3f864be1740439537
 EBUILD selinux-ucspitcp-2.20140311-r3.ebuild 395 SHA256 07deb35848906ddea5869d7c6ad4c2007ee7e9c37d3bcff4c6c6e8e2c3fdccfd SHA512 dbf10380b72e11bfc443087099be035575e3a3795feadddb47206bfca4ea64c8f6521175b80b4e9db29ccaf63085bee5d6c6f640cee3706396ebc9ff4d120969 WHIRLPOOL 48478788c9ce24dedb7dbff3916223b5fe91b8d0a0aea911816b063b290bb400d99ae03686fb2aff8b8cdef4907c502bf0067b8f6b6fa9ee61e6c5fff35f1004
 EBUILD selinux-ucspitcp-2.20140311-r4.ebuild 397 SHA256 8532a32c98ed27332c447365980b77ace6f8edd9a8a51a4d3907df627182ddc1 SHA512 f5d8adaa29a4d7980333b9496482f84c3e0a5b4ecda77cf983b3a6c2362cc036de5426e13e29ca9cfa4fd2e01f9e4b335883f66478966c024b821489014c69c5 WHIRLPOOL 0d66d0121c2bf5d3ee37c2d523807584603dfd677d305207533e89b6a7b21ccdd36441c54f510d32cee58ff1ff7e16bae9cda1357bcb11bd34cc968ea8544bae
+EBUILD selinux-ucspitcp-2.20140311-r5.ebuild 373 SHA256 123948e6adbe7961fae4f2d8f608ab3e7bec68598038a3684efb187487d8ab98 SHA512 6db4427684d351bab61e811924551faa2191c1d496c0b3e74d845402b540d239125bdeab0f4ec6d1759e0071e57dc256d910990c502e253575934bb877cef510 WHIRLPOOL 79a2cef863091fb93eefcde646d2848575797ed29eebdacbdf7a8c85cf93d1959792bffc42086b6d7ce1c845b45be25969b4d29ad071dfd300588863ff89086c
 EBUILD selinux-ucspitcp-9999.ebuild 353 SHA256 ca15b68bfeb33463277e7ecb0b9917d5848cc87d27a1d62af858be9856e907ff SHA512 e304ff2d9c224764bcd907b80a9f258a5f4187466f82ed976befde63470072362f1854f49eb01db6bef0adb997902599735d681af3ec31e40b2a145e37e208f1 WHIRLPOOL 8603ed93a47e66956150a614923d8a30e102d3e8a7e356beefc0f0aa5210ebbe25d36e145beff506b3bd38e0d1a32ca20f9e79af9b8eb12e4699c70866f8eae1
-MISC ChangeLog 6622 SHA256 5b745de0964eb1f527918e513301ea81bf07e678edcf83ba7fdf86f956b4b858 SHA512 e50daf7d8409a23ff9f39c0c0a12a061752bb4b50d1caec49e14b06879b45074f926fe584a18aa6fa8af28349e510ad392b300ab3a431ff7bac094f40765a766 WHIRLPOOL 37896a3aa60e9d198e48e8659d7d69e2fadb72288fdd1a193898966e1502464eb3db3193dc003941b73743927fc0a6a1506db189e5b31195224767a3ac10330b
+MISC ChangeLog 6818 SHA256 e0fc60a32bd2f2d9a094fb952df5af37272a8e8343df94b9174560897bc603a8 SHA512 f6d326ba87cc96e0878368c18b9a2213de6bfe2371e9c738dafd5e6b052857160a91d66f3fa3b96a71810d7b84bb136e6e61ec8ea80a1cc6ec3b18b5839944dd WHIRLPOOL e449551f810600991ffbf2378d8161e57ef2897af130330355bee200de1b04868436c218b33e8848f5ff41df14999af7aa385458b4cdda4cf93c15b4db913942
 MISC metadata.xml 232 SHA256 0f78b35414de779eb18a06f00239293eaf2826379f1b7a41aef63de64e6230ae SHA512 949ed555ab2cf96fc60d35d0107b5c7f87681ef643b0a4b7bf635f592be39171e574830beca57658eee596a9bf73842eaf025bd939cf08b8efadc4f7ad60c588 WHIRLPOOL c5e035527e33685d3a0a3c42d973e8bbd0ecff4bdd771135e0d9e8ff79c9213d5e3c48932d9ca6da674d899f07bcd19dcdfe70c6eba61ef7b96feb9f4406859e
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0
 
-iQIcBAEBCAAGBQJT5RyjAAoJEC7dUkA7aK9HnzIQAI/bCkX6eTtIT1lmTepCmz5A
-Pi6GZiGesbp4g06UzexLqVMQfA15ZxmpCm7LpCxOx65oJW/S1MiYawemaVSs6EcQ
-bIRyOjmhUYlLp+079yM0bUGDMaBJV9b317VC/taYRbO5frprB1graj3i4jxlCafS
-Fn6v3mQ+JKqjI4KIQs9QRo8MEjG6nJme0uunG+43fZIJh0weamhrUMR5epxNVySI
-nBtga9ZSefYKWCfkF11AuCobh0YS0YF1na86Xblxj6W3dwhy8JV6ELnZwZyptwpN
-ntBQuKMuinEXu40yPCc3T36m6Vd01sTQ1eC6je67sJlEo8V9OmEsKlBDY0oVESdw
-WCREAaNYC9zyWv7u1C6DB4I680fza7L7lAdgswg/KIaR8sLeRUtYQNyBw7oOFv1j
-h+oUbaJNqpZR+R9xzlIAt8rkQseoFRZX1m337VwFMOzl/Pzymh+F/Cjg5GznjJf0
-NnXx4Dquh+N3qVEc2PKA9JYflUpL8SlzkT4N6NvjKyfrx/8v8rlT6qKBA56c3IFK
-ZhaP/oW3fYMK8wo1i24jIBHqVyzP5PAFfSkKcehlRRVLoYRALS08ZFsHs6FAFd9/
-ldjyi7q5KhDQAs3YqvvrkwmfQQJZY/Qqsv/QRcUd86Adjql0kYM5bzCe+bYeZJ7G
-ZQYgcWTO5gM6RXIhAu8P
-=Zfa9
+iQIcBAEBCAAGBQJT5nh4AAoJEC7dUkA7aK9HL+MP/3KHvQtWvhV3lU8tHAdrLQxu
+TYn7FTA8VmZd0a7ix2/B6LJctuod39eLq9NXInS9PCo+W/oQHQxsU3XLOxq5oQRM
+7YcSzPqHMP17kXSUWmvaVgKJMrfxEqw7MSWGwA5OGWd24ulsWn/aSlsxbyJNwB9d
+sWgoPqDSfU/I+IbANYAAGPG4LJSgLDlyx84ImTVn1Dbsw2jBzM3LFPqbLxMgLQX/
+LTbowHnIU8MZCCn5L3n9Ln3kzQBozxpLXWTCezeRaZiLynjc7WAlBvL4bgPsCn8Q
+KGDrtLNfljJpuJUEoEcTCYiOy9qQky1DLUPy8R3/a/JwilDwcXlma8io5YbkYFvB
+HhJ/Z4oy5OmUX7f88k2GGMdnEUvYLOAwkJuGAczNd2B1pIizjpwm4qb6zIGfI/3g
+UQwHJMXALvgYvRkD5Dg5csck05AcLNT3VX9nZI4USchytpX1zSMwEcH9UhNO9nYR
+qGEXtY8sZqm1Oy9VT5nt53GP113uG3baIGYdt3i5H6go8oRS3hFZAdqzlpO2uoCj
+kJF/hl4OXYKee/rfiOvBiTrCbmaYixRJEeJrYu43N1FI5oEGmZxWdRiE6gml07jB
+Auyn1l243z0zDc/sQEQB5TDvYRexFnHlm7DlZWTE8SKxl+HmX8FxsDwNj1a/MAA6
+MTjuAqaxpOBTlh3xQzox
+=L0WB
 -----END PGP SIGNATURE-----
diff --git a/sec-policy/selinux-ucspitcp/selinux-ucspitcp-2.20140311-r5.ebuild b/sec-policy/selinux-ucspitcp/selinux-ucspitcp-2.20140311-r5.ebuild
new file mode 100644
index 000000000000..2fefa0f26dc6
--- /dev/null
+++ b/sec-policy/selinux-ucspitcp/selinux-ucspitcp-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-ucspitcp/selinux-ucspitcp-2.20140311-r5.ebuild,v 1.1 2014/08/09 19:34:31 swift Exp $
+EAPI="5"
+
+IUSE=""
+MODS="ucspitcp"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for ucspitcp"
+
+KEYWORDS="~amd64 ~x86"
diff --git a/sec-policy/selinux-ulogd/ChangeLog b/sec-policy/selinux-ulogd/ChangeLog
index 9e14bad3f358..c820eadfb802 100644
--- a/sec-policy/selinux-ulogd/ChangeLog
+++ b/sec-policy/selinux-ulogd/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sec-policy/selinux-ulogd
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-ulogd/ChangeLog,v 1.42 2014/08/08 18:50:01 swift Exp $
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-ulogd/ChangeLog,v 1.43 2014/08/09 19:34:37 swift Exp $
+
+*selinux-ulogd-2.20140311-r5 (09 Aug 2014)
+
+  09 Aug 2014; Sven Vermeulen <swift@gentoo.org>
+  +selinux-ulogd-2.20140311-r5.ebuild:
+  Bump towards r5 (fixes duplicate context for hiawatha)
 
   08 Aug 2014; Sven Vermeulen <swift@gentoo.org> selinux-ulogd-9999.ebuild:
   Make 9999 ebuilds EAPI=5 and transform to make master for version bumps
diff --git a/sec-policy/selinux-ulogd/Manifest b/sec-policy/selinux-ulogd/Manifest
index 4789d93bca41..ae1cb04233ac 100644
--- a/sec-policy/selinux-ulogd/Manifest
+++ b/sec-policy/selinux-ulogd/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-ulogd-2.20140311-r1.ebuild 383 SHA256 9f46a6696acac00283636c21ab77e07b5a317cd36c5161e68c9dbf754b0b3439 SHA512 ff459949d128ce4c4e82fe21b10c5518c60103c234a3927b932d5dc77a8742f1f78bb947d549a37b1454622a9de515b10ad700b2376f0a6f49d0c62527a964a5 WHIRLPOOL bf4ec614d8f8163b3242f1420e4faba40516221911de5ee43a6b9430da6f2018f1ec0b66c2cd0aca2b8d5c5fef185e22648bab9c3d2c8e7f995054e6f0e3790a
 EBUILD selinux-ulogd-2.20140311-r2.ebuild 383 SHA256 0e1aed2a79a5244c2cc4ddcf319a410e8fab965037e409d2ea540cbe3a66c708 SHA512 a59a3a3ee2c824c370d887337c87938b864a1bdb0b14ac2417c50574d2c76ef423c469a60af818b0c3bd18fd22cc395572bc9a2c2bf125d30d83e6e9f973476f WHIRLPOOL f63f027c5109f3f960920c7a2e2149cf29a6487c38757dd2c1fad61d2f3341b774022d12da468bb1b2b33f58579faf62e97b708e428a42daf811693b60744168
 EBUILD selinux-ulogd-2.20140311-r3.ebuild 383 SHA256 5c0eb8c85842fc2b00720efe2130f2da3f5660470bd72dcf3fb462117df31e64 SHA512 a2df2cbdc2b993be12da183cf13feec4a0a2fef0151ff3309570b2e8a7c59e5ef4f43ce3c079f21d26d9718ca7c36eb059a8c258e73b1c785e5bb491f441ce9a WHIRLPOOL 67acee77209e3be27f71a56f1c4da9c9918470e8bd8259f9228bb6b9b1b017ebed7c65705acee4931130f8e02b934135bb62aec087271f2f2d6251835376b730
 EBUILD selinux-ulogd-2.20140311-r4.ebuild 385 SHA256 3c09a91ed5e41be8582aef62fc5934020abb4e6a20d0362d17e54c9677f4305f SHA512 085925343daae8374c4a19921bfdc906c50aef9854edc86c9b339e745da32c18766cb57e49bc87ddf10bc1297ff6254d9695c24afad74b4c33af210c0644bfc8 WHIRLPOOL 679759ebbb7e13fbe2b2421301e2a2da24bf424af519d3584914a68916bee275a3ec7e88b5bf6784d7eb928163e47e8d65938048979bf8f923d9a2a2791ff4a1
+EBUILD selinux-ulogd-2.20140311-r5.ebuild 361 SHA256 c245bd027ee7ec8aaf300fb939a4013c91fd2ac88e0e509c8e31f8dcf64f67c8 SHA512 7fe165ddd0a327cf8ff7ab2a54d209133a179a7bc20c21b5ccaad72fabe4404155727b4da0bbfd0d992b8b9a59e7beae065320cd8b4a7feecb4de742f2230fca WHIRLPOOL 183f60c183a3c981b2fa2c37950b9fd43052aed8ef18c2f3b963d01727b127954f701b042abb79c7190543b2656fa8dbe2edce6b9cfc685c49428b18e71c6bea
 EBUILD selinux-ulogd-9999.ebuild 341 SHA256 bbeee9b40a70701597c20e12bedf3bb4895e86dda26ed2436cc28bbb91992fdd SHA512 b206bf38f685e65767d31bd8b63a211059e46fc1d5b84c8e82d020e527dbd22236c8957c62ead6ce9ef2ed87db6e835e61bd88d6966404c7dbf4f4f8bb86bb46 WHIRLPOOL f515eabebe861cfab0e8f18b3b2b42910354b6c8058f9fe8f3107d85d9986fbf66a52060845019641d2cea108abfb595b57aad7a17b5cef6cd4c6247f3460b52
-MISC ChangeLog 6436 SHA256 27d5285b2888259c7350595b5aab9f9545a7f2be03651cd5af4eeecbace3a7b5 SHA512 47f9ac6a8d08779cac9dffde1ef3c8f14735a2e66a5da8325935b8b022b5b0fa54aadcebd6cc0e79921e1f5a41de48657c77e034ea6cfe2f2eeccd038e316b09 WHIRLPOOL 43e142382b9c92e9938274a2b2a9972a2bc7ca48e05bd902dba2e1b39ac3aab488d19cc5df96040999a6f9d85d3fd3036eb13767379776e91d819306238ef227
+MISC ChangeLog 6626 SHA256 5f4312826ab5a378040649a20a3b70b83705cd5b905b5b7fee08c924f04cd92c SHA512 246293623bf9668787bc99360ab940b8b2322eb2e27e5d7b29301c9f1bc376d9be8ab1b0a0a0af6ec471c2580e7ae3e107e7e182e60aed382c92b37cafd2e61f WHIRLPOOL a3b5d636a2c44f347b25d9c5aa71779ccff5c7af188610f96111d9942f1b9dcc9ae7d11f2925fd9ed073ca6d1cfa6eb4fadf31bb76be875bbbb1857e97d8213e
 MISC metadata.xml 229 SHA256 260977b208b89f40e7e7177f0b2017047c812f1f81a403a4155541e18a461222 SHA512 d6d90d41cf6305cad7d3fc333c111c9549c8358f0319a4ae43b11dcdd441056243dfb7c209c1ccbe83888c888d47bb69fe55fc81df75e88eebe0dcd5b0179728 WHIRLPOOL fab17813029c9dca06e07afe78962e8b20175dd734fa22e30773ba5b603a52ae8b33e9593dffd05a535e2225b539f9ea14ae1cfa2ff6bf3f5354e1c2894c503d
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0
 
-iQIcBAEBCAAGBQJT5RyjAAoJEC7dUkA7aK9HFoAP/1wIEkANd7BSQY2jKE1ugqBo
-Ueu2vJ+mUwhHCSXjeHypJsq2mLjJBtKzts09V8oSZNiY0U1PoOiL8PYnSmA5hFlX
-r39AsROHrwpIjaKa3iqd8tqNy2+TC6GPHFXt0MJ4w6Kdg8VbJWlOq7uuvVgeeZIs
-aUclthjCzJ+h0sy4b0BIKyT4sHMzIJrRffDqlcVth6l6UK2/ejXh0ZekdIIY9TVP
-MCPzo1ZK66MhCfg0q/yeohp2oNZ4q/4s1LYyUbwgMybj22fiJZABvEENsx7ErrCQ
-CBu3sYf6h1JOPdyyMy0e2AioPmwJ4zc8vPN3EPk9vdC0iafjM+EawiTd5bbSrf8L
-iC5uXdFSosvcTQsJE/tjO/m4MnJ+g8sedjMeYxwCPkUScmh61X1pEf81GIMRIMOJ
-izqK/UTLSnNvy14yBvugxGE6rZ23yXwtxd5RH4zo4vvuY+7uifMGzo9iRbIdS2mN
-rMZnrJfn9A0CsFGDfzMM7lxZcJdYsrNy58bH/+WXJzaamGOg7ndBV/oLOZROMEHd
-HNX7dSrc1WQKRdqGT0BrjRM6qU3OlcfRjhGUXs1Tafp8Po/dS1ACw2UEo+oXPwYI
-4zhbrXE0PdxYImH+/R6YGj02IDoKD/7uiPZhbgJTKBkbcqdOqdaVB2aoZ0elHHED
-Fuv5pj9sGlMRlAkDqZka
-=bCRD
+iQIcBAEBCAAGBQJT5nh5AAoJEC7dUkA7aK9H7fQP/RYZjaoXlb9enPSsZKAn9IrV
+qRQvUzPl6kaaqibP3Scd3hngTmY4Y/hvrs1pHFna1FEtdOhvu1uMcZLQ6leL93Ke
+QOO8xn8Lqd8tIDcmgDmPKsSPDm+ehX8g7ZhRSeQ+b2rJmHjy3s+JAye9PUNYMdlQ
+uYeAtXkOHAU7pPQ0ovo1siSpWdA0I6pvHxajucmQ0F/0bDTgUe+NcXDEACYNBzt7
+5GEjrrGTmgTAQ+BHpkm6qn/4s3iYXZXGBuhfSWzi+mvuPdwK8QMzYtvz2i6YBNOl
+eQJIPRKkbenhqzRcQuggA0xKB3qtYNS40Y6G0rTfttR1qV14uiyAEqxYykIXz6BH
+I5sXZ36P/70iDvcOV1uzInXQ2xVMiOgayaJ0RZEIMU9dI9MrKnCrX6Ffh66GNHh9
+5xIVIR7T3oO7hWPAuaN05MbXqk9mvCPUrgBTsb1bwzc098LvVZ6mKRudfZjiEmT2
+R23ZFGGJ+egiy8ytCsT9TA8Obzg6CA2CGO4L+CXuTFyCOl7ZE9A95rWM4awczyNv
+u1dWsqXBk/TVA9jR1cm2UUD3CrT/QypgRSeWfwjh75UxhA7RNqZtFSsqflX7/Ybz
+6p5cVu/kwWKocoAjsy5DJ3EzfncMAV5oyidrkGqSLvf1hvQOKGohklhmgZ8sBAR7
+Wm7gH+cwRyZON0AXRvSq
+=Wzqf
 -----END PGP SIGNATURE-----
diff --git a/sec-policy/selinux-ulogd/selinux-ulogd-2.20140311-r5.ebuild b/sec-policy/selinux-ulogd/selinux-ulogd-2.20140311-r5.ebuild
new file mode 100644
index 000000000000..0144ecde460b
--- /dev/null
+++ b/sec-policy/selinux-ulogd/selinux-ulogd-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-ulogd/selinux-ulogd-2.20140311-r5.ebuild,v 1.1 2014/08/09 19:34:37 swift Exp $
+EAPI="5"
+
+IUSE=""
+MODS="ulogd"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for ulogd"
+
+KEYWORDS="~amd64 ~x86"
diff --git a/sec-policy/selinux-uml/ChangeLog b/sec-policy/selinux-uml/ChangeLog
index 3b42969aeca2..d36ca64a2715 100644
--- a/sec-policy/selinux-uml/ChangeLog
+++ b/sec-policy/selinux-uml/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sec-policy/selinux-uml
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-uml/ChangeLog,v 1.42 2014/08/08 18:49:27 swift Exp $
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-uml/ChangeLog,v 1.43 2014/08/09 19:34:41 swift Exp $
+
+*selinux-uml-2.20140311-r5 (09 Aug 2014)
+
+  09 Aug 2014; Sven Vermeulen <swift@gentoo.org>
+  +selinux-uml-2.20140311-r5.ebuild:
+  Bump towards r5 (fixes duplicate context for hiawatha)
 
   08 Aug 2014; Sven Vermeulen <swift@gentoo.org> selinux-uml-9999.ebuild:
   Make 9999 ebuilds EAPI=5 and transform to make master for version bumps
diff --git a/sec-policy/selinux-uml/Manifest b/sec-policy/selinux-uml/Manifest
index 38434b17b8cf..c888ab28513a 100644
--- a/sec-policy/selinux-uml/Manifest
+++ b/sec-policy/selinux-uml/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-uml-2.20140311-r1.ebuild 375 SHA256 9ebba8abafb456ff3e6c84625217c85cee9f8f54642730ddd675efcddad3795c SHA512 4ca9044c305df018b0cb1e1bd8b2391b397056b5fcaf8d9e7d79827c6a20bf899a69f251e92eccc6d70cca02815d32ecf95200b9a2ec59bdd8af248f68ccd9b8 WHIRLPOOL d0fce1946ddc2fd1e719bb19240b3d6fa9b7eb2bcfa813d638104c6fc516125096ff4e8f155b0ce4ccdca95662581a018d007f02cd5b4ed3693620e857c47947
 EBUILD selinux-uml-2.20140311-r2.ebuild 375 SHA256 852d3b4d16945706198da2ed48697f5eba350e812ccc04d2641ef90e9ce78ccf SHA512 777597d244c4ae60518a540a8a9e7a6152b6fa50883096657f90a12ba3cc9df8042a58616ef5e114a01b56906f6d8b8d7fa92ac3068b1bd1ce71cb666acbef20 WHIRLPOOL ac20de3c1813d80edc67084aba6e635ce6fdd16321443acfa1a494f60d65a9f02b3d354ac62292e434922362be7081e30693ac4b7b541eabea949ab9d76fa691
 EBUILD selinux-uml-2.20140311-r3.ebuild 375 SHA256 82836fefd4a0da2095dd72ec9736dc8297e7604bfb6f7ec35ca2652db9823064 SHA512 22e74d7ce89f711ab270fa029185392ca1c460c0353eba209786b1b10b242b958a30eeb363b7065898a99b4520a2192b9c3fcabc938e5e92ea89f21e39686ab7 WHIRLPOOL cf5d264a56c7d1e1cdb2830c33958433d13f6175892627e427feb6339d3b7949c0fc8130fb9353c6e9f5d80aa5c7aff5cb75ad31518e721f31e18dc0079cad9f
 EBUILD selinux-uml-2.20140311-r4.ebuild 377 SHA256 3c3596e3a459a1a47e738349aeea8fbe7165c5e3ca8bb913e187b79a588b91b1 SHA512 00fbf27ecae953fc95d138347c869583b7961a7a1b620c9dac0af7c4da0cd2aea696c2b08aeb82c17868867d6c7c65b82f9f37aadc3e10f2849b0fd77adda1c3 WHIRLPOOL d42e9f31329087b9e92387d9f386ae62e974e9462b45ef9e358b540f1bc94958c89d9bb3c0160af6c6f3404724303861c9a8e6a60007c9964c3f9007a9fbd1e1
+EBUILD selinux-uml-2.20140311-r5.ebuild 353 SHA256 c79927dd0e30ab8b3e8fe8edbc7e1d3614da57cbe9843454c44e85ad72b17df8 SHA512 7abc1c83e08bb7b251f92b2e68e74824e9a3f68cf79ea7f2c8cbf84cf6e27b51bafd524680efc0a55b1f423fa6d8dbff02ea7ad747f5a5d339b766980171607e WHIRLPOOL d780dded3d2c5377b2f64e12715cceacc308ea118a978f0de730db21cf9d2b12be7edd211e0b66d94727651acdf7971f3350531a607f4eaf4ee310e00bfe8f13
 EBUILD selinux-uml-9999.ebuild 333 SHA256 86248ca7d596ef6761807b4f2c1af17b382df7bad0c9fed60aece051a331e873 SHA512 57ffdbf339d9381bb6c0ad66dc6dbe5c8a112ab93eea3bea251b786750c76678c0f680419926b81aaf08be1a52db0ba58c56df4257fd3cbfdd7ddace27205ce0 WHIRLPOOL 00ec29621ddb952341121e9407b55b422bf181bf7f3cf16ecd449247330e8dcaed7eee480080b23761a55142584dd926203db65e637b5b8d09da973a8921bebf
-MISC ChangeLog 6286 SHA256 f68bc03ed752d2077b1ebba0a212015f3a7c2e95f0a40298b7b4cc41abbcd9a1 SHA512 43eb4b099210e8363a96ff9e035543ebb24a0ded1321f83582059f5406c27c0fe08375d7841a593bfab4ac218e1f07aef2d8d9f091e75393d80e06967da7efe8 WHIRLPOOL 0ee54fea045402117c246d4d429d23f6740f714a7a3df899ef44ca7b49f842ac1629b09cd3fa72f1065384a85efda7739920aab346eeaadc7cd0bcb820730cf9
+MISC ChangeLog 6472 SHA256 0becea96290034df5febf7d3391f0e395d9518aa9a958a8bd7a4d2080e92cf33 SHA512 b7f74453f4cc4ef7dc6f979df4293298f0596d678ff7057b14a85826fcf98d29ef1879cd96f53b5f6f858b952765e042f50d17b6ca053ac73d43395478544bf5 WHIRLPOOL 5ea27156e01039fdea11212a678623f13fda3770bc687678923987a0a38ed321be40453e0bc19cf68f9079977a84e168d16ee4ec9010a97f0b025ef6b8cd0811
 MISC metadata.xml 227 SHA256 19cde0ef41392fa3694be0c31b507cb93cc0e735ea1452c6d61645df5792345c SHA512 0b6856eb2f329f2ea436fa12a26b4e009a860bc4045d37909961527e966dda71f852e01f270343235de701ce38360834dc3212b57df881064216afcbdc85a269 WHIRLPOOL 785c50934b0ba3d4051a13130cabc563e0258d60ac31ab6577e0e5e678e72c0a356163d72245e7263e7dbf763af08dcc51d5a82d4e2efbcbab19d6bcf07b59fb
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0
 
-iQIcBAEBCAAGBQJT5RykAAoJEC7dUkA7aK9HfdAP/3Y5AfAhCT7nfi4WkKaQFx9l
-qdjjEZz2yspXv96JmMk9dW1f86EcVd3QV+UNDudOn1M1cTQ9SPLgJ9fs7Pt3uppa
-fozEe7ZSohWLXTJKvT8QelnEo18AS+Y/6XPFFVoxEIOuWvH05C0zOZAnlMhC2vrJ
-/pLFuNcFvgxT7ICheLbkfr4IvRwEizGKI0gLaDC+92NwiF4BlsDODtNNE3q+hsNF
-990AnJIgeZlqSRRwzginFT+BPOeVlqSs/+JK23RPYZ6WBl3XGMtLwhKUMDkYViBw
-PRje+4kKBSmKjLIVUHrUVCcmBTHcS5904iefBwPld0RiMK6JwcAkXkJ5HEZVjjZU
-3w2wd3mzFkrtOwXLtV5DFbhPiQe78lvIxKYmCJXtoXnjhRsy6Ucuc7JWhxoliakR
-UEJJHdZW3WaLzD0HMaqTF5TrUmnY6j89KcdROvcoRxWpBg0B29samUUd5idOHpbK
-Ad7+/F3M3XtFEMI49JfqIEIV7YvIXaPgLcZ2V/UeMWdtFe9ZVEWmMAfTvAkOhDlg
-Y9byDH8hRUCmNYy5cEoaGBU6RTXj28U4mLbtbH6x4LMnaTaAXCdPmcFhmjLpvSSv
-lplG/37p527cwVYh1KVNp/NZeTlkrP8M4jITjSCE6KOJBALB7apHr3Mp1P8Lb8Rh
-im3c61hIT8G/zb3WfKDs
-=ISAU
+iQIcBAEBCAAGBQJT5nh5AAoJEC7dUkA7aK9HIwEP/1dj+NhUgdOjR1Y0fZJUdgfk
+/M2ARkk0XU0Foy57mxcAuirMzNeYpLU0ePOUkIuOqgANM95tA0KDjx7I6i2Qk+8c
+fQAJigh7BSOuBED1px7A/COXNJD9VZZGy/LK2dGwFzVO4xbGqQ9Xj44wQyMdw7fR
+d3XyjV2BT6SHn/fwMS2mSHi/l6fxinFQg1IN5UT29vPHFE74Aoa62yk+sfKcJrxf
+5Nq5eyVFvZNwYocOACcWXx9bN9juucD1jUkKAQDT20ckLwKwX4QDMmiNSR6t6y8E
+8N46aMhVLF8dYZKZrnhNsyOJj5175udCszbHC21Vtv+R4V0gFzzVBhdhjc/Xnxzw
+PilCxWyINMO3fZJimwMBQI+MICSqOePc6h2rU/xvvcxS6dzDr3jgyZuA4ldi+2Nj
+tyjZYcK9bN3lSdq6deNA26SRhKsyY8+5AcpA6mbI66O7CekEToaZ1XKehpH3Nfiw
+kQGidWMln8HpjUGDJUzjnGe5VJJytmIMUJWWIdrwFpkTnzBTOq1HCyU9fZHEKtNW
+bIvniEk4UEiKOSn/nsQS1esU1fJE8S9EsLRQSWofM7eeRX9c9eWUuLfQBWiX1jle
+O8t/XCVrctvfMtlWnvEh9RtpMfUjuBQgRtyeWRyiho7i+NSRqS0/dFHB9jNtAl2P
+NZYZQMTDL8MoGzCZyuG7
+=sDjT
 -----END PGP SIGNATURE-----
diff --git a/sec-policy/selinux-uml/selinux-uml-2.20140311-r5.ebuild b/sec-policy/selinux-uml/selinux-uml-2.20140311-r5.ebuild
new file mode 100644
index 000000000000..5c42a4619907
--- /dev/null
+++ b/sec-policy/selinux-uml/selinux-uml-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-uml/selinux-uml-2.20140311-r5.ebuild,v 1.1 2014/08/09 19:34:41 swift Exp $
+EAPI="5"
+
+IUSE=""
+MODS="uml"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for uml"
+
+KEYWORDS="~amd64 ~x86"
diff --git a/sec-policy/selinux-unconfined/ChangeLog b/sec-policy/selinux-unconfined/ChangeLog
index 8383922f1a7d..d4065b068cb5 100644
--- a/sec-policy/selinux-unconfined/ChangeLog
+++ b/sec-policy/selinux-unconfined/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sec-policy/selinux-unconfined
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-unconfined/ChangeLog,v 1.37 2014/08/08 18:49:42 swift Exp $
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-unconfined/ChangeLog,v 1.38 2014/08/09 19:34:40 swift Exp $
+
+*selinux-unconfined-2.20140311-r5 (09 Aug 2014)
+
+  09 Aug 2014; Sven Vermeulen <swift@gentoo.org>
+  +selinux-unconfined-2.20140311-r5.ebuild:
+  Bump towards r5 (fixes duplicate context for hiawatha)
 
   08 Aug 2014; Sven Vermeulen <swift@gentoo.org> selinux-unconfined-9999.ebuild:
   Make 9999 ebuilds EAPI=5 and transform to make master for version bumps
diff --git a/sec-policy/selinux-unconfined/Manifest b/sec-policy/selinux-unconfined/Manifest
index 9d70ef5310e8..fa2a4372939e 100644
--- a/sec-policy/selinux-unconfined/Manifest
+++ b/sec-policy/selinux-unconfined/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-unconfined-2.20140311-r1.ebuild 403 SHA256 88640ee4b12a3d06ed6ea945dc81e7f257ec3a08accaa65a7f67e7b717517271 SHA512 62afe5ce53a0e704e08ce556976d0bc8cbb337664d363baf5944bdec5856783163dd6782a35145604cb516909fb422ddf622cfbee39102c10da6e61b74a73b86 WHIRLPOOL d631ae1df0fc6184db3ed8481ca9b9425373ff6c7b568f862f6cb9780245cbcebcabed09079f16d67a81683d3f024bc4354443c20b745ccb7dadbca67b9cde39
 EBUILD selinux-unconfined-2.20140311-r2.ebuild 403 SHA256 7ee5e53d138844cc03b67830e5610268351c893cce0178c2751ab4fd837deffa SHA512 d050e96e1ab0c61b708668cee3b8c61c059ee6e1c7522d4b6e24cb02248ba3bc72e664b9798e2c70e0be877e4c862fd320a98fe0e4624915fac24c4ad352dc4e WHIRLPOOL eac5ba724e64a0f96e8ca0f5724e93bced6ac48010e58cec13632044c9cdf3f46eaccd32cce461f9838298724c72e7f4aacc114fd95c3fba0ef32de81f30cc38
 EBUILD selinux-unconfined-2.20140311-r3.ebuild 403 SHA256 072097df274efbbb127e5884657618bb5a019351422016838a4a9b092cd46241 SHA512 91f3005aca0bf21426b4dab60b963c657102bc300a1e110025053f5b7d1c286760730618cb4191bf092ef38e8087043fbb848b74da9f3ee88fdbeadd832cb254 WHIRLPOOL 6c40663c238a139afc28b3bb9ade3b6945b28cb80269113a43a9d1083a2eb5886baff3a9bb7abbb1637a5ac9555a0666f110899bf66e43a7adb130f356bda72e
 EBUILD selinux-unconfined-2.20140311-r4.ebuild 405 SHA256 24e12736db73e38408244630826296a391ebd682b7857739da88ce1f8179d3ae SHA512 0636ccb69666fb8490b1bdfe7dbed46439f05711a1c3e3c635f89ab525afa4b7b1cd195adbfd7ae5ef843382e8459eff2613a0da9c5f9dfa2bad7e03b39bf519 WHIRLPOOL 3b32ccaf38ce8f47e42299fb52b8e70e974a089f1c504d2bde98ccdb740b15f9f50fb8ea53593ca5a68a7f035f237f72de76f7186ff50b78212b9454c98ea168
+EBUILD selinux-unconfined-2.20140311-r5.ebuild 381 SHA256 332be1137990fd033afeab1baa98e9938d077de86df5c55ee93ee16af6f5e4d7 SHA512 ce2730fb71a6d79fd434a995e9c14fff873024f2fef6b70d1430d0c99e48511a8989a8c1ee20ad77ff725162ca6e9f241430c277c99df4f81602093cad3abb4e WHIRLPOOL 7cb807da9f0e595e30feb6e69b488af74533a647f32bafba120d6a51f3ff1210da8bebff6a5f36d08bdee440799cc6758ad366ac7b682cafcd4a7893f8ef7500
 EBUILD selinux-unconfined-9999.ebuild 361 SHA256 0a4ec4366450111d51f16e1f568864cb8a97153411917cc2a05c314911e4f811 SHA512 1bf6f9349e45f9aeddb5f7a9c0ca4339cb0c1b341e642f992408cc304117eda67302b0da5d28a5dbe209c5af2b63d2618ab39955ff5874c4ae35b29a093e3cd7 WHIRLPOOL 34260e3eef18d77067e3122622b6ad4b9fab480bb2e3c29584a07a9b6ad49d3554f47a36cd360a8513c6f23f437529edc4e6ad831ae83526198ff40e874792de
-MISC ChangeLog 6442 SHA256 abe056e134779dd0416e50f2a0222f1364bf739d33b8e78259460f26e69125d0 SHA512 f253a974148b8df412d57e4174fc370d099c17540853e86cb2776a995a8bb498a16f8f6e8e6fc8d79bd1807057882b1fa81e6c46cc4b70b7704172fed3a70066 WHIRLPOOL c0c4449d8fe98363aed88effa477f906cc33e8ae24a22066c4c1610357f10101a26311e2737fa7ecf2a15597ab9e4555810ce6e3cb4c02d76f285b931eefed69
+MISC ChangeLog 6642 SHA256 176c5d44268b6499ed505cc6e863b98afdf331b5f153dc03dbd3700fefb75792 SHA512 f35d1047a22c7f4962b8e8feabe02b406f42ba452a7d86a4bcfde31f9e1adb5d497192fc1c18be877ce7f3e716b861a3eb75244584bf42e6d7b002f169d8e755 WHIRLPOOL 8255014f52fa3a8d0e30259073c55f57efdb1fc169fdbbc8ac2c910b548fa742397de5d7ba0e2a31b746a410ecbfe7c59eb905fa1dcccd79b4aee93b0a65a6a8
 MISC metadata.xml 242 SHA256 76827536ba74c490acb5f17d281fa909220d65f6848bfe3b854c14c9e21bfcd1 SHA512 3170198b955a5905f4d8df4078386e2aa2779dfc1c338f8172fe6f62667d252f0c595b6c1e7c8afdb831c78bd9ecb7a699b0754ca0903de2abdf68831272b0db WHIRLPOOL 0120ffebe91367dae691b0152b8fc5b467877ac21e0c659e034945dfa8d3e466a8a2d691edbeaa804db9f59b967f3ab8247c5b722734c50725974d09da83b9b0
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0
 
-iQIcBAEBCAAGBQJT5RykAAoJEC7dUkA7aK9H5iQP/iKwHz1X8NNhSARUiTIy4FZ8
-lyVc+uGoAG5lGvjsCDNeUHoEolWs22+XxOlLUbpzJT+q3AEwAkl02yCSvyia0Zcc
-WdLUO4GeWVZEec5NwmpDkxjnp24eOwR4OYILvq/YhcadHL7f3AsfwMsQ6YRs2TC7
-W8AlFEcZkZRGPoiVwapwh/JRA5TfjMwvzr9rerowSwQsVkyK9f/gCm230uond5w6
-VBmSNQ8X3oSQkjfa2y1cmSqYD+WzP0bUveP4MOtyLLVGe8xc5VWsoesvzPHGr5sE
-D4if3f5JB2TNa0CLLkg5HE9DKiCQIiit+jJuu13pr1C0xus35tj1lNxDXm7SWdiU
-ATX0qCXXzgC5SPZU9LqX2uUP2+e8QYKxS+JQPzjZCawaez70T9+mmS/j1dG1UBSv
-NnrAWS1LktQMZu/yaEUExmBgRiehUsfbt9GsU/XA4Uc5Jr0SEWRHcY8QMarA+afD
-ZQOob1yz55kCOzs2oTAkCp2c5DcxuWs+kut/rU8lnHeyaCQPPYyIOpz6CyLxB0BH
-6UiZNL/GYj7oqQ4gFq2j1MtmrWRew0R8oq8+ztR0eZb/hJtxuaLkuLGwogiJ42kX
-o1a3b5EEp3kMcwzx7Y7KAzeebEhPf13gij8Y5Y23ZxcQ+KLYqWbeMec9rrxBkesx
-mE2AC2r/0pwLy29dgb3H
-=9rVf
+iQIcBAEBCAAGBQJT5nh5AAoJEC7dUkA7aK9H/WcP/R5T9FsbNoKMeMRRiCVM8duW
+xfuQmG0JEbTzMMVw/k/AmhuDrQO1ONmh7Dk+xjK7BUoR0Igam/LrU6fG9yv9ACYs
+dfCWD4WQNjJuhZbjab4B/XwMr9BY5yaZVtdEENYla4jQ90+MeQm747npz8FOeOd6
+91NupPLc8huxjdlmqrb9jnSaLEHPkb6jkURC6yrbc1ZemgUVaq6tKkEr7oUZD1Ka
+QiuG4YjJBunNqD/+K/kNEWwjMuKEhmRoHtBtyuZFV+dF7yym4VwJcXWvEHD5h1LH
+O5vWvv6PNu/w00ihRMXomTQpiv2QBQl9pYPnb9GVgjIH0/WUygB3gBJ8EwC5b+BZ
+15E6AK519ek2IZMlHQwmBd7M+it1ppheEkobb2LPtVBJ78wLPNK5r2KiTE8XvZvQ
+sBmKp7kI1lLjGZYlh/bq0DLDiF3A+CoSuVqBqJUU4AJZZnnbOdfPIbu5Nw//R+yy
+hCgxLIJQlkg/WHmeWa9eWfCHZZMPhFVafMoL6CBDPdCr/VNgEr6KnHsHtKTHq/yJ
+D9ZVpmrXUrzh+AMl2SZSmQQKGrQ5SMI3B+uheNiUGC/xt/l04tBlsbK0vaHZq31L
+B4ZVo7zT9WKOyckmuPg1uUqm9Ai/d3vMSB0teO8laJpHcHldOlZtrPFI4/0N5CvQ
+QnW4iLoCk8tPFQMKMROa
+=3V4w
 -----END PGP SIGNATURE-----
diff --git a/sec-policy/selinux-unconfined/selinux-unconfined-2.20140311-r5.ebuild b/sec-policy/selinux-unconfined/selinux-unconfined-2.20140311-r5.ebuild
new file mode 100644
index 000000000000..270aa9d98cb4
--- /dev/null
+++ b/sec-policy/selinux-unconfined/selinux-unconfined-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-unconfined/selinux-unconfined-2.20140311-r5.ebuild,v 1.1 2014/08/09 19:34:40 swift Exp $
+EAPI="5"
+
+IUSE=""
+MODS="unconfined"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for unconfined"
+
+KEYWORDS="~amd64 ~x86"
diff --git a/sec-policy/selinux-uptime/ChangeLog b/sec-policy/selinux-uptime/ChangeLog
index df49f3b50ef1..ffa158d0b0a8 100644
--- a/sec-policy/selinux-uptime/ChangeLog
+++ b/sec-policy/selinux-uptime/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sec-policy/selinux-uptime
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-uptime/ChangeLog,v 1.42 2014/08/08 18:49:46 swift Exp $
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-uptime/ChangeLog,v 1.43 2014/08/09 19:34:36 swift Exp $
+
+*selinux-uptime-2.20140311-r5 (09 Aug 2014)
+
+  09 Aug 2014; Sven Vermeulen <swift@gentoo.org>
+  +selinux-uptime-2.20140311-r5.ebuild:
+  Bump towards r5 (fixes duplicate context for hiawatha)
 
   08 Aug 2014; Sven Vermeulen <swift@gentoo.org> selinux-uptime-9999.ebuild:
   Make 9999 ebuilds EAPI=5 and transform to make master for version bumps
diff --git a/sec-policy/selinux-uptime/Manifest b/sec-policy/selinux-uptime/Manifest
index c9378656244a..cf879feb675d 100644
--- a/sec-policy/selinux-uptime/Manifest
+++ b/sec-policy/selinux-uptime/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-uptime-2.20140311-r1.ebuild 387 SHA256 d8fd51e7dd4256ec652fddef4de28a99c9ce8b836408cf45bae2a1dc93f944eb SHA512 6149baad50f00002391fb89e906656a2d8fc85a1ba75e29087ce7570f0c5812663fb76a3878802c59504f947a70cffda73b8b34f1191b0e63f77a82fe032ebcc WHIRLPOOL f3794314a47cc559ae1822a3eb8173428542cf216e0f9eeaa59d387a2c0cc9ef8372da286a2f3cceb0fbf12555ce6b80853dd511934d46d924dc6b611ad8bd6e
 EBUILD selinux-uptime-2.20140311-r2.ebuild 387 SHA256 eec99ddc09f89e274f91787b12932996e5059242abfbf2677abef8260af4db75 SHA512 05a2bb6ef0392f4eb52f42733824596f1e45fb5c5f5ed8bf417213cf11f68242b4f428e42658adb9281e306a40d6fe2e4c7a7270da74b2d6fa30b878b9548d29 WHIRLPOOL 335feeaa189e8f7db30bf42e9c532c33e712deaa35092b19b4b24ea6c656a4c42f6d7da8dbeb629ab607656b9a3ab91610dadb3e531ff9b2e3f702178142575c
 EBUILD selinux-uptime-2.20140311-r3.ebuild 387 SHA256 c7e473bbcbc2d1c2ab9f39740eed23961033278e9a7d9a449d93572b0ef555e6 SHA512 ce6bee8321acb1d433a3dc02a2234051c3974d52cff634e5f33be9efffa74511c6d78d838f486f8e73aed732da29b0c775b3eedc05dda5747ee5bdb5e09afb8f WHIRLPOOL 914be008f596cc75023b95f8bf16e8538e2fe1db68a15282659c1d98d5b136f0801a971b40211dc3309485ca98efc7ea791f25e7482e6809c3fb8355522c9058
 EBUILD selinux-uptime-2.20140311-r4.ebuild 389 SHA256 597d40eeee875cde08dcadf0fd3fdcea687d6748de7a548250601c7a3f1a73a6 SHA512 729b27c716fe662e4e37696d10f942790f4adb2bfe2a5f23630b18ad887cc022f91fe83376387b09345b8c9dad6d395ade3a643c6963f05244c4a69d9738b364 WHIRLPOOL 10e1fa7b9cb9afdd929c40fc271ab98279cdcc9375488fc9645f7c8f835ea2f0c1cc4160233a2221bfb0bf89492d6337a344bf424c328a50182362b173ba08db
+EBUILD selinux-uptime-2.20140311-r5.ebuild 365 SHA256 e36c18507c22688836b3a7eb4d7768bed7126ef6254764e2b4451bc4e85c8344 SHA512 f1af4679c0f204632eee3fa407b6e880e727479b457e501a28f75ba2e18993eff7ab90417e71448b288f5f4a6e363b7c7e2d9221cb74c770728bcca7012fd7e8 WHIRLPOOL 27c5e091f0def97018023647b90ddeff35052e415148ba1e89428c57994220f404448d807d1cfee94fabbe09745895e41ca45b3580662eb6adbc948e62243d2b
 EBUILD selinux-uptime-9999.ebuild 345 SHA256 48b8e83821ada3785101ae408fbe10e904d281199e2c62b4b3e33e41fa4dae59 SHA512 3c847a020cd36afadd7b8c9ddf2e703c6b2aa531d7f10fcc088bb44b20769bd1da3723937f84831030164d63b5691a395c59fdd3a8f4a24c2312baf10bef01c7 WHIRLPOOL 9a734c220ddabf32be8b84457227205f417e237fe57ab18051f32d7afc72670eb57d6cf9e4c0af86802b8c171c62771b2b639432fa71f85839f2a7863ec496d6
-MISC ChangeLog 6511 SHA256 3815668fada5e0e480cffb43ba6681876e353dc8d999ddb7ed6bc6d1abb5d9ea SHA512 7e4f25b8a4881cf9ddccd49980c389537660c9d4785da3efd669b6da6eff4d5d2c8c534326bbc0be82de59f0f863c8dbc4fe4562735b52fc903e2a22123deb9b WHIRLPOOL 4d82beefdd1133f45406acf180243f623a5f14d31d0a77a7bd267df27622a2b678cbb61f6a0feaef7346ac413ebffa4ac0d783509977211a1e5a0f72140867f7
+MISC ChangeLog 6703 SHA256 1687a7c9b5ce2a810c1e9f33c46962caa940c9f1ba3728e85fa9206af4b2acf2 SHA512 04da1cca6802d424e6cff4ef29ca99e96bf1306bb1d5e867693d637d742de6f3db314481279430b72e2fe1a7acf442d115eb1f04903f89979f0de49d7833fc91 WHIRLPOOL d159580fdba9b82083b8317ab4fcad73d877e0f6b5095831591234a79d0ceba7d17b20f8d1dc2c624a7adca8cae9fabeb9e09da531962a58da4eb35b05bf9960
 MISC metadata.xml 230 SHA256 1a02c9da2173de97f64709e003586d208d4c426b81299602fa37a72400a16863 SHA512 2b819fe88513cc93b26177d0dc5df962959070a28a4f9ee4eecd5102ae6ab0edcecff78456559c0325722e163b5fe354e5f9cd4b401fdd9485eb0a8e744413b5 WHIRLPOOL 2ccc4ad627120ac50720120974803f0d2f537cda1157f16723d10dbb2eb13bbc1fc6e6dc17841267c3205e202acccd643e952f114ea478be76bd496a67a14302
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0
 
-iQIcBAEBCAAGBQJT5RykAAoJEC7dUkA7aK9Hyq0QAIPTWUOO5OK/7plDCIjGcLcT
-WY0gZ+E1dDBV1MiaAkXz/SdHjg4n982u4dvpk5u89A40Q1S/A5gWRvfcXdqR7yxk
-Zvh9fLQcuhLjN40jjtQUehsL/08cMJpAPAn6JE0FhQgriPRmwB9hd8xTCaHJCqEo
-96IAFOC+ofBQZuwOXZQm3tPadU1a/FmzU3mATHX3gAmCsb6WQlOF5g7rt+ymoZqp
-9KrjXxTJa2OsTHiCXQmjDy6nfBu0esawHRdl7pEaVvXs+JCY3MKnDMIRh0KlWOPu
-L1cTDqqYBIBRidcDxSHN2aZdziCSAwZp4VWLZiAKg7A/vX2eJ8jMLhnoi6KGtbj+
-Sj4oPPcIX9YMQkGDwGtdQPX2u8EKjrtlE6XJosv/kIhN7nTRTOMSXIV8KxnC2/mk
-tEr4efUkBo78pI7Wh1+KWLnejO/3e9fiSM2xddciK4iY2mo7PVZx3axlry8kiB4l
-PJtadhr/TJ33fJ2/LTCh7Jk9D77HLx3KvF8sjILde+Q8TR24GylbUKBvxLjoASve
-p//IWTWuQyKboitndm1b08kQyJ7NTaORfeBFgMqjPuO7Njo0KRiF0z5OorxHwjBd
-NqFYQNS7D8IFXbUR9HfmQclXkdTKM/i+ke44jmIrCfYGzKobhoFYm76UEuSyOa6N
-/6ikh2tTHO3/6bofUA9q
-=Abjl
+iQIcBAEBCAAGBQJT5nh6AAoJEC7dUkA7aK9HjoQQAIaS+l7VN0Yg2FtoaWWyoao1
+mMjXHY0DO+uLeRvZ/KbSqboOM9fvb1UQUiRwqupXsUkPg6O2kWyPnx96FxMQSiQY
+c8LWRCJs0nhFgeFRO8wCeWBMQS/If1tAQDZWmO3S1RpaywaJXMhPd+/QdMrIPp/l
+eF5OS7Ic++Qkp4fis+iGXMJoFDR5kiGP8lEgR0slFt0c8DgmI0GHgdTt0HMHC4kL
+qt5L2MJJMQU/xamc4GFL4unQrFQ1NR3BXU6By7iPwuhsLgaWXugcTgV1XthVDc98
+7AXmLKkr+xHEdMgmJMmgegO0uWQ+efoUxkApoMB5xLnmN+3QWvBeW7a/P1i+1eL1
+fFT2Rj314s1zYBb6FWbLJsz8Wc9hHadczIEeYwk1wcmjuNY3ENjgrZsGIpaoV3Ld
+ZzN0M2P4/225YxIjTuVr1V9RJrQu/NCd324nm0LDX0v50yJCyf/Lbl8hyR7XI8bW
+1RUWwjIAuefrHpmX918OQmuofcnXVByKsQNF1oz8TdkR0iKX9NZU3w5AsCTs3Tsl
+sTk+6fwhu7sO7ZCg9m2PnhGJsq8BS4QZJW5fKxLJuQUKuDAs6pPrYIetVh3Ace7e
+pMC5Q6VC60WEMCXgCgarA8Ufieaiqn4s9ZwT6M4cVOKPoPcZLUtF5XSa64ai7y8w
+BifHMMV8Kn+PNYqlMWJ2
+=gyd+
 -----END PGP SIGNATURE-----
diff --git a/sec-policy/selinux-uptime/selinux-uptime-2.20140311-r5.ebuild b/sec-policy/selinux-uptime/selinux-uptime-2.20140311-r5.ebuild
new file mode 100644
index 000000000000..36f5bdc3ba2e
--- /dev/null
+++ b/sec-policy/selinux-uptime/selinux-uptime-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-uptime/selinux-uptime-2.20140311-r5.ebuild,v 1.1 2014/08/09 19:34:36 swift Exp $
+EAPI="5"
+
+IUSE=""
+MODS="uptime"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for uptime"
+
+KEYWORDS="~amd64 ~x86"
diff --git a/sec-policy/selinux-usbmuxd/ChangeLog b/sec-policy/selinux-usbmuxd/ChangeLog
index 70d2a031d29a..2dcd5c56ff41 100644
--- a/sec-policy/selinux-usbmuxd/ChangeLog
+++ b/sec-policy/selinux-usbmuxd/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sec-policy/selinux-usbmuxd
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-usbmuxd/ChangeLog,v 1.42 2014/08/08 18:49:42 swift Exp $
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-usbmuxd/ChangeLog,v 1.43 2014/08/09 19:34:19 swift Exp $
+
+*selinux-usbmuxd-2.20140311-r5 (09 Aug 2014)
+
+  09 Aug 2014; Sven Vermeulen <swift@gentoo.org>
+  +selinux-usbmuxd-2.20140311-r5.ebuild:
+  Bump towards r5 (fixes duplicate context for hiawatha)
 
   08 Aug 2014; Sven Vermeulen <swift@gentoo.org> selinux-usbmuxd-9999.ebuild:
   Make 9999 ebuilds EAPI=5 and transform to make master for version bumps
diff --git a/sec-policy/selinux-usbmuxd/Manifest b/sec-policy/selinux-usbmuxd/Manifest
index 319774d40991..90d8d730906b 100644
--- a/sec-policy/selinux-usbmuxd/Manifest
+++ b/sec-policy/selinux-usbmuxd/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-usbmuxd-2.20140311-r1.ebuild 391 SHA256 98ffa11d9eb66bfe6c3d1d01e071ee386584bdf4056462e9970a43857c25b9f7 SHA512 fca89d6117497db6ebc646e460037e4d58544a87fb9752b702c77b53bf092988fdc1284571b47ddcc3276099da301c6390d4fd95bf320788eb85328bf0893e9a WHIRLPOOL 60e320fe293a97d20ea61bf04d6304a1c4fb5a6a4c195d06fcd69ba9e23628bdbe843e8ce6183cd14625adb59f3ca7e4ae69585c5f29b65a0966f5b20b111c81
 EBUILD selinux-usbmuxd-2.20140311-r2.ebuild 391 SHA256 9e5246ffd7062d9bb46a5c7837ffe99ee7cbc89778a444e2e0ce2eb9f1a23ddd SHA512 61a1c8d770a0f75c72915230b0cc883cda3356c8721d6d8ab2b57ddc66cf689b090a798eccb622ef1ecd230b8855be4b41be932ef60a9c035d0ea8ec83626733 WHIRLPOOL 14edd0cdd4e8fb1d26539c91abe3051c947907e09107e394a2efa704b4bfbd34693939c8d8f32f6ba715331156ec347cd76dfc8066198cdadfbdb4b278403276
 EBUILD selinux-usbmuxd-2.20140311-r3.ebuild 391 SHA256 efc089ccc2e976de75938d86506906325f95c6484259bb793e60563e762c8656 SHA512 ba9ccb97bc8ec1449b229e986cddf8a4500a89b719c4586b3cb9f45d9408775e3b3d0aa6e447f976b2ec2a0e3475f12d4451af467cd5d17b38020ffd04793ce9 WHIRLPOOL 1c01633a21af0176c9a852a0cf53c2646316cca37f9f0f2331cf3b2272b994674452e11151ad63c7b760d0548873073f020dfc3434ff236aba30b7499a539273
 EBUILD selinux-usbmuxd-2.20140311-r4.ebuild 393 SHA256 8205e174f85e4a1a74ad13ecabcad4f580cecb6ddb4129684e88916599b0c929 SHA512 43a766aebd8df44b0845849ebcde4a81da226249b9e2d55b8d12b89c7f1db8f04b7f916ee0f0a720f52575495d598cb1edb61eeca20f9593fe83a1f2012ad0ba WHIRLPOOL 28710fb732376ee7d063367cec09a07efeb58c880a04f87b0712fb58be5e31200f3d611f5a140edd805b1563f5031a54127a51af861cdbdebcdf059af7e56a88
+EBUILD selinux-usbmuxd-2.20140311-r5.ebuild 369 SHA256 ce12c2eae768bee91634e01e8b18d12335b58248a182909e62177290710f6e9c SHA512 c592c7c5bb9f64caeb63a49d348b3bbf8c66fcb321c8a3c25585c1da04e259a7b5c001b4fd18000703dbe6820ff4ce05c7bf60bff68ed773437d81b5cfc3e8d2 WHIRLPOOL 4ac35d09b43fd507b3f08b45a024b189d00fd702995a02b44b30aef24c9cbe55d56bf7101ce21daedbad1ff6d61a9dea6be5983875acb6c11c051179856d8a5d
 EBUILD selinux-usbmuxd-9999.ebuild 349 SHA256 b50427e866ccd88f16a911d4c420fede77bd778785e63dde0bcca84c9b53dfdc SHA512 649a69f19a583d319393cebe6061d098d56a6c3a5a369064911bf0a936ad15f3fc90400ee35d429ebef43c85e05d5ced3ad0fd9320c6c4ac05c1bd21a551fca7 WHIRLPOOL f2a4963c30f4c44732bd249227249af3d308d2fd6870404db40bd5769dad2789544e8a3d1ce821bdfc977229cc6f5668f6a0e3700d5a52ad112ad2bfea9098c5
-MISC ChangeLog 6588 SHA256 281938badbd4c86bebecb325de7e6b5511872518428a8eb68a100910f0e72b1b SHA512 99389b367191c1cb6a07570acd2b94cc0c706df5206885d5174f6c512b96b269335635d1e41fc6d1016f850c1c496a3207a0ccda0af0e81a93e8a796852e9555 WHIRLPOOL 0b5cb4630bbce7191425c29569165d93aabf80e2b575c5f3adcf06b187192e55fb4800b3cd4ba10c220888c019bf84617a0e65a02c6ad5f28d1baeacfecd1761
+MISC ChangeLog 6782 SHA256 3400600251b56143650acf0c7f8a0546e5ac6d60176d158887fcc248319f3830 SHA512 354f5f6bbbdb1f10216e68b55e411ae62984696bb3c5d8f567545a90b2198b5968bf01a1e24698c7667425f72bfcab6cddb7493f7eac2de1545382892c172690 WHIRLPOOL d9a926fdc7cf7bc7b81445d02afe5797f8575a6978927466796b881b656b8bd054da9f02553a66f9eafb9ca17a99187612709b1c767a8653e7b4a27123c91cbb
 MISC metadata.xml 231 SHA256 9c4d4f149175968d795dbb090494275b07d43a0abddc7996c86ac37d701c83b4 SHA512 65fa9a27dfece529bc605688995fd50c48a5c21dc0cdd4c2299111dca0a555455b951eb6c0c25e4affca2c7e6086b1170a67676d59f109bd31ed17d35aca0a00 WHIRLPOOL 831ee7463a01b999f87f60e722ee37eb4bb5be585e73a283bd017f8829d85a753bfc756f23538e7abd2d05d748eb7121a3a4c2f7cfcfe607e9745dfed29fb52f
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0
 
-iQIcBAEBCAAGBQJT5RylAAoJEC7dUkA7aK9HBmIP/13VpmljFkWYa2zd5TXq93y3
-UVPOtrz4gmIDpwA2u0LUp9+vhNp4AoQ/tg/+n5f55t+4ynkbOUy4PQEMEyVnLbIm
-i1gtRzUsrJsQ2udg20/k9sbWDyNmL8E2dY1LwcVg/r22sQ698N+W9+UIJMdL1h0q
-PJSleigKhfYi48CV+ztwM69koscKSY+1gKZQt5NiYzwDzRg0stf3bnvgH5AzQ0b/
-H7IcquIcCB6HZ9A6q2XCAM9iWqY/Yzx14mweAZ2TTYcg8R+UJsnve9VmDJpi7KYa
-jAqGaZiiagFI8vmXz72S/ffxe8CglDthQoqZwpWfUFxSUw/xf+qSbIIuTwe09Qty
-b1QammQude1VtN1USrfdPRlcJxIQu1gH/m83vVGu8N42xABKDEcmoyz3pXrC8NXs
-qqfwEivpPGZhlr37UNNePE4jYFdhZvuPZRs/KK+oMUscebLkhh2ajYXKIlJkM0mV
-wBCIRJCXqLdr73MEQ9KTovqR5ZrzWB2ASiT4tTNUu8nlKt5DG1Z0TQVRGKQTQ7Bz
-8biMun7VkHF3zxzWRhLzF/TSFB/mhIGw3VUIZYbcr6Xws/BPwX4fZDb/6AvEgxgF
-9zulngzbx3E2y1zGzwcj0oGgSwd4uavZjjH7QbzerXMwjconnkv0FEYVLt5Qe908
-KhBq5wolN8qXrVXDpNI6
-=9kJm
+iQIcBAEBCAAGBQJT5nh6AAoJEC7dUkA7aK9HbEIQAI/3RrGUue6MUUyA2JoMMXmX
+EuPKRfmL2lZq1+bYaai3B11sfgeoG7f9JJ9mJMrGppy06tJ0LF/NVfRIK/02BrcM
+im3fnUJRyKfu4vzu1DQxmWPJquniu36sghecixkIwSvtUosJ+3uoMtEOqfGUyrw4
+Z8+P4esx/s/xTn0H9hXMV1SWf1xdsTVXNRjP5eJcYtdSVstmo4iyAsTOL2W51jMy
+K3m66omLuENdO99O34BIpcWgFlJX4LIZZRVjsxnAoZGM0zZ+hRpvqc86oDgJIxxj
+qF24Uz3tF5HAHXnCQ9fZ4jdAIXvxbxhe2X56nC7WDjZPYxbnv7jjFKZH07bPMe/f
+S1wFV7SbvIEQz08yyLByj/YXHYCNEcDw8uQzXvO1I3YmpH3wTZcN6vnOBZr8RDNX
+e3FfjT8ZdnT1DEbx4olumHnVd/zs4ztycXwugYHPtH7PZDsyBgyFb3Up2G7eLhEk
+NrU5jqAN+yTuNXhdDcT/TdVRAGF08yGG62IfWIA1UtvVNEmkZQR0cgkg1EPvkpYJ
+0ivJtZsALGihMJgLVBNgnYmFFLt7BSCBNODf/AjQRQXHvGFd2I2ouWu6AAffArz2
+C99lVR6KtQAI7o43G40HQpcRuKkXuK/GNIBoespHEiWZX0whaB+StCXpq9UiPkkv
+hbJYv+60+jXwAbOn1Gxu
+=PvSs
 -----END PGP SIGNATURE-----
diff --git a/sec-policy/selinux-usbmuxd/selinux-usbmuxd-2.20140311-r5.ebuild b/sec-policy/selinux-usbmuxd/selinux-usbmuxd-2.20140311-r5.ebuild
new file mode 100644
index 000000000000..4a568c83b585
--- /dev/null
+++ b/sec-policy/selinux-usbmuxd/selinux-usbmuxd-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-usbmuxd/selinux-usbmuxd-2.20140311-r5.ebuild,v 1.1 2014/08/09 19:34:19 swift Exp $
+EAPI="5"
+
+IUSE=""
+MODS="usbmuxd"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for usbmuxd"
+
+KEYWORDS="~amd64 ~x86"
diff --git a/sec-policy/selinux-uucp/ChangeLog b/sec-policy/selinux-uucp/ChangeLog
index a92caed6ceaf..70739ac912d8 100644
--- a/sec-policy/selinux-uucp/ChangeLog
+++ b/sec-policy/selinux-uucp/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sec-policy/selinux-uucp
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-uucp/ChangeLog,v 1.41 2014/08/08 18:49:48 swift Exp $
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-uucp/ChangeLog,v 1.42 2014/08/09 19:34:41 swift Exp $
+
+*selinux-uucp-2.20140311-r5 (09 Aug 2014)
+
+  09 Aug 2014; Sven Vermeulen <swift@gentoo.org>
+  +selinux-uucp-2.20140311-r5.ebuild:
+  Bump towards r5 (fixes duplicate context for hiawatha)
 
   08 Aug 2014; Sven Vermeulen <swift@gentoo.org> selinux-uucp-9999.ebuild:
   Make 9999 ebuilds EAPI=5 and transform to make master for version bumps
diff --git a/sec-policy/selinux-uucp/Manifest b/sec-policy/selinux-uucp/Manifest
index 229eb6690a1b..93ea5e82b5c1 100644
--- a/sec-policy/selinux-uucp/Manifest
+++ b/sec-policy/selinux-uucp/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-uucp-2.20140311-r1.ebuild 445 SHA256 175933157f0500be2786969e1548900b14fda50a535e174e38d78d4fe0905658 SHA512 ebace4b6309b3eee2773e26490caf70dc97c84067d90005eb7072dd165c6b37c8f833acdaa00f9af499ea5617631a6f64e58c210d35ca6db06be1f4a6a5c8601 WHIRLPOOL 50b019a252439ca089415204043147ae3e9ae61cd637c4e2efc7eb597c32b5482ff7383e0e169fc413fd1c94e10a19e95f3fee89234f838f5b89452d548ee368
 EBUILD selinux-uucp-2.20140311-r2.ebuild 445 SHA256 a5af3aa54573a77b9c19d7f528533bc36f2369da30399463c50736209cabe318 SHA512 9d887b00a8cfab63d1e4c90d057c4a62f6e88eb20d0e3caa6f25f19b6d8cdc397530276fd966dadfc52895e1d5af12c9fb4ba3ec3b8a796af0ce15701b0546de WHIRLPOOL d0d17a4ca6baa91ef5485240459699280c9a8341e014a76ee431f45c704fff90caa8aa4aabeda5a85cffd9dd41dceca3576cacc7009c81580bd6c3a70c7bf218
 EBUILD selinux-uucp-2.20140311-r3.ebuild 445 SHA256 8ea32fa228428b028231c3839b3c82fa5c9236eeb31746a5a32bb58f32d69e9e SHA512 5315b977b763d6711cbf97f8fb884bb219079c5defd3820ba47d16b78b5ea28b8d71f5063b9626b01af78524441d4ccceb21aca3bd8b16bc1c3c6f1e680e0ff4 WHIRLPOOL 17b37367bb0e4fa6a58d0a61517dc4fe9f3b3d15f60d6494237dfb9f24f80355106101a1119b3a1478cbbcfea61b88760f9462d38153f68b001550af54f35eeb
 EBUILD selinux-uucp-2.20140311-r4.ebuild 447 SHA256 1e44f8851281d117e864903e5667ce334a94b96f94fb854d79184e1811932234 SHA512 b9d4a08abf76832546f71be4bb975f71d807b009017e94fcecb056cfc1b6bfd8fa60c1e356e93052dbe527e8e51fbdb83ebc849f02b1596c9e57544be0e14d4c WHIRLPOOL 0929f8a370eefacfa84d1d76d14ea0be3fc5fc5979465c0714e5857dca6ef8c34c662ddb6f57f76fe73d9ef7c93cd3b8ee03e7a5b94695f41f2ecdc9f213c3fe
+EBUILD selinux-uucp-2.20140311-r5.ebuild 423 SHA256 23cef3022c6bc729045eaf3efe0e7feda06b8ac5d07abf037f74a9725fc4d794 SHA512 cd16745f369506548950f59f32140475fe29a8149bbd50e08dc3ea24a61e59a389e80d4367de78a4b5dc72646d32d62d86ef9534ac0c2c5332c09666d51fa9aa WHIRLPOOL a695bde3e0ba3bc3de876a3d10cda26aa920d9eaa89ca8f5f4fdb006bf90597135cd406f69109c7bbb1059ba50a483c92c6e4cb0f1e788d7950eefb88243e2cb
 EBUILD selinux-uucp-9999.ebuild 403 SHA256 cb865882fdde1ac39eee7ff3ad0183242f5d83c15b8dfe0329e143696d5188c8 SHA512 a50fbdcfb0e016d9019f81707c8a9b285228ce70338231e5ca268953d6102a70839f073577491c573cb54c69d5f0dc2f38bb0e6f1c748d6a5430cc4ec793c6a0 WHIRLPOOL 4fb6e1b999f83117aaa83fb57a69c5e63cf5599565b291fa2af2dd03ea6fcf205bbdac3255644e2f71048aced7fcad154d2ac5c3e5252ca5ba4641a30b1e99f6
-MISC ChangeLog 6212 SHA256 c80a6b09e9232d4f3b466c24f0f5bf2584582399dafee10eb8188547bc907624 SHA512 45867795e46ff57d9be93f80b14e5d43f8e40a01ba3ce8fa2210fe205a6fa5a7753df7e549096883b4226050da50b5f1269fcf4f58be847a8a980a44c7e0c642 WHIRLPOOL 890af6753d3974870887f011db09c7af585db52f2d36277d9913d7c5beca5d3e0c5edf73fd70670771dc770c751cce6579f1997bb22bb6407f7493de0d14d0bf
+MISC ChangeLog 6400 SHA256 accf8dd2713fb8c147a57c64f1e921e9b11a66b7825955155e60ac737c46fdc6 SHA512 46b50526cfa3bb720cf5f2c92f25cb4cb40ebaf232f634050a8e256ff8b5f7a0a88ac0c5fac39cd7c71cce8edc60a2dccb701dc7653410ec63e1539614958bc0 WHIRLPOOL b77e18299be31749addbb1af879d99f76b40cd307d635f26dc714a7b6151e115af58b052d9e88978030f2ba6f876a144a914ca050bf069a206ba8881c2b351b8
 MISC metadata.xml 228 SHA256 ebb24771c60911fe64bf067b6381ff4b4e4137c643ff3d56552a8873644996af SHA512 cfbfe0dfe2e8095b767f831ef8a159dcb608ecf26aa36da68708a4a81cff4ba5fc4f320a534f75fdbfd4fb1c733b8660dd1bcead1a286c9ba80b5296164c8a5f WHIRLPOOL 44da1dae82b94c7908fda36a9dd5a2defba1b302be440f4cca4e653de69533ec083bcff1fa039907c99304e2f9b1c283bccf8abb88217554edb35c55feaa0514
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0
 
-iQIcBAEBCAAGBQJT5RylAAoJEC7dUkA7aK9H/mQP+wUhge6k/hNgal6vEJXx8MZl
-o0F7kYfrU4NsinNCj0uiyA0gmdFdZxLaRAHPPRMzRRBN61XpvS6xZYVdu9J2IPbo
-lzHiLyOZbqFjPTKMiyBlAVygsOZT6WvzMwkxnJmurjzVYWXr3XqHbhSmG8QgOfjr
-eFmwf2tEn78Egp6REm6/KcYpEKLjnF9CUyxnsz9BBHiwO4ZvP5vCZtIStco3q3gg
-IuGYmg2V68SVqgkgpI1dPzNuOBl93xs55mTIXaNLcNv6lfx0zn8bGxhc5PhOQCYS
-NyK7tDhj6MAG0zlWXQRQdhxXX8hYO/8dllwUNnObB6Sbwg2J/xCMU8QXDHDtt5Su
-e/P+L2OAF6t4hLjKW971hIjDofZp6QOqpzUc/6kiQD/FpFnN7btm8Gl/7aTFrl1R
-F7yhq/CTlm0RlAWDBHqTR2wY8lMf+OjwR1qoK9moSTA6l9fwmynel5pKHHJqwGmF
-U5ghvrrUezO5FdYqWAml3O+T0R7z0TOocuOky53K/fWbzjt14Z9FnVJi9eok5OLG
-xcl6OCzimXzyY+TQJ0y+BlfHFDeqqgHPWA/x3+daMymMPndFHwyvWS6KwXQhpREW
-eP3km+tGqZj93pisZ38DiX6gKoUWAGXWLm/RfNuDCWD43kxYXp5x7sC4Vqqv3xvO
-qeggcPna7faRy1+7ZfVq
-=NXNE
+iQIcBAEBCAAGBQJT5nh7AAoJEC7dUkA7aK9HYawP/3eEq4+AjIoEfFhiYjrJltpl
+uQKrjNkR7xG0MCi6ESNM+JORAKfXsXnQ/HFF71CGDUeap9UPBIF82YTP3rajEqeQ
+fIL/8vg2G9aLaRm5tz7y1YzIBhOdZ91Zg7HuVcwBibxLhpIlJhhdmSEh8RUU/6k/
+W5jCty/FSj5PCSZtOUMEuzLyTgM7rJ8ONjc56QmLrX0tj1Vi0Qpy5n8a0RToNDYr
+kt9uXGeE3D+aQjw2x2nJwzQC3BnRpp0uCX2JbCNuYJjnZzerKJ4NQm/zF3a5vYKY
+J9mR0OuScMoQIXFpls4mtIriPuCNt84DFtBatJ5jTr/Xwx0eErQpEc96vlHxxR0M
+efHfG5AkO2xCVSCURR+GUtauAKT12tKRMWYaH9YYEpGmDbo6BECVWajzg/Elfu9k
+6rTDmoyjXSnW9mkCfYGqpYkiVOeDWjX2EBvt3o5ojTCVYdcAJ6bgo1pVCwqRIIuk
+Bf0FoBEurOnTv6THHoTsaLDceh6vx7LsPWjT2W2HGOjHm7GeYbv7SJJFgfs804sL
+XPud2sDYpNAL+J/yA5X6OArmpC34X4/ufHUwl9wX6IVUqRJMg69YPNyvbdUxBBxz
+4d/wfQoLdP3SQe2/9JoIfpd8Sq13hHD0mRG7RjY0g8Iv81mnFx2WxfW3dzabru4K
+r8ZEagUqYe+D9cGLUOwJ
+=6v7Q
 -----END PGP SIGNATURE-----
diff --git a/sec-policy/selinux-uucp/selinux-uucp-2.20140311-r5.ebuild b/sec-policy/selinux-uucp/selinux-uucp-2.20140311-r5.ebuild
new file mode 100644
index 000000000000..f7b4ea4c788b
--- /dev/null
+++ b/sec-policy/selinux-uucp/selinux-uucp-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-uucp/selinux-uucp-2.20140311-r5.ebuild,v 1.1 2014/08/09 19:34:41 swift Exp $
+EAPI="5"
+
+IUSE=""
+MODS="uucp"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for uucp"
+
+KEYWORDS="~amd64 ~x86"
+DEPEND="${DEPEND}
+	sec-policy/selinux-inetd
+"
+RDEPEND="${DEPEND}"
diff --git a/sec-policy/selinux-uwimap/ChangeLog b/sec-policy/selinux-uwimap/ChangeLog
index 459e7e799386..9a018affc583 100644
--- a/sec-policy/selinux-uwimap/ChangeLog
+++ b/sec-policy/selinux-uwimap/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sec-policy/selinux-uwimap
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-uwimap/ChangeLog,v 1.39 2014/08/08 18:49:39 swift Exp $
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-uwimap/ChangeLog,v 1.40 2014/08/09 19:34:04 swift Exp $
+
+*selinux-uwimap-2.20140311-r5 (09 Aug 2014)
+
+  09 Aug 2014; Sven Vermeulen <swift@gentoo.org>
+  +selinux-uwimap-2.20140311-r5.ebuild:
+  Bump towards r5 (fixes duplicate context for hiawatha)
 
   08 Aug 2014; Sven Vermeulen <swift@gentoo.org> selinux-uwimap-9999.ebuild:
   Make 9999 ebuilds EAPI=5 and transform to make master for version bumps
diff --git a/sec-policy/selinux-uwimap/Manifest b/sec-policy/selinux-uwimap/Manifest
index 677ec61764a9..0eb67872cc3a 100644
--- a/sec-policy/selinux-uwimap/Manifest
+++ b/sec-policy/selinux-uwimap/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-uwimap-2.20140311-r1.ebuild 387 SHA256 cbaf0e421df8bb4b897e45faf89b57a074a8cf7dbf69bb1cf9e253c1f1bcc634 SHA512 fe8f059c8180e567eaf7041bd0c6b7ad3d725c3b3339e6177e1b511e7e260fd243796188c2c18fa89fff14c3bbaa1d0cb15f2316274bcaaf148e88a27f0391ba WHIRLPOOL 5a0fa6844dfad3510510176cc15baa6e4316302c76639c258c1a886a95ae12efdc279dbc19a6fad53f12fad0f51fe6657c0b091ae354a58c982517ba252f7991
 EBUILD selinux-uwimap-2.20140311-r2.ebuild 387 SHA256 454c76517ac184df05c6944c64d1fb990b2e4c0d6670686d74f362bf5b8df6b0 SHA512 f3dafd627dafdd448bd9a74a3d168e91c225a1417874fde35463adfe2f075ab724ae28d6f854a700dea4e42c4d2c807ae4a73d469f5f69189db0503e5afa8c8b WHIRLPOOL f788bad423caff6ac4f5fde0a0d5b6e7dbc0e703ad0d9b056f565fe9f39a2ae8f2564e99dee124990547e4257e78ad2f47332ff0c809478c09c100af1233dd66
 EBUILD selinux-uwimap-2.20140311-r3.ebuild 387 SHA256 b97c440e9915bffcf2c3ccf88e5e209f3b3a69a42b2bb5eb75db44afb2758c64 SHA512 3e92cce277bc11b2f1c63ebfac0d00d1cb1770c96387d0560bbdbc175353614a695198618225027fa32f62bd38933a211eb70c560b66e420ba45eeb65cbc094f WHIRLPOOL 654186c91633323bdeb694fa1d14d772f56f6389a4febd5f3533016856d07fad70d1b73ccbbf461bfd624f39de2338323406929e70770192931665b644f59baf
 EBUILD selinux-uwimap-2.20140311-r4.ebuild 389 SHA256 0e7412e50bb21099e655da93d974292c9c3514ac259fd8d4943ffaab137f75ea SHA512 f7bbb1ec2d56c2b3708e0b2de6854af03cce598a6e1b20d2983c6c3b6618deb8b183fe13ab85175337de5cd62efa5c6ccf7bb7f8a5e50ae27f31c7445cc24893 WHIRLPOOL fb15465a86a732bc3cae93674b89e9cf95adb91a18cbbc303b5ee6f1f6268cc7416b22edadbf559f0b237e9f62e56fae910ec684d921189e7998ce7b799e23ec
+EBUILD selinux-uwimap-2.20140311-r5.ebuild 365 SHA256 3813b4f96d396674cb9013e2b38071433dacc75e51b27786a7e014395f7bfaaa SHA512 4cf6cc8e229d370be0508e8154e868cd9aba4ba89711eac4d2d6a336d8b141c1c02d76a97a56743447e5b0ce965d22308f83fdb05d105c3f1991e2e29c0a37be WHIRLPOOL 5fe2e931eb43dd1aa6f54215f5fe815d5caf56d1a967247707bbc6feeba05bca0f122b00259e568fa9e48f28154a808b1702ca0926eae60212e52c8dbd6f9907
 EBUILD selinux-uwimap-9999.ebuild 345 SHA256 c260ff28f91cd2690003c30597454c4b661aa9cfae585367b770aa36a701e67a SHA512 789a4b03e22dd110aaed840d95b5d99670eaa84d38a43ac8bcf07a642854c3444550f681a42858d0f2c44e9883217208f5a38b5bbf94b6f4be38080dab72c9d5 WHIRLPOOL 370d8eca485b923eb42e63e1f4f80f793570de4d90b846c642229e88a671bc90eb086186e8b5df03d50e7b4fbaf85f460be32bbbee29e1b9ad1a75fd591ead58
-MISC ChangeLog 6185 SHA256 f86458527b5824a324b55ac93a349931318388d9bd041860a3084f7cc4d85892 SHA512 1121d7f7fcdcd0c703723c1fc134bfe5316e7cf10e6811df3760ddbdc70bc9025affa074b06f3219f30d7a73a28d9b78064637504f9ded7300c0c6a83c972ad2 WHIRLPOOL 3174873e93815f2263d7d40dba4f950cce037bbe6aacb995d0d36de1b729e2bdb2cd2da84ddef043e798c3b932f13f9339c12bfc1e727b5e94445414b2b3bf63
+MISC ChangeLog 6377 SHA256 357690cea4cf17e33ec8c8bc2895ad22a7a4855f8e59eef852c85d8e2a8e73bf SHA512 6f56a5ae5538fa790489f985658b9d4cf09c5f4a3326e2dd0d16f7f1cfcd76f993f08df6ba2ea713bedc1e9c3b21466ccbf48766f225112399759422830200f3 WHIRLPOOL 33da1e1f33f171b8f8082e29c7d013a4647f1678d827047716878436bcc75cb519cd1245d1f5918d306fe1434cd74e331a69aeddb570867545aba9f921ed9a0e
 MISC metadata.xml 230 SHA256 fb7b031bd8d407d9caea9046fd079daf255a486f8aa82490208ad403e7a8b025 SHA512 d74b8252e1e228cc7a62d73fc1a273b77611f23e3977af335d68a9b2f79254d627a1954f9772ec520518eeabf867756ec346bdc94ee54258344ddb416569aaf3 WHIRLPOOL 6c565e67300032b5fa251caab98ff2cbd333eef9554faa207ad7a0edf6501177048a123339189ce791c2f93db1fd692432af22497054949d8d60c7d7ad0508da
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0
 
-iQIcBAEBCAAGBQJT5RymAAoJEC7dUkA7aK9HArYP/3cPRthvN8v0EA+fap1X/Uo/
-UfvwQiGf40DHmqXVHByxDo09O4a/VmeG3x+GJ7WvrJUtaMOUjIkWSK1kfoozyivO
-BMhjGZEI3WeHXbvzgGH7lqdvgbPMVCYQLefLEFBTY+111+8rRvrAL/vqbGY6kVZP
-tGcx1huBQv3FJOjOkayOp7Bq2OeZXF74jwLCutsEPF6eIqPSS7sfHXKVHV5Fh3QT
-AnGi5Z3fPy9L8TaEMo+gGmHfTbULjSTLInVBDPjuJ5PwKuXUWhv89SnAQ7d5BNN6
-vfg0iGh1GWnNrjbRgBIcw/dgIzJj2wjzU4DFqGF4C2JT3TG6K7GkFeixTc9R70wZ
-5HQy60SUWxiF2vGq3anN55iStaC93VQC/n7tA/ILuGmeurHrwFQIJJaM2XZQm3+p
-+EwGGCWgEaTg8gXhgXJQGrlMlpySdoxMQRrjctfHhe5epRzioeWz4VfEOTpnnMqu
-op7JZLuCPUogIOF1AkunHT07Ikx5DI5cvEoZ4shvheZgA0I0Jv24LDKKLHQ18bFi
-yy4+UfahBKmHf6YwvnX3U1xKMFRHviZ5W0vF+7ZhamXfdC4nodTiWgNAjdVYvTQE
-Sp6MT4VodN2FgbfC6eJ9TBDO8l55o9MTmBobCRd09AcEzsAs9PMVHCQruDEhoN0g
-2hAt/Mp8zbNgL0LR1iyx
-=I+Uz
+iQIcBAEBCAAGBQJT5nh7AAoJEC7dUkA7aK9H72gP+wUIz6yaflpfbGhlnOOAL819
+CB3O0sV/OF8NWGJo0NzPO7oxZ0hjCABP36hzUkgegCTIegT4uN64+ninZZygMLcT
+piJe8Ga0VSxT4kxR3E0dgO1DPLwMX+Df5IHZI+7Uo58pxJCbglWcqJOmAOvgMBFT
+ZminqLoo83DqRzaoXRKY5O4YybkJi72yDu0HOxdp91ZPP58nTklqPxtkWaX1EpwO
+nxYlAc76CITwBiqfFujGYqjZV7vG62IvMN4LmfBZ+5O9SEOzOGgYa8Kvl1xJILtL
+cDdZvHy3Vfp4cGd2YASNyM1tsa1utXM6rdnOpad2FA+vOlY79WYNO5Fmefl1331K
+c7eS2K6Fp8VDReSq7I/eAP/X3MoE/EOXmRgJN2RykibAMgF80Zqa5ZgsgqOK27yz
+8abjpXxf7Hu92ax4wbZHfHE2zzLRHulwevhTbGYdgnwIGuahRPRK9dWjcxB4Y4Jr
+BSNlDBJ7UDPmblUBDEYJKJ3pawPuxpcOPg7iypxi1m8Ismg27w7kWmVfe2hd78ba
+a1QoKotraBAXfD3po+31HeybwFjWRmjmgmhXvSUGVj6jGcy32tmKx7cGGcaA2r0H
+9H7Y/cqc/sjGiqOt/yluxVJkipI5r/+Xql+R0+H5bFoF09OK4Bs/ynhN3LoB71EJ
+CRi/+9jWKEgBgzFnH4y9
+=ei3n
 -----END PGP SIGNATURE-----
diff --git a/sec-policy/selinux-uwimap/selinux-uwimap-2.20140311-r5.ebuild b/sec-policy/selinux-uwimap/selinux-uwimap-2.20140311-r5.ebuild
new file mode 100644
index 000000000000..5f2d27c202e4
--- /dev/null
+++ b/sec-policy/selinux-uwimap/selinux-uwimap-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-uwimap/selinux-uwimap-2.20140311-r5.ebuild,v 1.1 2014/08/09 19:34:04 swift Exp $
+EAPI="5"
+
+IUSE=""
+MODS="uwimap"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for uwimap"
+
+KEYWORDS="~amd64 ~x86"
diff --git a/sec-policy/selinux-varnishd/ChangeLog b/sec-policy/selinux-varnishd/ChangeLog
index 95d73f6281eb..e311db210181 100644
--- a/sec-policy/selinux-varnishd/ChangeLog
+++ b/sec-policy/selinux-varnishd/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sec-policy/selinux-varnishd
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-varnishd/ChangeLog,v 1.42 2014/08/08 18:49:21 swift Exp $
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-varnishd/ChangeLog,v 1.43 2014/08/09 19:34:30 swift Exp $
+
+*selinux-varnishd-2.20140311-r5 (09 Aug 2014)
+
+  09 Aug 2014; Sven Vermeulen <swift@gentoo.org>
+  +selinux-varnishd-2.20140311-r5.ebuild:
+  Bump towards r5 (fixes duplicate context for hiawatha)
 
   08 Aug 2014; Sven Vermeulen <swift@gentoo.org> selinux-varnishd-9999.ebuild:
   Make 9999 ebuilds EAPI=5 and transform to make master for version bumps
diff --git a/sec-policy/selinux-varnishd/Manifest b/sec-policy/selinux-varnishd/Manifest
index 214c82236c64..a43237e9867a 100644
--- a/sec-policy/selinux-varnishd/Manifest
+++ b/sec-policy/selinux-varnishd/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-varnishd-2.20140311-r1.ebuild 395 SHA256 1d57341e7ae3a9b48e8a082b99b22d15e73ca866c645d2310a33014512874b8c SHA512 78053e8a5687bdbf46fc312ed51f2353eb1715a5e8d1d29ac8b8d715db6d02f106bce3bdee92bcba0430c6ca25c1c983c145f266f515687dcafe1fd9afeb00a8 WHIRLPOOL 26d2bd5220f9b709b0be100a8fd3f6a702f7dd09c1986f8f522ba6179a0722a8270bc3467b4df797f27dda9e642d45a5c9e1fbe8c317ca31d7f3f0e1e2a6aa92
 EBUILD selinux-varnishd-2.20140311-r2.ebuild 395 SHA256 b5ab4dbb01c8836b1adf6945a1f5cfd4ba4f6d3aba5421c92cb342b86d29c30d SHA512 0d864aa06402b1fa2bc8a8df935a76a15fb8308d0915dc27980c628ce6c9f6caaf9a3454feee21feffd324a8a6d7ffb750f119a6e692d9b64c336f778c97ebb1 WHIRLPOOL 950bbbc90c87c3ae7ad2dacf43249e4ba566d05ba36d6ac36e6c12000bad608358a2d7b34ce70b3498dcd1ccc091099f724cc83e74c1392a2c0a982585d870cf
 EBUILD selinux-varnishd-2.20140311-r3.ebuild 395 SHA256 7ea155b0ae3ae94bf591c45104ab1c00cd654c9818b72d3322890688fdde8d5f SHA512 8bcd244e15b93281d722dfa1b1b5c699360b34c428d370f26c9b58dc5c4af92f1312a20aa8fa7b9d35a55abba116a2ac587fe912060ed5f9a8e5eef832bb8be0 WHIRLPOOL 3ffe42dcc973b52a88bbd1db985fc6e85d5a5e887418c2545adaf299a9e682262591da9bb940b40ca5516e26ecd7f7ef530149734d457c6f91dd8307d2e9e9ca
 EBUILD selinux-varnishd-2.20140311-r4.ebuild 397 SHA256 5c18a9d5c55c86b73dc92b92d2d2ddf48692dab5449a53d49f6f83c7a0367996 SHA512 72e1fc731b3c45dd511539bb56dac30857d43b5a2f19c3d3b0730280f01ad3579d7225d49d92b28a00807ea1534973d81cef5a1123466ab8d8cfb104f3b707ea WHIRLPOOL e80556753c863e2c67cc3f701189fd728099dd4bdab1a67e05946ce5ce51e918d95f784fccb480ea2398ac14ef49aefaf1bf45a21f037701ded4041679a7097c
+EBUILD selinux-varnishd-2.20140311-r5.ebuild 373 SHA256 d3e5ba0833d44beefa606e03e697a79ae2a3df2bc86a580174337ff18734e3fd SHA512 77eb00706e317baca48f24522ce77fc753b25dfc834e9f007546aac5b0e70713e57eb7a49aa55124384e96e34f38fe19943e238d97ec603dd80f361156901368 WHIRLPOOL c466d30ca2128bd1c8697b300752bbf0080934cdfe0c3998263b82e2825374f7b9ef40bfa8f8d81b5e82caa05dc677d9307c90a1736bb62ba11f5d01cd763191
 EBUILD selinux-varnishd-9999.ebuild 353 SHA256 1ed54fd58d449d764c12090d489e46814befe4347398de3ed74e52d19ba05c10 SHA512 ea7d31bfbb2e2ea132df751dd59669e29030bd5e10aab2a3db86b5558d139741518c7440ce1b3d1cca422e704dafec855bf488ab365ad5be73e102f748b7f4e5 WHIRLPOOL db9300a645509b3a1dc5e95d78e2dcdd50bf58da73351808e6f21d6e85ff809ab94d290ab74736248e592183007c88f5c769e3675a61bad18f6a4c8c36f67613
-MISC ChangeLog 6671 SHA256 bd52ba2d0d9486db78e303afbbd6682a60b38fdc34717c025ce5c37108387ef9 SHA512 d858a0ee6d148db84d775c279a83a13d676d264903c2e1f690b90ab6fb45854dab3a05ce1135256a0ff74b919c2e34e5828b0a119dce983a16ae0931b5e61673 WHIRLPOOL 6c84bdf3adf38fe12e64a51bc1fd39612ce8b4770ab8f1f0c03b595d2343687bdb657b1afff7131fc30801d32bd03919c2a2e8f2d32d8465346f64271efeed77
+MISC ChangeLog 6867 SHA256 0ca3564a423d8b351abda104642c7de0b420e499f97a8cbfbf3535ffc89513fe SHA512 dc54ec30593ed1b97ac88eca3a7ba6273b888380e805789a7f99add6c91217358fbd4adf8c117ccba23ebe54accdad13bbcd5cf32a5a7a25b127c1112dacac05 WHIRLPOOL 6a7ac990452c70dbdc6fb9f33e07f4d563baae668b450e50921caead65793f87205b23541dc663a70d9c9ff6cec74caa2b20cd3863b1984d4c869a7e820dd907
 MISC metadata.xml 232 SHA256 582cd17d50565a4fbcc960cc562bf75802e15007d4f9d58b386c64210e92f2cb SHA512 d875e55e4784542b99c003fdfdba9d7ae0d7bcec86a5ca20e7ab942db24597b86be2bded9f276cae408cce466409e07f7b06fc901fd4bff23e65efe2690bec0a WHIRLPOOL 51d2600491cf49e5665d2126c6843354e153e8e5bffe3924f99a7add738a5a39cc5b8874f590ab05f59ce8325b6e05557a1698f55a6e996cfa5d2bcb49ff8228
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0
 
-iQIcBAEBCAAGBQJT5RymAAoJEC7dUkA7aK9HdOMQAJHlFBzs6JxjeciH0JHOi7eV
-poIDPTpqw1zDejTolxFKua+aKiLoebkLj2H21gsm1tc1/jm6rEC2PxzQME6e1RDe
-8xVAV06sMkGKeIrNGsFRZOClM9sQmXW8AfJp3XrLi1pJCFZ0SsbQqGyxUtkfp3qw
-y8P23VLMofsBE224MzuKTRf4pBWQdIBm03HURc5Xpm00NBBqBz+xPQY2rZAnZmX3
-Q+XDs+QncC7RgB4YisKNh/3+2UnFKXPbjPxQZuDFAAA8vzXGq64IRCNZ2dZ4acSY
-90BUScRkE/ONREEi3bSzOmRkX7c3hmsGWdchNLiYcnzX1FO8KPFdiFdcbNP99hw7
-6iOhcXmsi5NhwZi73W9U7Hq0Ef6Anaj1M52HRWK+IIt+qSkrsUoTQ3r7YLlY6Vo3
-WWE6Rd43quQnHiSl6aD5HklB454Id9IIRUwk30Q4lrHZMaFq7Xhf9BMEn84p/C+L
-sLcWTTaMcGLgn24gfE5qjIgxOBaoDvpyHPKKm0HTT4fm5ZD55NCwYCpDCGPJbmuq
-4h1/iIfSfb+L9f3u6ULsZq2yQcuxDvRbxudxM4ms89ly0czudrM10XEJlThagA1q
-j57gu4K03r8ggZ/doXcbbTlZyE4oPaEQNQfL5pD43IEfZh5AVfeiXBO37FOFd0B/
-+mGupqspX75G6E9+gpkh
-=9gdh
+iQIcBAEBCAAGBQJT5nh7AAoJEC7dUkA7aK9HynAP/jlzFEAFKpRGYEsx37pCJe7g
+NU/O18t52tGsutJWffd1tlVUpzGoxCAYvSBz7QnU4QkvHrM3OWR3VMUZnwR9n0qZ
+e3EIYGpWsFpAUpYH5bgDLYswVPED41tvyDOi8qRsssQn2gc2ZmjwyEAeHGe0L9MC
+EexOw94VlMSHGYX2pefOeTPkGvt+34XRU9eAUNeou3PVpy5sBtUmbk/NF3aZNTYg
+MVbdNEsJ8UaNb4H0OcXgfmSq/lAsnVD0BFd+Ect4VRiVY6cKrT0NeroVlnfkMPww
+Usx4d1fmz0VvO9N1xgTj4/7RZsVRO/XbCN1cMmG7k1WuIkjFqdMaabItMyihl8py
+W7WnJiagJ+zgAM9h5VlBRCQygmXq7a6F2omNJgtJdiZEEIFUCjktWpRmK3sUoQK3
+BWEds/HLhiNJL2n36PzPwifFvWNVGOg2l757iKjKlPgrCIMp8ZXsxnBCPtdsCwJ7
+QflQikf5SodCqxCujIo9YNW6JoSdsvC+ZxvLKlnPpQAXlPmeFpkwA23Gjycb6JD5
+7ELrht2PVqI76xASJOcXs4EXkFECPJsthYe3usbIm7XpP2qv4ZKIU1Y35HKkrm8V
+sXyoOuRwFDfB1Y5wW7ngvI6fZviWLcNqzj3DKzh64jFVyKjdtEI/kijw6XHEC2do
+obQm2T4D7ICpro3AXWfj
+=T8bq
 -----END PGP SIGNATURE-----
diff --git a/sec-policy/selinux-varnishd/selinux-varnishd-2.20140311-r5.ebuild b/sec-policy/selinux-varnishd/selinux-varnishd-2.20140311-r5.ebuild
new file mode 100644
index 000000000000..9dfb079a10f4
--- /dev/null
+++ b/sec-policy/selinux-varnishd/selinux-varnishd-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-varnishd/selinux-varnishd-2.20140311-r5.ebuild,v 1.1 2014/08/09 19:34:30 swift Exp $
+EAPI="5"
+
+IUSE=""
+MODS="varnishd"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for varnishd"
+
+KEYWORDS="~amd64 ~x86"
diff --git a/sec-policy/selinux-vbetool/ChangeLog b/sec-policy/selinux-vbetool/ChangeLog
index b9e23560087c..ee5ea2102e81 100644
--- a/sec-policy/selinux-vbetool/ChangeLog
+++ b/sec-policy/selinux-vbetool/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sec-policy/selinux-vbetool
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-vbetool/ChangeLog,v 1.42 2014/08/08 18:49:44 swift Exp $
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-vbetool/ChangeLog,v 1.43 2014/08/09 19:34:42 swift Exp $
+
+*selinux-vbetool-2.20140311-r5 (09 Aug 2014)
+
+  09 Aug 2014; Sven Vermeulen <swift@gentoo.org>
+  +selinux-vbetool-2.20140311-r5.ebuild:
+  Bump towards r5 (fixes duplicate context for hiawatha)
 
   08 Aug 2014; Sven Vermeulen <swift@gentoo.org> selinux-vbetool-9999.ebuild:
   Make 9999 ebuilds EAPI=5 and transform to make master for version bumps
diff --git a/sec-policy/selinux-vbetool/Manifest b/sec-policy/selinux-vbetool/Manifest
index 1289bd798eed..134d0c56fb0c 100644
--- a/sec-policy/selinux-vbetool/Manifest
+++ b/sec-policy/selinux-vbetool/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-vbetool-2.20140311-r1.ebuild 391 SHA256 8bd95c84d48466588165ebb9b4a87acf4686cd2a9f9c8178f51233e5467b7ad0 SHA512 1a86fecbc2abeb5061c52788bcc21a823c2b04856ca421981896b09b2d43707fac2e4e9427ecc7b7b247d66683422b12604f2f238922946e51707b761e474124 WHIRLPOOL 64493bc52425aeeed1de1e653d575c8e74a7e9b4f71adf927951842fca451777425e8f8bd067bf2b2456feab655aec81b8847ab9a2d625f7764b3b221afac180
 EBUILD selinux-vbetool-2.20140311-r2.ebuild 391 SHA256 b1de4aececf0bca7e71547b205e19a4226d82903b3f81bce56fecf5c8cc62170 SHA512 e7cfec19f227ae5b9d6d404ad17450a7ca2ab25d4562a53a24373e3b2ceecb9d1899e65743586879f9c2bb4ac2bc40480143bbe738a271ffbdff8e121bcdafd7 WHIRLPOOL da6b546d13003b1685597341f23ec25672e8d77245e168e7f7401d8e248a78e60f6629d646db2f86fd7d5c525da4dc7c8186b2e6c9f1eebcccf4d3d4af5a880e
 EBUILD selinux-vbetool-2.20140311-r3.ebuild 391 SHA256 819426e097a1c98596d899ec246fabbc06dbc10a3f7cc069d120a92a09513bc8 SHA512 39ea9b6ef435bfb049f455f7cf959dd3e46a37ab9ac20df32c5bb4e98c27959aeffa9dd56aff0053fd00da4e3c948505627da4546e8252988ae9e7c6c202127c WHIRLPOOL 87d5eff20683f15a46a5a9c420fae9a45503d526dae2483e4310f2b36d9de8cb7625ff385e8b11af7d132d8cc545e3217151fb1ae4b399f4029367ae04d4b193
 EBUILD selinux-vbetool-2.20140311-r4.ebuild 393 SHA256 6cc00cdc4326b0b1ba6368ea816a780dd7ebdd3e1d4c5c0d7f931cf0b8f3dbe3 SHA512 9a934e23a965f94906f5cdfff4bcc38010e3c712461d6caa1a86b0c26c31fb05ae2355970897f2f89ac70ea2beca1682f3f67ff786520183e56b11c4d40788e1 WHIRLPOOL 1da30b85295305762d6a1d5cc5ef06126546692af10fb0a4ccd0f9e4d302b08b85f0d02f74dfa0e6d9536d9c885b1f04dc962d13c254a16d99191c862ed01898
+EBUILD selinux-vbetool-2.20140311-r5.ebuild 369 SHA256 8ca6a0574ce1b839bad0fc3eb462bb55892768efaa2304f1149e672edc6c669b SHA512 5c17fef2ea183fce90b56cf591f42aa36d6151e29b16fdd3c06323fe967f7bebb9f928d7915b4b775f8015c35f5ca8c839ee498713cb58164e8d0b868a0d7774 WHIRLPOOL d57c4b52d39bb4dce9058c718134075a7dbf990884cf4e2b432082cd7c607bc76151edc37181dc58c706a4dca666052e163be8da8c1113528a5386c68214e64a
 EBUILD selinux-vbetool-9999.ebuild 349 SHA256 5135afbcbaab02bebb7eb4e55a76f82aa76343a33105b9458dac5ea53a9b793d SHA512 144abe9709808e60f149bb79c8031bb6a82d2bd34ae1e49b8f427c2f9f3d406527b4a95483c21a60a395f63c535a2835e1864b69f1928a47af2046de47c001d3 WHIRLPOOL f35bbdfc056a34113a0f75c1cf464d4b15ffb1636b5c37e1d09b1e27be1bc24130d4e8157e868c25e60b660cc4e82867c2f8d5971ce7cb5a5ba56e91d3fd9cc6
-MISC ChangeLog 6588 SHA256 dcf25da729c066b341bd8ab90ee84fb04a10a89e928682a1897657f0e758ae46 SHA512 db9af4469562b3537a2b6a1d59f5046eb532202ef020f99fdd2913ab0a36da361436be06eb230022c755df567d93ea9c23668c17c9371ee64b9e29086d2e08b9 WHIRLPOOL 9a91170d057defbf163d425ff367d89c65748da1531b926a12bf6912d10aa32d2f89fdd1bf7e2adc1526f373e27284182d50c2ee7c83622d80c0e74cb5648e91
+MISC ChangeLog 6782 SHA256 b3a1da20ebd3cff1bff655358f11eafe5af79757854b63ad1f7aee3558b589de SHA512 937ed4fda5834e07ffbc761e16df6d5f82b4858f2ea98cf05ae3b0f0d46fa1a741237388a58617f96d52b413cf221e571ee124dbc07efe5366ce694a041df606 WHIRLPOOL bcd1bfe88492843df97bf8e1b06cc107ce986081e7488ca30799aca88bc192fa39b64e4a93f6b02c98abb60a801cfeabaac84a0944d7af45c10fea96a18bdb74
 MISC metadata.xml 231 SHA256 e2ce0dce1e2b012b3b2ff0a045bed11e8692978f69fd3854a59a18944e2e8ac2 SHA512 a79b02a516524b2d3a45e30e13c5e6189b6680a437ac6fbfa010547f6855094ce436bbcc0b384f0433742c25e1d00bd7d5df671fb3adbde4b78773d9cafd3465 WHIRLPOOL d624ed7f81db0de8a3f4f6adaaf97a3c5869627d197fab9540531e73bf8af6789bf8f574a4fc271f8071dbdc174c7cb2d7fe8b1e64e6139e1982ab2683a0c021
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0
 
-iQIcBAEBCAAGBQJT5RymAAoJEC7dUkA7aK9HJTMP/2MbEEBduvGBHSP+mHdXWnp8
-mp7gSgQJZg2Np4kHad3sIGcxIMaqDh+3UPxb8iqg6NL69SCIKq7xDrDWTXzExzw2
-0gxGG+vvSS3Ol1tDbRFkJ3bDT2Ns87EtdQsezDm26utyBgav+deC3MrTpC0cCII5
-WjnCerdgT3WTXsxrWQehLLrJBGuLw4pqo1BKunm5iMvcOrhOyJ4Bt8MKhJ4W6BmY
-6F7yVXG8Ck2OR1MNyahoE8FLxtcgnZGZoudKmYq0J1uVT3Bdm46UPJW1A5Os1QaN
-zU1pxHJbalaevj71eadEJUBL/kKMNbx/ekf5vQgeNsW4vWLTbB82QEK9IzrzNO2c
-k8tXm0Gt/QE2smnLUmPM//IhfSkheH3klRUmvRFQ1zMnWYcUw79LftM+xl0EyqZl
-4VdKR153Sa9IvipgqbpUT64fkXgXe17I2kEqjFhWe70oTQ5rzAkwbv1HyQbvi4RT
-n8VXbpgvcgsiJ2mA0p/2AG9hhrptYV+ID+epPClKxLqwk7XFHEPx00TGvVPOuvk1
-2HD5vvRnqayRXRR9/naXuylhhpOERHycPMSIGrId0Db8xyFqb+OxPDwudqKLxGUX
-b/iySUvtxqzX1v+DS3gVZrvLPPEpBmDvzvCViBg2IS4rrcjv9Y9XxXCLUovlOncg
-5knMNL/axrx7kgrpXcgg
-=HlXM
+iQIcBAEBCAAGBQJT5nh8AAoJEC7dUkA7aK9Hjn0P/1z7TGuW18MkynBoPCBjHAoB
+cpAH1O0LqUIiwhDi8Nsh2LnuI0IqH9e4pJTJvPXW0U+/DuEwyFMPvso3ZilT/zyy
+61VIafpvKLeeWcmSDK2A7ux+g1k6iiRZ1zUA0ZObtEQIM3c1R6KvAop+7zOBuqDB
+WdoK5ACQA9Xv0Ti37T8uF26MiOX1nv/U2n5CnS4fIsWesnuxPzk/9m2fddaEPgfl
+J0LdD7psHTAFycYlBwuqWZzcQx5PFyt7DCvDu83zKk/A9x3/id1x2aiycodiXCmd
++ffnhZAxON4qw84OjisvZkYNGsgBT8wKIH8VPvU6rD5ufqVrij996rRubg4VR0v6
+N0yNpQC0FoVeiNTjHgJaAciUDoZXosQWwlQO4ecAPzA74czlz07XF/HHCpHBYYrB
+3polB2KORhvizVLzKb9Ib1OXA9JIP8zXk1ew9ptrXZ1h5+mnTIUzJa00YSNc64iI
+PK+oSIRFzsdwMfHNyepJKPRpsLiGcasjA5T1ilJ9OghCRHS1gD0LNkaranOOfyMa
+yijifaJv7+jJegTpq89inxg2Jk4ZKiat1+cm2fjCUHFsfQg+yayqPyc3UNPUBw3A
+cvGSKLRKYL7sgN2vhW83UlwpJyywHSwUCOc0TiivDXbSkMWP5LHLydFsLQxcT1Z7
+51G+nBt23gAg4yps6C4j
+=IYK1
 -----END PGP SIGNATURE-----
diff --git a/sec-policy/selinux-vbetool/selinux-vbetool-2.20140311-r5.ebuild b/sec-policy/selinux-vbetool/selinux-vbetool-2.20140311-r5.ebuild
new file mode 100644
index 000000000000..3688251afd46
--- /dev/null
+++ b/sec-policy/selinux-vbetool/selinux-vbetool-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-vbetool/selinux-vbetool-2.20140311-r5.ebuild,v 1.1 2014/08/09 19:34:42 swift Exp $
+EAPI="5"
+
+IUSE=""
+MODS="vbetool"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for vbetool"
+
+KEYWORDS="~amd64 ~x86"
diff --git a/sec-policy/selinux-vdagent/ChangeLog b/sec-policy/selinux-vdagent/ChangeLog
index f579c82e3ebe..eae316406551 100644
--- a/sec-policy/selinux-vdagent/ChangeLog
+++ b/sec-policy/selinux-vdagent/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sec-policy/selinux-vdagent
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-vdagent/ChangeLog,v 1.29 2014/08/08 18:50:00 swift Exp $
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-vdagent/ChangeLog,v 1.30 2014/08/09 19:34:34 swift Exp $
+
+*selinux-vdagent-2.20140311-r5 (09 Aug 2014)
+
+  09 Aug 2014; Sven Vermeulen <swift@gentoo.org>
+  +selinux-vdagent-2.20140311-r5.ebuild:
+  Bump towards r5 (fixes duplicate context for hiawatha)
 
   08 Aug 2014; Sven Vermeulen <swift@gentoo.org> selinux-vdagent-9999.ebuild:
   Make 9999 ebuilds EAPI=5 and transform to make master for version bumps
diff --git a/sec-policy/selinux-vdagent/Manifest b/sec-policy/selinux-vdagent/Manifest
index 71806f5a0ba8..486739e4ec50 100644
--- a/sec-policy/selinux-vdagent/Manifest
+++ b/sec-policy/selinux-vdagent/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-vdagent-2.20140311-r1.ebuild 391 SHA256 b6ee8ef2525395e7a237ca5fc12f202bb2ce490d44f1d95390419c3d117f5637 SHA512 891d7e771696fefffe1db149b2b526a5827bab6c1e6e6969e4183d79634d00c2259fcbf545bdcaa82e3c2d389985f81b136112c209914d9918222a98c000524f WHIRLPOOL 8924b9e930a8fad0b4785123fd4bb67b885ef0c90b82ccb9b7dbf10ad9876ebb10cb5880a233564a76e5529f463b76fe16a30f8e0af03f36a81a9a6b21e57da8
 EBUILD selinux-vdagent-2.20140311-r2.ebuild 391 SHA256 6403c3c810ee8e4e89302ec1d05772b2f8671912c1a56becb79b680dde5cc66a SHA512 fc16fbfae023e2e8ae72e20020746f5ccf758c3b6c4c6d56711e139df3777b25d1522f5d780349577c5882fd94add73d1c239c4e773fafaa29555840d97938be WHIRLPOOL 13453f61c624f19bb2b1438ae7825013e77dff3a92a5fba5d6e14da4460e85714fcb5466d693901bab34ecdb5eb206980e449a5e86a52080dd2426580edcf765
 EBUILD selinux-vdagent-2.20140311-r3.ebuild 391 SHA256 d923587f415d88f6c5949ac11e1b8e9b7e350e14b8c4d05b17071012fff6c45b SHA512 841e7d83354a6a2d3f9473174e649588dd3608b147f8596504581c16baf133919a0c21698b5167e761b8f4b85efe82c55769cb6a839de1f7751b003d2460fe61 WHIRLPOOL 255c40960b13f3ad01ae1469f9a7357674a2853bd2433e1eea167be2bf4b25e5e0d80419382433e0334649959e5fb5d53d8a5ed977fca79d86a78fc960f0fa28
 EBUILD selinux-vdagent-2.20140311-r4.ebuild 393 SHA256 0ceefde6ba2a19c052f610c4ed35234a42f1a9ab76c0cc61724295ff7846b1eb SHA512 890cdbc5f4a8b114f04eaa4adbf520accfcf50e68aecd76de4f4176bf3194360b3a2c15f0fb4d220915df683121e07b8b6d9baad5437ce7b835ad931828ee277 WHIRLPOOL e3ee4efd98ff7b0dac2e5012039ddc66c4be75da988cf1fa72a30e4492cc21184292530a4d2aa5baab8f784eeda208482c4cd3ff5acc837371e1ceae7c05bec0
+EBUILD selinux-vdagent-2.20140311-r5.ebuild 369 SHA256 6155baa0c385cb2425c678383128da495e1fabbceb0b9458a21040aa2e21a0f2 SHA512 e9609992d574a0a3d2f265472293ef78c82dfbc5023f774d0ffa85b44e07177e4b082c122a44e94cfc62ec120cdf5b9b72ec378befa574fbecde33bb220ee414 WHIRLPOOL 1bd47f4e85a671572d8e8a14bac1371cf1cbfbe41e8bbdb20735f2f91cf728c3c57d99a8b657db0723267bf029bb40a6df37200a38ef2c47804cefb6e455ed9f
 EBUILD selinux-vdagent-9999.ebuild 349 SHA256 710e5094128fa448098df5f4231e57a617113a485a8f99bb7fd7e614dd44a2ce SHA512 72d6a1ade1932e0c7a0182a17252b59b419352d77fe8c054489d7d3ecbcd5ef476d65f4740be23da8fa606156a08eaf97d63b48697ddb81c7b45d39fe341deb6 WHIRLPOOL 445f2544f4dcffd11f1a9aaf7eeef34bd10f13d0d54eff9c0eb78111d1f40a1e1b6cb6964bbf257a4676b215c82b2e0792e8c522df3e78f39e8b2f864fc7214c
-MISC ChangeLog 4744 SHA256 5b98fa4b9d88ffec63a0e221ca6817277b261a675a3134ae4071da593398475c SHA512 ecec13fc20d4ab128076cd5dfb7dfba2080fb99e9a33032c96f7dd6ab30d4f21f3554e25f359e52b951c2cbfb7ef89a2d2ec094808cac7c03c663b8e94afbe71 WHIRLPOOL 6d044c28e3537d02e6342c6e5470efa0c2f9a96b01b6724d91a3ffe93a3306e0c78d256f79777fa18ae80de0bdab3249c06729d499c666f3b2ed4c6b3c660d8e
+MISC ChangeLog 4938 SHA256 685db49e83f8b15369f017cdbb67687bc0dbce9f2ab96527a9d2d4ac19976792 SHA512 c56017e5e36588b9a105b913f765bcff574f86784b50ac4334826c7d62d4c05803a6a90c1326aeedd68995828a96876462e0fa629a855c868570123c56d83558 WHIRLPOOL 7ca501b893a49478f90a7d76892a7f684e98175c3bb9c02a2c41e0b7745f7749d74f5585c6bab1b710f2c12a3e7f78f2159e8cb228f0abafe97aa647628da361
 MISC metadata.xml 231 SHA256 b294636879c2996bbec486895f84f11a4359dff012fd1488b1797b197ad01107 SHA512 5d22b09ad887104a4ca6b7c262ea68e9fa0d2aac62bc559d2733f3a8533f3ac5e7df261c5aedb1655522e007c9dcf96427008f8b1a6df90c10d3ab08580e808e WHIRLPOOL 7ae1dcfc50635e0502e62263920ea5a8c5efb489a9651dd0c028d63078017c67eac7085dca8be96b686eab8e4b9958bbaf7d05c8310cf2217863561c0e5eb77c
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0
 
-iQIcBAEBCAAGBQJT5RynAAoJEC7dUkA7aK9HxAgP/AvfCHn+47rbfFh6mtXBEWsQ
-BNfS1cTHRDgfOkyiBDQootZwABdIX/aooTlSEVE4zhHgA55iSCThQbIJM7CSnYRC
-8cqrR3hY+sYTo02OHmHMKD00/cg0ovlKRhMMD1RyurbFQiQaUC5GGauR3yh7p5F1
-so7fI0cueAcxbe5sSwux8w+Jxwa+9HxnqJU+EYLTkV4b42zM2BgsvWptSXLqW3eZ
-GlK97qq1kdNoj2Gc78uoA/0guncIDAw5Wzl+Tg2WHNTYydHk2f+gV8W/W3wCTZFR
-M5Ssg36wZWdR5CwhA6zRPqCPjxY5S1r/at3Y+SzVQ/sxvR2Tndw1DKoDrjUHbpJn
-2EZVbr7R+5b/tyPLbMI1AHkJq0Ckb4bcNex2sUK8ZqG8F0dU67MMmVeL71hW6MOj
-gfJMcODAZYXSiRZrPCzYrfuvUCtAigLQb7KQd9SzDGMUCjGJ4J8OeAUkfBnMJBtS
-0JRujI36nNP7Xfu6tiKm1qi5PXBbHsleeVh6L+k0pvqwKO7tV3z5eiYhq1JPSelj
-khK1ELzju27qaDETVj9rmjmClWDfqcD2iznzHIxjWt33jyh3mHGffVkmr+CrJ+aq
-bA2rhgYWrM+QxPChguX/6yDJb0Hocv6HRytDVFmVG3MLUcxtmwoug17pGKu9ox33
-Sp48DT8G69nOdAN5HRN6
-=+gzW
+iQIcBAEBCAAGBQJT5nh8AAoJEC7dUkA7aK9HfXEP/2nU5b0RcHzaFKRi0r4KuCSd
+Iasqt1orB0PVkGQyZ3/+xyldkXvIuSSVvmrqYayIMj66tiOzUnm1XzGmHHhB5pTb
+qogrwSaPsi7sszEgjMvC/ITM/nlSx4nDUo5N480Gkat4VSq5xe1EQNNT6UFW9QgW
+Dw/Tn5gfDC1kIhfbkwoO0YCa26XuNDRZcLhVcN9ZrXfdnMZ3aUVklhcsSWsbZp9V
+Rnbi3ofKkiYJTH6fxEEyJINEbHGIi/n4hB0JoVIyGtuiEMYEf9wqP119t6jmTY5m
+oAU5uVvKprk8f2h9ea9ppVN+1Bk7BxL8RRTDlAa6C+eKlNgP4UFDW5uV0btyslqz
+7jXYMPx3YXTTrbKgYiR5urq0IILIWIq0bQqiZRMo+Cp53OyrbOIPX8X7ePDq6ROr
+BiwXD+PY4T1rG9OA2vQ5qGrU8wReKgN3X6N1ErBKQtIIZLv7s1RsikUrnkEv8o8l
+cy8UnfZ9XXGZBJ5oegPlBZa8Yr7KqAOBg37DFKPU+1AIPnj4zh6pQdDwMXdNUJ4S
+wjTc2sp0FpA4QOO8haBkg/JK40PLGYSEnknx1WgaunWPzLqHNMnZtEcy7rNgcBoW
+8o0d4pQBR+8N1ZtXUb17DDwf6m6DMpvZowtHzgkrmadlJCFhZ4xZWUsXateLJX8/
+f9MBneaHYBMSbwgvCrd6
+=i9lg
 -----END PGP SIGNATURE-----
diff --git a/sec-policy/selinux-vdagent/selinux-vdagent-2.20140311-r5.ebuild b/sec-policy/selinux-vdagent/selinux-vdagent-2.20140311-r5.ebuild
new file mode 100644
index 000000000000..9be704023734
--- /dev/null
+++ b/sec-policy/selinux-vdagent/selinux-vdagent-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-vdagent/selinux-vdagent-2.20140311-r5.ebuild,v 1.1 2014/08/09 19:34:34 swift Exp $
+EAPI="5"
+
+IUSE=""
+MODS="vdagent"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for vdagent"
+
+KEYWORDS="~amd64 ~x86"
diff --git a/sec-policy/selinux-vde/ChangeLog b/sec-policy/selinux-vde/ChangeLog
index 49ca384446a7..f03c28c52c68 100644
--- a/sec-policy/selinux-vde/ChangeLog
+++ b/sec-policy/selinux-vde/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sec-policy/selinux-vde
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-vde/ChangeLog,v 1.45 2014/08/08 18:49:57 swift Exp $
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-vde/ChangeLog,v 1.46 2014/08/09 19:34:32 swift Exp $
+
+*selinux-vde-2.20140311-r5 (09 Aug 2014)
+
+  09 Aug 2014; Sven Vermeulen <swift@gentoo.org>
+  +selinux-vde-2.20140311-r5.ebuild:
+  Bump towards r5 (fixes duplicate context for hiawatha)
 
   08 Aug 2014; Sven Vermeulen <swift@gentoo.org> selinux-vde-9999.ebuild:
   Make 9999 ebuilds EAPI=5 and transform to make master for version bumps
diff --git a/sec-policy/selinux-vde/Manifest b/sec-policy/selinux-vde/Manifest
index a93284de25fe..2f99d528be98 100644
--- a/sec-policy/selinux-vde/Manifest
+++ b/sec-policy/selinux-vde/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-vde-2.20140311-r1.ebuild 375 SHA256 e8ed9c07a3458d90f2402033ed1e807108f22f3b50a2a61bbd59ac6c6ade9993 SHA512 525e32f5f8f507716177a6fec116ed2800a77d2633fd8830f08016c40f9fb67941b2b0881812db75c658adc1efe8c671edae322a7ea57b25db2fc6d744b09315 WHIRLPOOL 659c674f9bf48431f9531046c140ad7e530778b000143f4057d8b36056af4e43c204059eb154e426007af77557192f2e51a4f89015104d36395d71012c86a123
 EBUILD selinux-vde-2.20140311-r2.ebuild 375 SHA256 43f86abc8a69d7386dd215f346b8a5564e5bdab0f1480ca89ebd2c5c1c16930d SHA512 7432acfe4727fa152ab77800e1c604b766ff326203efd5c70c800c2ff1c5f220cd88115642f017cd69ee7b4dd1aa6a1ba198aed77b3fe5381da5f06ca8d05f90 WHIRLPOOL 77053904851c9cd7ca0d3fed4066f44eca151c05515c120701e2164d20859a671d19b8734081f385501526f82ab610357b9e568fa2fa25824413d9aedc33d28b
 EBUILD selinux-vde-2.20140311-r3.ebuild 375 SHA256 23446afb8e81619520a923470031b84602adb68fad0c050bb70bd5272488edb6 SHA512 7f602732bc970b8c5208e3f8b81e2a52b92850b46f5099f14e8d48780208492f03eeaca004d89414aa5670552cb1ec0970626c3bd976a59d972b5c44f1aed353 WHIRLPOOL f6b510cba0f53a7237acb5fb618654382ae9945ddf864cda4ffb46a1a0115fc64ad8fbc1a9cd132c51c1f68c2fcaaf058f722616d39bc9e6f0d3753f962678c3
 EBUILD selinux-vde-2.20140311-r4.ebuild 377 SHA256 1fdbc558b9a82a28d8acd2848380f3c39e3b626c3fedcfd9b717aba986c3de7c SHA512 21d7179d301692d7839718e676d08e8d3adfe1e9e7285456111b154e7343fd36b65c9fce8dd1054f7656aed21cde30d366224e58aad976ac34ccd803744e44c9 WHIRLPOOL e228c2b48c7e40b3c5d0866fa55e7174826aa50f369127899e64b371449ec22980ba8e225966cd4ffa169d63a47ee61e6c408c95f4c2167315d927d58949a19a
+EBUILD selinux-vde-2.20140311-r5.ebuild 353 SHA256 2afae82947ee3891d3da5681b3c29b1f7e99a255e36412b5c165e0c9768729b1 SHA512 2bbed798a67a002552b593c48979246f2d9aa069c8b91c86eb1888fe35fc513db712502c49b9f93d9fae30dc02a199411becae262cf2a8aa5acd870d9e9637cd WHIRLPOOL a415e4034d91627ff306ef1b57ba0b4f8e275c80783bf17d2721cd917fc4aa2dd8839dc9afec316cdb2867df10899dac1616c3df861eb81c9ee30a8d500a939d
 EBUILD selinux-vde-9999.ebuild 333 SHA256 f167eb96e38103af2202e7d204e6fc75b1fe42188e47b4ae9005eaf35745b544 SHA512 cb0fe283a8ef9ebc057185fe9ac1c6958791791ba802e93585264c0a3c0a72bf01da0cc53a403c36be31eb2772c522c09c5a8d29d6d35a7841766b68938093b7 WHIRLPOOL 67d5674fca4ba058356b160e757ff6952f91dec0ea9e97f5836b2437db37e34084039c65ffd7c06fc328bc9efe49bd855d7a990ebc01bd30cca974d570ec5b1e
-MISC ChangeLog 6908 SHA256 803981d6f9f27393bcc132a79e22b3a73923d0691d266882b81214fe12ea333d SHA512 b9c4b1401e16e25b8b768c37e8d584f9ee095bff098cd16e36ecd30f04e17c55cc4370ff3aa0b3df39cb0a4b9bcb7e8bc92dd6fab2ac9aa4fe550732765990b5 WHIRLPOOL 08e87c4f85bb6d43eb9be8f441a44b240de86d779e72c818be940d3ae9c6408eb31de340656f68f4e6f1b9a0146751fa1f6538a937c5e3b22a754875256c954b
+MISC ChangeLog 7094 SHA256 cd276aa50764865050a148688eba774e73b7e4569d4d644a4d5187712e6e08bb SHA512 4ddc90b16474138845eb96feac30d19421acd29fb6ca123630035cfd8eacb9c56720c242e5602ba3a69720ba4e19dabfe1778a14d7e9b7aca146027366f98a70 WHIRLPOOL b7b1e48962d73d317e459f897fe4ab4979138c34fe1bd367e00fa0026edc5f9c7e0ddf88c34c35875c31f6310ca61da02031fe70d8d600c50cf9eaabe24e73fe
 MISC metadata.xml 227 SHA256 83027b12dbb9b1b1862e80493036e0edfea0f0437a20113df4d382b18e52310b SHA512 60ed02525539476a7ee690fa6a68eb7f80fa335b70ce2871bb2c3b82fe620fcaae58018952f064a884e356e188424339d11412df6684dc5c407b82cd68fb0d67 WHIRLPOOL aa19dc6e26321fde6577165d4ecd6906d479ca2b10d218835dbb6e52dcef92b04ccf4a3d298bd792187f1dec391d3356ee5cfc28426775dd2eadced65638c78c
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0
 
-iQIcBAEBCAAGBQJT5RynAAoJEC7dUkA7aK9HZmAP/RhwHeFtlvs4q9mz0CFTKkhd
-hsZ5CXmiTO3AwiJpcuuIKZdbw6x/eU4f5YwCfYvt5UvcuoY46G4qF2iJpg85GxV8
-PxWM3Q1jmlHheRoY2Ti6L+eWD9SJfIhEhKHG4zhd2LCoRXMeXiTUi9iIRFvJ/N9l
-UEEI9GJiuEEbHBuQ0fQBcxvvHE6KU4lblq2yQGAhRQ4E3ou9wbD8Wk5gfm1/5ZYh
-t5nt/BNWJkLW+C+kI6VO/y5de7WjYpkpbcCud4Yr4RTdDPNFqiBzhLWY8pG5bPIM
-HNunXxojXztzo8AjEf3J7Co5Pz4c9IXULRE6eZs2DHcbvW1bKRB6Qa5dVK8Gawk3
-zk6tZeNuRsMMvLJbuStD78+xsSiqeagFqiNHZDPz2UGC9jDkL4NOcF+gVqWx8kZL
-0jOk3U+7Jz9V2NAqwB3Zx/Vb1fSUky1vRwc65F44AWuK5FDQI7GA8iP9QjZNzfRw
-6D2uXppmMRE+a+xL8JraeSAm07s+OCA6N6x+pAwM4VKGWinBntsKdVVCalvz9UZw
-vpsi8wp+PW9nzQApksC5ElH3uK6Q2cMopexZO2YqaoLxapC2vItSajl2ehal0Gcj
-rLaH4XTyJqznmWIrRU2N56EVIOri9Tv2xfxxAaf+SQeLoZI7TTxudXVkL3UN4WOU
-L1Jc20CSklM6yrvzY2ef
-=u6G0
+iQIcBAEBCAAGBQJT5nh8AAoJEC7dUkA7aK9HSAwP/3Tx6jS5u8opAHmog636rFOq
+rqXAz3xqJxAl7lT1wRb5FXYqqRhkskN77/nZMuYJkIvy4rHNL/VKmJtNfsuP2d52
+YbwsW+yEBxIAgA0fqDs2Lwcc+frUl7wrijmIHn8lhNuLgr6c91OoTpvJ8EZ8x0Zk
+imQaEkRkzRSlgXT7sPZZIVIWjBcmo0QgsTBTzMa/73TV6ycJDinB6YSx3TOXo2Tx
+ckbO/cbP/LSdgiDiMIPgifMCDGsYz1yrmAkjB1VabcCrJIklD676cmXuNI995KSt
+D2gZSLRbpvp7RqNRVq3fjU5zixfSJvqXOuxF2HAJMjDq81YyMe3R5hL0AUa6D4zF
+U1l8KoPdJ6l5jcDSIy5paRYo3QdwXuss/9ALKMzXgvnxBGGP2/K0gB8pjk7e03qG
+HHCDq0avzNeehV9e75WH8VznpurXxhs8YbMgu/OQVaJdQuRXkPUpP76t/AgGQTlh
+tA9IuSnACu7winm9LnA+ZZAmMiU7PywEM9Z2T2KHpLXtMVaLIJ5PdXYPOXHyixqW
+x2vgKN3RxZ8tXKVcckzOQqy2DNXiw1tjtjBeLDSw2Rq6DR0mnR7cUPka9zVWvcUB
+aCvKkkniNYGCiYuw4ODB4WqL1CcoNVx/p2SF57s1Qmc9KoWef5oDpoXJEidlcCnc
+zvGQKIseHplsif6zKyKL
+=gJUD
 -----END PGP SIGNATURE-----
diff --git a/sec-policy/selinux-vde/selinux-vde-2.20140311-r5.ebuild b/sec-policy/selinux-vde/selinux-vde-2.20140311-r5.ebuild
new file mode 100644
index 000000000000..3cda3a31a961
--- /dev/null
+++ b/sec-policy/selinux-vde/selinux-vde-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-vde/selinux-vde-2.20140311-r5.ebuild,v 1.1 2014/08/09 19:34:32 swift Exp $
+EAPI="5"
+
+IUSE=""
+MODS="vde"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for vde"
+
+KEYWORDS="~amd64 ~x86"
diff --git a/sec-policy/selinux-virt/ChangeLog b/sec-policy/selinux-virt/ChangeLog
index 622de17dd47d..84bd8b4fdabd 100644
--- a/sec-policy/selinux-virt/ChangeLog
+++ b/sec-policy/selinux-virt/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sec-policy/selinux-virt
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-virt/ChangeLog,v 1.45 2014/08/08 18:49:35 swift Exp $
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-virt/ChangeLog,v 1.46 2014/08/09 19:34:42 swift Exp $
+
+*selinux-virt-2.20140311-r5 (09 Aug 2014)
+
+  09 Aug 2014; Sven Vermeulen <swift@gentoo.org>
+  +selinux-virt-2.20140311-r5.ebuild:
+  Bump towards r5 (fixes duplicate context for hiawatha)
 
   08 Aug 2014; Sven Vermeulen <swift@gentoo.org> selinux-virt-9999.ebuild:
   Make 9999 ebuilds EAPI=5 and transform to make master for version bumps
diff --git a/sec-policy/selinux-virt/Manifest b/sec-policy/selinux-virt/Manifest
index 14556fcf0147..668c2a61df03 100644
--- a/sec-policy/selinux-virt/Manifest
+++ b/sec-policy/selinux-virt/Manifest
@@ -6,28 +6,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-virt-2.20140311-r1.ebuild 379 SHA256 41459c5a1cf74817af7044241a9be5c63a10bdca9c581f5bfbac28fa13bb033f SHA512 2faa69fef83d8930d54c177731edda41f6bc83dd545e705e0be705c530a4ebdb8ee0a221e4072501113577918f608ba77c662d0fed743f3539d118aac89c1077 WHIRLPOOL 302b216e5f2a0140d6979233111a2851a15b9ba3713c77a12909ae6d8778c5f8aedad544cfae6f113a402b409757fde17eec96029ff156f663b1284ea30ecfbf
 EBUILD selinux-virt-2.20140311-r2.ebuild 379 SHA256 8c12df553ed1b90e5dd79bf75a5d0942b85fc66eb11adc45eb4207b6dff8c8b0 SHA512 16d6549f312160f1c62e85bb74d6e9e805d888d512b8cd37df92271911436f026b766c41f387faad24f8053d183ad44c3cc9d6c2ec03368bc301c6397f87a841 WHIRLPOOL 3c1a0a31e2922aef9899abf1d8147bdcfaa511143bade58ab8675eb1e9b7643f98d853df7bd4bbe6343d27a80bbe1677d05def3e026801fd97411be1048cf292
 EBUILD selinux-virt-2.20140311-r3.ebuild 379 SHA256 056f73e38ae7b0bee448a1b1bab821f9cf1c7a23b70a5604e354d1c133c9dbeb SHA512 7b508080d3158bb314004d26a50eb7695b0050484f96a2ec111935c741a1e6dda829dc66b59ef983daa268a07996fb1f69ca735cce469eecb356218aa498958f WHIRLPOOL f04fc3fd75e7335ef58d8366a070a6dcc83cc481294633003c798ec47ac8cb35b0b5ddc818cbe018f3635888d0cfb6b028836ba3a906ed4e8d8e405734fe256f
 EBUILD selinux-virt-2.20140311-r4.ebuild 381 SHA256 d4225fb913c28fd64c4697b0042850856ee42f45708a3aa3e2e1fc849de162c9 SHA512 586a4ced554ef26f3eb21fc98a021b800f67a5e435fc402dcf652506498a932ba1e4fbbbe98cf3b50750025745a9383cb7ba10c6e24ef8f91fd6539c7496b2b2 WHIRLPOOL 885b7737a8b5e1bd2d8cb695be1fefe332a613f8548033225f4371502e758598f5083af00aee2ede59017cfaa0262c93a32243ddc49a53f1a9b310533b262e7b
+EBUILD selinux-virt-2.20140311-r5.ebuild 357 SHA256 e4351daeae149e389a1e46fb4a5c7b568ab1465bf725203b6a4b3e0bbeb45f2f SHA512 17612265c20dab4728fc5bab40ebd6c268d4d66ce84ff9263d0d81780097d7f060a249b7963e7d2c1bd0c756850fdb5f7f62a50aa785a1204b5a8a5e8015a7e9 WHIRLPOOL 31d1a0face2caad22a8d4e6933c5b0c92ebc5d8f64917d608d723c8bdb00cae41fd5349804c69bee90b2293a3b0a0f76e40dfe65cd5e3628c340219c38fd389a
 EBUILD selinux-virt-9999.ebuild 337 SHA256 f342f06c4e8272682bba9dd2fdfc577c5f9cf9639057d8c6d5642572fd69ee15 SHA512 86fa89ae911b34f50b32c2713466f06a367a9dc09d05bdf5903eed7eda0306777020180ddca73eac60ac90697d451d957ed9cc9d5f8a86083d31b74ab01f126f WHIRLPOOL 3a28543e1e05e7d2d5281c3f57e23d71bacea302a3af4869b15c23c5df495caf0f568d317eb1374441a9970a9a153936e1bcc03156de339b40356b672302be42
-MISC ChangeLog 7113 SHA256 d60d8d30ffc6de613eadef535a9545220f9fa52ddbbc0b8f625821beea954094 SHA512 d83b1bce36ee1678d7eed070f8fd7ed6cecaecb2d05321ae7b1b728c6feb16aab9bb9e5c996188d5aca259165fbf406423d70632117978442f9c8d7c825b5ba3 WHIRLPOOL 2b0c5daa35697212c432390dd8e78cd7bbc15bc157e5db3bf9eb640ad5d1b8a20718bdfa5f5ef64a3c616879dff46da0db2ef44748af85503aafed112c1e3d6b
+MISC ChangeLog 7301 SHA256 5b1486fed158259a65e3f7af1b4581c71b5537f542775874bf8e10e34d11f1bd SHA512 fc40f1ab359682624def7bc6e2628554d9f0abf08cec941fac13c41ce5563fb37b881847a6021219fb05f287a0279171327452ce20ab00739668f2569a3636c9 WHIRLPOOL 6e42085320207fee6729a02a85342a9b1b2723afc89f43b7b187dfad5e49c72ac69281f45b9685a3685b2c250e118c82df2d34e533dbbd31b961279214a7bb60
 MISC metadata.xml 228 SHA256 9f27e717e6904dd86bdd0f35496fd9549675fa04346b1dcdad9ddeb3ee52bf87 SHA512 8cafab15bc86765902287a5e6d8f14c3dbdd436a5272569189aa983f88cb66b3e58500b5d0c19052d884a2f75c90d4e16c17398deb3789bf14714074052181f7 WHIRLPOOL 98e2ccfb6173b6e77cefc4b15e5e2df68301a1ae1260ecc0a5c0c6354a332f512bd5a8f8bfda98f664f26dd5b99a6feef232b436c863f542d88e95c25bdf17ad
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0
 
-iQIcBAEBCAAGBQJT5RynAAoJEC7dUkA7aK9Hm54P/3IyzMimS5A0mqjsrkEW/Vy4
-KIUmXke/cOQ/zYBuARFA3l8jBi1MuB/kgBmmgy4Q+tQM+KJLDltyDW8z3QPNnFUU
-xzJMNoOLtCJC96AXwlV933zf8H14KA9GIIWnhIJoV20nonxlfCzGqb2ecpp4S14I
-nKopJYnLMbVtZax+e607xmDdMur7CSUIOM/KaxpUnah3vWHMgHbagY8LPZI1AqXY
-gxOBBCduGRLwe87KdYMRwzATWR2wZdxXz3dyOgkrR14k0ZkpcZVycRcqW0zWMLGR
-SR4i8C66bowWmxP6pdvwSUGgW/s6+ESon1D13ywshj86VWHFSHRlBP81H43Ye5lk
-uGZHTPTTYGDkMuR6bjcHjLstuIc4lxyIFBH6Yh7g1VQO6GayrCakHYDpjHgktclr
-6kFkq8BG+ul4+J7fvcDk26XIV3dPRnOFWRcoJWuJwEfI7AVnwZWO9n0Gw6ICem0/
-RKmBeLSHObC8Oqx0aJE1NepUE4cs2Bqu5hDBefhHsWp/HiK5roxSZQMGTGcaqE5P
-1HnvkVt+X+/D8PvuLXI31qAhPXkGtqtgjS4Eyr4rO7vMb+qoVqgyT/GAiwTlnG4W
-6VY+Mn46R34V/qdMjLheK1GzINfOWbha9GKq4QyrE3pkbPBcz/Xw3aHPmPmjCegK
-N+b2CeZ8hTdg4MoEs6Fo
-=efff
+iQIcBAEBCAAGBQJT5nh9AAoJEC7dUkA7aK9HqvYQAKO/YJm6EgExOPgkrPd23/5c
+OEsv7E3Jxj6TPqiWMqBIfbpNDOySmB5l9y3HXpfp3cModX+uA5jYc+PjeBkto8I0
+ENoOxSCIlpk4AxK/D4WuUTHCJiPZ2fyNHRZs2SwSiAvx64jV62WbmCBR9njyMwxa
+xBNN3F9UUiMa7EtinKhqf5T+lPfjW9s/Wcl+jr2ER/07FcoQRnnCUAdXWs/oPOpt
+cfTb5sZz8UEEcVnqhDj5BY/7rFdSvgm7XPhmjjTPA5olPtTGBhtuQ5nEeUKZXqF2
+gNBifZC8vh3ObzCHW6jz2qe91tSDekwSSjODE2giihwsmTma+7OQ/6MCNUAPfsC8
+0A3QMXjc9PLEdL7tUiQtkI12H7qXGOhNbszxnItb4LLmge5XkQ2wAwThTF8ZSWrv
+XBv+M3x08fVgISGXDFPFQeoWKTJ90mXRgIB5dvXKCfbD5xd9uJeLWMstuHBPRwbx
+nKlgs7uGkygekCP08tP4390TrdGMLbKDL+1NN12ssz9vsqpvCXVpywONVBdWJuDl
+LDD1hAJF6e+PWaZ9K/2i8VRxhf1Yt8nfOuMhyYrBxT6irl06j+hYLKhH7ArY0PEL
+OJWO3y8fSXIGLXC0ERBMmNcPqYnKqA+8ibvYxLagYwZJDuGJ4nXhqiAnX8b1dd+9
+dm/5nUUmRjY9AfQ3m/4e
+=VdEl
 -----END PGP SIGNATURE-----
diff --git a/sec-policy/selinux-virt/selinux-virt-2.20140311-r5.ebuild b/sec-policy/selinux-virt/selinux-virt-2.20140311-r5.ebuild
new file mode 100644
index 000000000000..4cb952aa013a
--- /dev/null
+++ b/sec-policy/selinux-virt/selinux-virt-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-virt/selinux-virt-2.20140311-r5.ebuild,v 1.1 2014/08/09 19:34:42 swift Exp $
+EAPI="5"
+
+IUSE=""
+MODS="virt"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for virt"
+
+KEYWORDS="~amd64 ~x86"
diff --git a/sec-policy/selinux-vlock/ChangeLog b/sec-policy/selinux-vlock/ChangeLog
index b6478e00c1d9..351d692d2caa 100644
--- a/sec-policy/selinux-vlock/ChangeLog
+++ b/sec-policy/selinux-vlock/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sec-policy/selinux-vlock
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-vlock/ChangeLog,v 1.42 2014/08/08 18:49:30 swift Exp $
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-vlock/ChangeLog,v 1.43 2014/08/09 19:34:16 swift Exp $
+
+*selinux-vlock-2.20140311-r5 (09 Aug 2014)
+
+  09 Aug 2014; Sven Vermeulen <swift@gentoo.org>
+  +selinux-vlock-2.20140311-r5.ebuild:
+  Bump towards r5 (fixes duplicate context for hiawatha)
 
   08 Aug 2014; Sven Vermeulen <swift@gentoo.org> selinux-vlock-9999.ebuild:
   Make 9999 ebuilds EAPI=5 and transform to make master for version bumps
diff --git a/sec-policy/selinux-vlock/Manifest b/sec-policy/selinux-vlock/Manifest
index 5bc8fc7ee2dc..8a147dfecb0f 100644
--- a/sec-policy/selinux-vlock/Manifest
+++ b/sec-policy/selinux-vlock/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-vlock-2.20140311-r1.ebuild 383 SHA256 fe32736755c9efd29ff2bf05373b2ec42dfc9339ced95b9dd75627682fb56d11 SHA512 27a91941a7e518638720c4b88b19394e5c51f7d4119abc09105c2c04cf9318d3b527cc2744fca91b6b672115541f214904e77b7dd542adba3d669e0eed935e40 WHIRLPOOL c60ae57b469635e4ca7d7867f974eb9c9e54d580c67334c003e235a7edc5ea972c8ae80876b1f13fa4fd7cea62cbb74920aa28cb207e64ced9c5d03bf5ee0e5c
 EBUILD selinux-vlock-2.20140311-r2.ebuild 383 SHA256 6852e2d86d200f3901f45e2efb70cb047c0a95659bce5e82024c2450e723985a SHA512 28de60cacbedc79f4fabd10759d6d7f00f9adea79f935044645d39565927d2dc12ce00645b0219a2224d35fcbaa3e62fff679e7f42f5a8dfe0a48b5a0b7a74b3 WHIRLPOOL 57e4159555d64a659c5a4fa5f02b409a9eb2daff1463a1d56d2158006632e5c5fbdd0f55730e92635541042c6240c04ca90bc157effa822aad602bc4e3af6990
 EBUILD selinux-vlock-2.20140311-r3.ebuild 383 SHA256 8c2993e8dcbecb413333d3d0f4cccda0862285abd644971a119a8a0e7556031b SHA512 f8903aa745f30aea4182343bd45ea94fb8d1f23a0266e8e86846af962a9fe4032bbfab3cabdb0258b131790f21cb6677492aeaad0103bcc2a8c3b3ca80745e73 WHIRLPOOL af872512157013a271f846faef72ad721ee0ec6a9251e02e1f8d0ed7891efd48640d60a79c606e09665877d18d839c3415446e011a8e2b13a6caf978ce975e35
 EBUILD selinux-vlock-2.20140311-r4.ebuild 385 SHA256 c4df2aab6de01bedca21f9df6e776add125fdf2e3642eb6891a781a082d0ce0f SHA512 58c879201e87d664441d6a476b8e827b5b2115c3e93a7cf67e7098ec6ab1bc6a1b3462f915b34868d1e2bba64bc29b8bd9bf2882c80b2ef42b16c84154b28a42 WHIRLPOOL d423334af96b8f2e5e89700c52eed4ac7507e0b2c58ec376e1e32607516a5a47f5631a945823fcae9a551beae02db64ef34927b56b651d38111d5315b4bf4ce5
+EBUILD selinux-vlock-2.20140311-r5.ebuild 361 SHA256 65963b971d0189950d10034bad82dac5189fc955af803f1fbb9310600872fba4 SHA512 2080855c6b7594f66daa5f05c99883fa487da772f864696d549a4ff16df28f13fff97f60a259aeec6fa9001d25e3c273b5e14f80bb6237c299cbab655cba7f27 WHIRLPOOL 56a0ac8d210b0eb777b0e142d0645bae710b64051fc74bd77d4042f10f2a3e7d0800791dc363fe2ea7c069499ae64bade16b080564b67f9aef4b7fd828ebbe5b
 EBUILD selinux-vlock-9999.ebuild 341 SHA256 9dc476fe916dba2a76cbc401b7137679e55284598a062d86ff1beedc1afc492c SHA512 799c46fffc591583225bdde755c069ca3eb4db2a684d2e509cc660f09fbc8782610bc0fe79372ad7287330865aaa8663d99a0d23a9ecb46b678be6faba6eb486 WHIRLPOOL 0575d92ac41e6a92ce9b72746cc8a9541b81d0f0ba090f53848c838d3c0dcbb94770240adcf27b70365e3e4aaf77eb28be73bfb3465b91a1e2187c0f43b6e93b
-MISC ChangeLog 6436 SHA256 27b89aa83a445ec6f8b1d2a8a8621a09b0433f884e2272819ab23ec4d8f9795d SHA512 391d9fe4ef1a984b585ee417b0a5bb7dd2b34045e1f45a741d61f114e471b7b5872957383b0e6a3a8a4f20184c374fe8b9dc34f9ce0daaca68850ed5a50c5388 WHIRLPOOL 471f2b36e5a8770544ce26b830573452a450482598def7e33ae80b7e159ced0c77bf73b63a458df0d282cd6326b5570d85fa14e87c4f2fc1036546eff356a9cb
+MISC ChangeLog 6626 SHA256 82c28cde7b91e4364767854faa064991ab4f1a9a31fd1d0f42e2ca344f2cda6e SHA512 82282bacd3b61318c8cc1d4d3defcae794b36b8b0e40d0975105471f1463b0467468d38631f48ba8ad118da83f046e848c4ca46d8706ba1a3d28c11c495b9155 WHIRLPOOL 6cbc68f846eb108156f85fed83d74d040321b4c1692db1b782b2158f1e55b8f98f64f09514189efa8f17d81c9ef4475fc96260c1671b74d9a23fd55548599bc2
 MISC metadata.xml 229 SHA256 bde19656e197972a65639075ae1a079de4466f804e0b544c9cc3fe2ee8547511 SHA512 e7cadfda077625a3e04cc47f373e85b5543bfa24556b8218ef75e00cb5c20b9fc0dc5556d48e59b4a35b052bd158c003d13d9dc0a1a200a70f9f00625bfe5e64 WHIRLPOOL 04fab55f2bcde5541134789a00d64d0bbff7dfe9475d46d01cf33affe6d333a2b31f96c04dd9c54d3519659713bdddfdfeea58320654230b25731dfe62e8b7f5
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0
 
-iQIcBAEBCAAGBQJT5RyoAAoJEC7dUkA7aK9HU1oQAIkLDs/bwwNAstn5oNwN1Aaj
-boqLxm/21W0Ix/cMeAy2qDAIIPnqkUwm+0Qjouh+7cDfy/2oCuqxkA5lJcQf9V0M
-mNJRQTRHmItlSwLX7QJ1OoYQYTjwySbxu+tygoOV9za4FtX2DkajcaK1ZE7F+6LN
-wkqu+pXiIApHqxVKf7grDoLBeiniDjAwpjJbVuGYcmUlcU4yGvqbp1WLCaOUdy1W
-TOtv5/yuVFPdfDv3oJ6AIfS+jsQtwEyDZjXsHELXydPvSc6CUm+AJz64E7CrHnEB
-+lotRSgM1CEDISz1IMSrjRUGbKWn17FLUBy4IUb+4h7cbSN7cmX0xArHwthXXX4E
-HaHa2YQtpLbAXO+fTq2wjLplnk73QtB0lQLwdl5LONg7kXEUZoCVS+kmsND35+6+
-PA8VLx79/td7K1bcNNn870O2VKEMQ3IvcThNMqet3Mgf5bRCGImylpPwsKedrFe4
-j2or4dGty0grg7MDSkyFs/ecQeaPg3/Gga/SgPqn3wIfvU0ze+yIlrB/h5CviWoG
-0sGjqhYc45rBOiW/LVuHkx0o6S4aStjAmepzmobmuZovyBOz3jqfE1mu8OZJDdq+
-mbQi52WO58yOGe+MswMQQuAz4JpVWZym3RQcjpaIA1qc7MQmrz1z6HGTSoWavOff
-kTqU20JxX05orPZNVEa3
-=4iLN
+iQIcBAEBCAAGBQJT5nh9AAoJEC7dUkA7aK9HOrsP/3cOG2qstRouPxAyLOmjsZR5
+yvFA5VdQalDH1m5hYTKzmBawBdR9kpi3+TkLvbQ6R/JqrelVKSbV5B0oF00Ysm6b
+0NZ690SBPkpCijJXcYTaew3NjYAO5+8hL+bbm+/ivaewvOxthffryNeWins9wbIO
+VaEVF/tWlvT7lwLkaNvMyHNBIyGz4KrUXnzLRu058UpYpQMBYWc6iCdTw145V5aB
+Uz5xGnwNjMe2CgMQ8/QoiTcOns7bw+fpTetW3/AvDR6MzVjuBcVaaXkzfp3LAC/1
+b/1kQcablE61HMyXSBUA6WYqbXo94HLhtqrctQ53wihT5MxTX5v1oXgeIcW61MHM
+bV/AMbLSKlka8L3492nAJYI/qa68S4KX6EyGyfB7pocMnbA7h8PvOpbilz3koR0m
+hWfop/RJtpitr6eAq12SLmsMT+zWiXbo33tb9yf6MUBBznv3EJRlkmraODaX0rl4
+++j9hc0VDtzA6UL7jxc4L5hI9xwclusGtjv9OYcXq1SfZZOE+BhAsKEcoQ1Z/Tv8
+zUsYMwH0gNCXSk+JvW48KdCs66H9Mkr1cXe1OORj1OL1nvaLjxVRFwkbW9CauABE
+QKt20DtceWFKIG0NGtwCmWggyCOXn/lgAOqI5rT5pqAPB4JkGBVEC+9MjCcsTZQm
+JllQxFI4hYf+ih+0552D
+=Lk2Q
 -----END PGP SIGNATURE-----
diff --git a/sec-policy/selinux-vlock/selinux-vlock-2.20140311-r5.ebuild b/sec-policy/selinux-vlock/selinux-vlock-2.20140311-r5.ebuild
new file mode 100644
index 000000000000..fa87628201ac
--- /dev/null
+++ b/sec-policy/selinux-vlock/selinux-vlock-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-vlock/selinux-vlock-2.20140311-r5.ebuild,v 1.1 2014/08/09 19:34:16 swift Exp $
+EAPI="5"
+
+IUSE=""
+MODS="vlock"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for vlock"
+
+KEYWORDS="~amd64 ~x86"
diff --git a/sec-policy/selinux-vmware/ChangeLog b/sec-policy/selinux-vmware/ChangeLog
index e2cd13dad033..c18f5a10ed17 100644
--- a/sec-policy/selinux-vmware/ChangeLog
+++ b/sec-policy/selinux-vmware/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sec-policy/selinux-vmware
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-vmware/ChangeLog,v 1.44 2014/08/08 18:49:45 swift Exp $
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-vmware/ChangeLog,v 1.45 2014/08/09 19:34:03 swift Exp $
+
+*selinux-vmware-2.20140311-r5 (09 Aug 2014)
+
+  09 Aug 2014; Sven Vermeulen <swift@gentoo.org>
+  +selinux-vmware-2.20140311-r5.ebuild:
+  Bump towards r5 (fixes duplicate context for hiawatha)
 
   08 Aug 2014; Sven Vermeulen <swift@gentoo.org> selinux-vmware-9999.ebuild:
   Make 9999 ebuilds EAPI=5 and transform to make master for version bumps
diff --git a/sec-policy/selinux-vmware/Manifest b/sec-policy/selinux-vmware/Manifest
index e0438976888e..45334189ee9c 100644
--- a/sec-policy/selinux-vmware/Manifest
+++ b/sec-policy/selinux-vmware/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-vmware-2.20140311-r1.ebuild 455 SHA256 fadc4db79336d58127096455d3f9a3249c81072392b11befafd74daa3558e23c SHA512 b4c91eb7062ecc5ab632b575b9e68c8d78fd8197e5226ad8bc70be9491f474fb2fae2968cfb9d99f31921ecc0f3eae19a5c7d3f8ae9ec0dee39e929051cc0871 WHIRLPOOL 9be1d3a5eb46ab0fdffa9bb01a3190798d5001df105660728b36562c83fb7d8e84edabe4fef0fe233aac2c14291a7da963190c18562589458aa99b8c399d733a
 EBUILD selinux-vmware-2.20140311-r2.ebuild 455 SHA256 e523eb10811def33813eb2131d7b2f618417e6994b06237cf1f22654cb8096aa SHA512 29885c1bef6cd49b0cc82c23266bc9a94bce28e802d4a0dc32b2c1875677ff3f9c3ffa41d51b6d31e90fbe845fbec9e8ef62c4abb007c7389fb58d3c09f993dd WHIRLPOOL 9429a25dc568e807a0bef6a76a3dafd745945e1f017a3805906dca72de01a499f1fe637adc9a6f2d8ed9f198bbfbbb36d894b89df3e75526e649afe9e2e239be
 EBUILD selinux-vmware-2.20140311-r3.ebuild 455 SHA256 95f07f53b7d3f2f1d1599bceba24992df14663dea6759ec98e9d25a5e9847174 SHA512 c7e629b281d6509b185073707389b70a6a4a3a9cdf43c84d01f3089546fa0be9497de5da87fb10d17f8e22050ebc89425debb18b900905bd42e3f39d6f3a2127 WHIRLPOOL b3136a8740434475d02c5eda408d09ed48d4e352276f9785befd2a39f59d8ea82e5d2facec43f85cd37820d4ce4d9aa6a788f99eba7a6b3d3adb7e1242126819
 EBUILD selinux-vmware-2.20140311-r4.ebuild 457 SHA256 f9331669f053cce3477da56be033bb36957c290b1450cbcab7908822e36060cd SHA512 c59441c93a2d32065fedf676f0b6977df464250ee79b838d52c9bfdc09d3c56d7a270e728a0f1fe4a69ad2c754e859780f1b123864e5b69cbe220700c314224c WHIRLPOOL 0e383612af4b0396a6a456262f803adf2cb7f7ebb6f7c68edf41ead7f5351891f0c8c015c0c6587f244083bf7bb783e0bb7bdf2a89e1c603e531e7e297728da8
+EBUILD selinux-vmware-2.20140311-r5.ebuild 433 SHA256 d086ffdfc8eae6f3121fe4c55f77f48ef5954fded47bacd6c9dc8da94399f028 SHA512 baeafe5291043d73b9ebaf491fca06b4e2b6b9a772b66a0f1a5d7f4fdab906bbf582686be714b1313c31b70696e8b9b46091b978ad355e650529ee6fee9ee71c WHIRLPOOL de63b077c7d184d8686a8c0b52804af4db34f2e17a4ec5ec04b41ad07db4c924e668bc585318cb3eae4f1d905541fcbb0e4fbc075a612f6310de4751a4e7df20
 EBUILD selinux-vmware-9999.ebuild 413 SHA256 7c71aaa90df15caaa5dbc192476ae3fc2fb4778525acaecaa7dcc0c94ccd173c SHA512 d7646ddbec98ce463cffc30d3a34ba8917ccea175f42f07f9d06eb94cba1c38eb8919a266aaa1a7bb664439ce4fdd6a864582921df6334b93245937520156e26 WHIRLPOOL a95d0659ab99130ca1291a1e5385ff0bfbb7ac2028a78c13efe2ff4370742f5654a3078c4d8afa8c620c4d650b2dfa584657982030d94775c26425b47c17bb4f
-MISC ChangeLog 7128 SHA256 4eff012622b0f93403fba398fd98c96bf03e5e358441f5766251f70259e44043 SHA512 d346c09f443202196772fe26942089bd7ebcfc985f98fc06bc9acbce16cafdf18fc3790ec274f48a6a2c7e657c37ea9203765f7753fe04b04dbd5aed9952d4c3 WHIRLPOOL bf2c48535b599c01379e5fecf7f6358ab0cebd560386f7972b8c7a50d6c1fab1b0edc9a3ae25ee89abbd0d9740ca4979a4e6eca6c7ec3c3353c872e7fe88ca6a
+MISC ChangeLog 7320 SHA256 386ed3ca4fe6ee9019dc6462cdc08bbcb9eef7f65bde272acf1531df76050616 SHA512 0baadaba631c0cfc1a80865997ce0d2a6225d5999ef3a5a94e01f9ec077d40197a8ba5212199d1f27b05e37f6e262b833096b74bf4dcbd463e02a076d9fe0705 WHIRLPOOL ce56a1d0a18c446723cf03c1e1a969009fc88f48955788585f2c6964f49b0bf17734ee604dd62fad66f411ea3ec36743c6f3c0e2ceababad7309e996b8196b29
 MISC metadata.xml 230 SHA256 20f11e1ddef337663318e1e247b4d788edb83bbe56b8b7b709b5fc66ccea6566 SHA512 9d230b92586d8aa4566b2e927c25d46d0ff6e41fe8baf0868965525ac16c7fb7adade1bb28452c1db16115830c24756f63236025d87bf3ad8d9ff7f9267aeb28 WHIRLPOOL 2559edd0f19434d54c2330e60d7393da7754207b9e265fc9bc8cb065d631d7111eec469c611f890c615fb311b739901b692e8c3037af8caec0e64bb7fc75b726
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0
 
-iQIcBAEBCAAGBQJT5RyoAAoJEC7dUkA7aK9H6NMQAJpQjqxPFu/Y1H5acnZghDAc
-h4RhYwb1UrZo62M7OdcgeG0VJ/b7q23nGXQICg7Z5kxHSXJWT6l0akGYvbGeRVBM
-qsj/nVvYJ3Hmimt12lcf44Q+2IdUKm2IEhtyIEOGiC1XlFAl4dgAVDuRE3vNbZHX
-Zy6bxhJQG/KVUgDP3Qh5ZgXkmUBBJSdgvZYGfVgGKzrWzR+yOHN30f7lH5Wa/c2t
-B4VGx3tvO3DsxOBP3VGGUteWNhxoZkezlDYHdtRjJJT4o8J9xcG1WIuoNThlcpi1
-+lGCTIfRa8QsRCwAZgBMQ5OlYC4RmMLqCd6RAp2QYljZtj54gPJnXOWIz9TnqwvY
-E3T/gI+b2Zp2oOYIJi5ULGEToOG4FQG6IT3lpuTmL2OjuBCo10NL4rfk5h2m/K2e
-D2F/jz6Ngsdnlfu967guztDgX1T0JmpQKYnoXUjXGWo0lzfuTfE4RvFWXlGyrKt+
-1+BrwQY/+T+kbbtQBcLmAeRVRP3bL4gOG9+JRLruvGMaIpAZuKeMKdqlmv870myH
-R3aaDjm09aBFBjm8XGdNI5p0mHEPFcQqoSTVpE9k7MRTdJ2YiEKkKsGrA+bh6PFs
-VW8eeRW/DzSLod2BFlgL9qEWTzDrAoAyvHKu/X+l/CYSIxUieTLxrQ8ShMEv315B
-3udma8uLcht1Cg44ETwL
-=NWbZ
+iQIcBAEBCAAGBQJT5nh9AAoJEC7dUkA7aK9H9mQQAKBH6m8HEpSTFoXAyuLULq2w
+iDcB8tErO6G7RCEytMfB0pVxld9tbBTQhVSJ/UpZt6mmikG4ywC51oU0p3SqshMV
+uoy4iosL0FpfO3lM8zcmhqMgijgvgS/Il0O8OaRh6K7+v3RKAO1gETh84v9k7eOS
+qFHaa3H8m2yboYZUtCSA0SXS8AGhJTU3YGvz43gw7aaUuCcu24hz6t78dxXPDOnt
+CkJo0MHiVpacdCX4GRoTURx3LhTZqnPcJ115FVzAns0ZS5keFAzmi+uAEnDJZ802
+f9ZCT3VVhYUwubP9m4TW77HaS7hwinfcjn+b9EbSKCY/nzHLpT0hc+6OLmf+S6uk
+oEjTypNfw7OLLH5jBUsHvSekUI5bp391UFRn1jmk00gv17m7k6RaR8fsiAPKFfXH
+SQeGdOXhpkfi8RMHoC2Mvz566MxjTD/pR8elowwKqTQzOAQMKIXDHAX0pw6e4P+O
+PXlK6S8MLQHWyo15QvKFvDohG47ynFwx9nZdasRDXXxiL4igNn18ufUZA+ODXIC/
+PguvU9XN83IvQXcqu4QJLbo9aSCOw44oAJcj3kMid5Ot8hYcISjvlYyKuVRkcNDs
+PXJZuMP0DBYbhMATA3EqvfJxQLYo1nN1c76USoqXi95cHza9qxV4L0kOa657LTKz
+NX79PiQR8P1gGQoT6s0t
+=GpQW
 -----END PGP SIGNATURE-----
diff --git a/sec-policy/selinux-vmware/selinux-vmware-2.20140311-r5.ebuild b/sec-policy/selinux-vmware/selinux-vmware-2.20140311-r5.ebuild
new file mode 100644
index 000000000000..a38b14eb5e9f
--- /dev/null
+++ b/sec-policy/selinux-vmware/selinux-vmware-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-vmware/selinux-vmware-2.20140311-r5.ebuild,v 1.1 2014/08/09 19:34:03 swift Exp $
+EAPI="5"
+
+IUSE=""
+MODS="vmware"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for vmware"
+
+KEYWORDS="~amd64 ~x86"
+DEPEND="${DEPEND}
+	sec-policy/selinux-xserver
+"
+RDEPEND="${DEPEND}"
diff --git a/sec-policy/selinux-vnstatd/ChangeLog b/sec-policy/selinux-vnstatd/ChangeLog
index 91fefb5f1b7b..f59abdd49063 100644
--- a/sec-policy/selinux-vnstatd/ChangeLog
+++ b/sec-policy/selinux-vnstatd/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sec-policy/selinux-vnstatd
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-vnstatd/ChangeLog,v 1.40 2014/08/08 18:49:50 swift Exp $
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-vnstatd/ChangeLog,v 1.41 2014/08/09 19:34:03 swift Exp $
+
+*selinux-vnstatd-2.20140311-r5 (09 Aug 2014)
+
+  09 Aug 2014; Sven Vermeulen <swift@gentoo.org>
+  +selinux-vnstatd-2.20140311-r5.ebuild:
+  Bump towards r5 (fixes duplicate context for hiawatha)
 
   08 Aug 2014; Sven Vermeulen <swift@gentoo.org> selinux-vnstatd-9999.ebuild:
   Make 9999 ebuilds EAPI=5 and transform to make master for version bumps
diff --git a/sec-policy/selinux-vnstatd/Manifest b/sec-policy/selinux-vnstatd/Manifest
index 964e5cac1aff..df8b06f111ec 100644
--- a/sec-policy/selinux-vnstatd/Manifest
+++ b/sec-policy/selinux-vnstatd/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-vnstatd-2.20140311-r1.ebuild 391 SHA256 81916deafad5ef29742945041ff6ab14d3aa2181609e515e5cadc9708e42019e SHA512 f283afff00710efc481c652f751112d120a132d4b0c9988d7e4b60afc73a370d12e3db201ebd98d06f5caddfcc42e507e641bcbe1d77130056d12b8b86340ae4 WHIRLPOOL 3151888432e6142f3bc22806ef116a7f997034c6f866fda070ba51178f0c9f411fbe22382ecd5507bf3dcf1c11babd2b3de1957b6941a0afd7927e8cf4db53cb
 EBUILD selinux-vnstatd-2.20140311-r2.ebuild 391 SHA256 4a538618d603be417572877cb56c5ac3fec49cad7bcfe403c46c414c57445a91 SHA512 ef07d2d49196d7b8262319ce366af755f6271abac00949772b09b5edcc5a13983b8d377de2397bd2ed1f587bdcc8c366c9e182b212f7ff484dd73a34d151ecb6 WHIRLPOOL 6317a5b1c4a018ad6b714905b39c9bd390dd7ee1158102c1521eb8591421717b6ddc298b7fc8c1115e8be71f70e7f7941eb92eef99ade222b9045f492614fabe
 EBUILD selinux-vnstatd-2.20140311-r3.ebuild 391 SHA256 f444c3b95c8cc7f1e15487357911bf468980c7c339092ff410ef77eb4f895f6d SHA512 787fbed5f20438dac0761d2e265ca5cde59a37874e581b79b47d5646b6214ebaf6971a0430e7a1ebc382128be7074150d65e210edbbc519d6ffd369d3fe9028c WHIRLPOOL 9b931671e51cc778939c5291febbf717a7f9464c79d04c9eb74d5e5fa9ca152a57668d82ed199ebd76ec737252c4664095ac589ae0253923d66588363c45e1dd
 EBUILD selinux-vnstatd-2.20140311-r4.ebuild 393 SHA256 701f11b2f2f7c5f8df16777d74a2bbe698a7401f9c9d88393e47953de1a7a0da SHA512 a6d842772f69fcc466985f72415585f997d69bc154889526cff133d360b08295ef8cfd7fadd9aaa3a8c6771ae6db8ff20f6de2ca3bc38d1014c468160b7d4201 WHIRLPOOL 2b6a1f984d2cc7f2077f07430b72c52966ac59768668002a3114e902a92fb0e29df83ba47ad52c4e90b6c98f607d96fe531f3510d38c0db92aa3b4aac26014c7
+EBUILD selinux-vnstatd-2.20140311-r5.ebuild 369 SHA256 23ddd3767dd69e2429f571d53d5150aaa6a63fcdeaeceb1d934df97906b51e47 SHA512 d251468d465cbf03d283cbef4c9e8716aac409dc59104e68464665a081eca2aaf16d00e2f72cdb1637b051f3aa4c1cb4b597b876d4a72d1e927c90a1907b0b14 WHIRLPOOL 217a35298c84fee11c487a7737e8f7f317845c420af4a880fff40e8eb3fa55c2ce3addede2f7d085955f224a34d95d847944289e2969d13d50c319faa72c8e37
 EBUILD selinux-vnstatd-9999.ebuild 349 SHA256 8dec3aacca909ede39aef087ef0cf5ff8458673b95858e2a58e1d40615b69f5f SHA512 17a7db6dd0a8a688a5d10ed054aaf189fd19a2640750f96ac2a8d5b69f203e606604c12590882b1001a096cf9ed8aa12e64446260bf237c57a54af697d7ead12 WHIRLPOOL 76bf760b1b2ff19292acfe7a62e4eb1c7779918e8ca75e4f945b3c55983dbd38c959331a444111023829e06a5df8f3a7ce1b276249f596a333d8f16fe493f03a
-MISC ChangeLog 6320 SHA256 950365a0d5b6d2e16d3187ab3148bf4901be76b9a87e1c0032ca081a09d77b94 SHA512 7ad3a2ed2422111ca73f8012d6fdaa6ebcdce4f55ea1f542f64944e36564551ce1435ae0d05f4255dbced1f6c2b1995abb81951f8635c15c0cf33bc14e23e45d WHIRLPOOL af26d13ffe4c29c56d4ac31cf6bdd74710debc98e0ed02489a8581b480221001606b0dc3229d56defacb34feeed800ae74085c8599681e916622df332d750892
+MISC ChangeLog 6514 SHA256 7f84e572295654f1ede054e12aee77a182b87bed58cce3231932a5e5422b1b8d SHA512 7674cb37c0d04dc35a744206c27f8479e5d7fa09b11d446e2ed79beccd6af580980b343e9bdb19c82f680a08d5919760a7ddf97eb98949e4842ae339ccb15769 WHIRLPOOL 19e2dbedbc9cf918e891c5af70f55909d0c9cd6e4b8e28006f3ed661b3a97f4d2a1c066482c01f409dd32fa8d6c03b4cddc0407793a6d6d404b743cd5b952782
 MISC metadata.xml 231 SHA256 ff22c17ecf7f65c10e69458e647d0e2609d0f34cb0ba665b78ee746522e790c8 SHA512 9b9b95f69bce4a38e1343d554d07fe3ddca2b41245940d0879c227fddf1ca6fd2aa668c1e4db98a5215ab24bd5b2d67383661ba631625eb3afa06348562b1033 WHIRLPOOL e0d4416209d6f7f297bdbc4ae7340d8cd3a34dac213f4a796137c542c4a316066b665b278b8b8e451af1670e74d8e2800a6069da1e445ef85067097ac965249b
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0
 
-iQIcBAEBCAAGBQJT5RyoAAoJEC7dUkA7aK9HiTcP/jjuzBomg/Uu8Icg9Jk7ztxb
-vL/Hypwfgl6jyFIZv6Rurk4YKRsJLRmi6Lo+RROdPtmaAM+oe3glW6hYMLDqTI77
-J56neCCQtsTjRy1nNcNDzAuRHO1T/fXrjuFw4S7idiNkhg1EmlRQbbafWmZoj7qD
-X+WDrY56EoJLzuCu67+DaA+r4JaBwtCMqsfkcZmveoM7EH4KI1eHLal6bFqlCNah
-5PWGkvTxlFmAh9Zt5WsWjnuHBhZxVOOVFQ9L3B62UHEiHpjgsHN9Det28DX+rKCV
-EYsjMhc4n83XTD/GWYrxPWty79C7wsjAi0UX2K1sCA1DrT3rXBYRrVBBleszpZVT
-nCU68hMEK3vnfADHQcFFpv9EB6UNTIsL1u+tceB/wOj3IwWFdyuR95PfnXTadhb+
-ALWMwbW0DfGScDoFdGYcL4Nn4TIrw3B9liBaDtmtTuCjPCiCmfD73znOv5e+kNty
-+UmKiYaLoJb9ZJjNSu3R+G9GKGtp3uBItvDy+9/6FrMKXx8mu3/c4PAzFkCBmiMx
-isRSjJf2s91TMYwWERRYf4yd/Xs0nRWtWqqCtAzehqNl0DnnLqK6fr9DyNRde3X3
-Cw6r+sm65kTz2piNWqFAwhO+WS8IYh+DZRKT77W65U8e8n5ooaG4jg13gFyRkd5o
-KsAurf8eSDMb0mzK/8i9
-=OE//
+iQIcBAEBCAAGBQJT5nh+AAoJEC7dUkA7aK9HQWwP/RUhZJRDI2tz/MwxrwxJ313q
+khYDDBHX3nF9AEnWCGMfb8XRvPPzdo/K1XTLcGNzuya9PV0Kv0g2qBefqRLkMI+/
+Chaa3Ld88D7FI1LPyVoy0vA/pgqxWuJYXkvTWgWgkwFq4/rSZTX2S/WyqmlyXu5V
+CPAnK/2LzWSWwKPFhONUsidq7AaFa74NsVmDuzeuUd1BvKiuVqzT1Z6aUl+HjJj0
+9nuDpEHPSZem6bBitkH/JheI0k0mpnYJk1aqVuIsgWjQOW877KNWbEsOQ2W1XRmv
+JJxeJHw3T+ekyRDVO9hHdI8KmO8hl0s6HVBScQjSHC7ZoKAH96gyBmR/fdRcvEcE
+XA/QXDA10uoPubRDxKiuXtSOsyA3lMSLwKB9VpD00KUuSu11CrtDIUqrE3QTXHjI
+3/N4n78bG7SYohvYlNQXJiQlW6GUsfJveeaPZtb0pQs1/el1Evv8m9fC7/t2ALz3
+sW3kwz6YT4CEXMov7yExiYOlvWIm3kw2Q2gzPVRncXrymsVPZ74iSs4Xdnv7zD0Q
+X3x14ZYFbvpc7ie5n6OrERTSoLkAapMXpk0ke5ZutEpsINi5ZuXCvQK35Ly7v8bp
+qzXSBmBdUxR97sS2SrOs9Dd26SfwJbrN25onlAA7UnnYaPFvadKmNRy+8/JnCDmX
+5IJa/Ynlffn7Vd+s9X8r
+=M49d
 -----END PGP SIGNATURE-----
diff --git a/sec-policy/selinux-vnstatd/selinux-vnstatd-2.20140311-r5.ebuild b/sec-policy/selinux-vnstatd/selinux-vnstatd-2.20140311-r5.ebuild
new file mode 100644
index 000000000000..e890967841d9
--- /dev/null
+++ b/sec-policy/selinux-vnstatd/selinux-vnstatd-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-vnstatd/selinux-vnstatd-2.20140311-r5.ebuild,v 1.1 2014/08/09 19:34:03 swift Exp $
+EAPI="5"
+
+IUSE=""
+MODS="vnstatd"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for vnstatd"
+
+KEYWORDS="~amd64 ~x86"
diff --git a/sec-policy/selinux-vpn/ChangeLog b/sec-policy/selinux-vpn/ChangeLog
index 6293863080d8..01f0b98b6a87 100644
--- a/sec-policy/selinux-vpn/ChangeLog
+++ b/sec-policy/selinux-vpn/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sec-policy/selinux-vpn
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-vpn/ChangeLog,v 1.42 2014/08/08 18:49:45 swift Exp $
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-vpn/ChangeLog,v 1.43 2014/08/09 19:34:23 swift Exp $
+
+*selinux-vpn-2.20140311-r5 (09 Aug 2014)
+
+  09 Aug 2014; Sven Vermeulen <swift@gentoo.org>
+  +selinux-vpn-2.20140311-r5.ebuild:
+  Bump towards r5 (fixes duplicate context for hiawatha)
 
   08 Aug 2014; Sven Vermeulen <swift@gentoo.org> selinux-vpn-9999.ebuild:
   Make 9999 ebuilds EAPI=5 and transform to make master for version bumps
diff --git a/sec-policy/selinux-vpn/Manifest b/sec-policy/selinux-vpn/Manifest
index e5bede69a98a..6916ad2d70eb 100644
--- a/sec-policy/selinux-vpn/Manifest
+++ b/sec-policy/selinux-vpn/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-vpn-2.20140311-r1.ebuild 375 SHA256 84779ff4c2979058ba6d2cd035a77168b42637e5f8bd9a0182290e40a8205989 SHA512 ff51513ef5726f7e8ba1e56f5684c4a03f53db1430b1fab19582b6fe080879aaec64c1bbac9cbd34158089b329711a19fc7cee2e192dfb52617535ea8b2088dc WHIRLPOOL 0ad2b83faf3068e80103769963fdcae7ec7114e9f51b787deaebdd32faf54e660d54ca75f58bc17ad167237c4b6e2208fbdd7ff1a4d84dd19300584cd583d24f
 EBUILD selinux-vpn-2.20140311-r2.ebuild 375 SHA256 a66a487baaf44ba2d4162e571ab7181a10b17f82159c605205338344814b101a SHA512 da433c3f3d387f15ccf44f45f7ea8d93bd348f525e41f41582065fec076c2f6207590f415b5cc6b94a33bc8799bc8d4f23009764860285f05bb4be89b758e336 WHIRLPOOL 0ea2ecbc6df90b2ec21c3a6b80b2700f5135c853e598cc5c738d74addd454677ccdc764dc80fa9170fe5bb01493b4a9a9d11240ae6a0cd8f52aa59776cc5f693
 EBUILD selinux-vpn-2.20140311-r3.ebuild 375 SHA256 bededd46dc3bf13a4fdea22a2b5237f2420bb8cf693baf7d4430671fd6be7594 SHA512 ebff97497d4439eda3a2977ef5e61db1c60c3071cc560669b4ddc6f52259f6df4d938e2f0ec8ff0696b3bbc1628de20cedccdab924e00ed5046206c5275573b7 WHIRLPOOL e74acb3740beca4e5758ecb3249ac1baabc98814456aefd61a043404a1836182f9f1bcf9fccc8adcc8ddc83277bbf0b627427482709aef12be5f6ec3b6981f47
 EBUILD selinux-vpn-2.20140311-r4.ebuild 377 SHA256 94689e39213a64c9cabc7ea35d207fb33e2a5c230c1e0c61880a3cd55e6e11c4 SHA512 5b195b5a570f1271b101f855b5957d4c00450e529abf33b108305429b587b57a50446b71751c09698ffb568a61d96fdba5643d61fdb0df399284fee9f7fe2a17 WHIRLPOOL b327f51badede909ea4abaf734f706f298c404163c69cb4458b2bcee1314da75d57839af76bc38c9ed120fe120c62cff2335e8c2561998629a85472a17e4e276
+EBUILD selinux-vpn-2.20140311-r5.ebuild 353 SHA256 bee2dae031a56d369b9d64f9737368e564f27ef6d0c3fdc18fd63408b6c828db SHA512 8f69c5c8d0eeab0249fcf30051bd5a70a7608b5f96b727d204346dab13634bce80b34f1c9eec97c0d1e95a0710f109a6abe68d12411e0693d819e382dc877081 WHIRLPOOL 342dc8ec449cf9f6740108f3fadaf9a259963156ab02b24364f1c260a20739f0dba86a339461cb1781f5b705308b84b9ee5edd617542f9f5f01a810eef4f76ce
 EBUILD selinux-vpn-9999.ebuild 333 SHA256 38395d4169a89cf03a866577f792e2fead96234da817c6b905f7207324752399 SHA512 99e3588262c873909167b5732226912fadcea5bf86c89c61ba7d5c96280fffbc926c4e6b6984e31b72889b83e1d81e73b3f79e9a14bd8e5f64ffbf6c61dcc7f9 WHIRLPOOL 26190147178d11bd119b1c7ce87da63c0fbf16a89a98f3d8f02be2c87cdfc37a51e33d911d69ae09dd2ee8f7c1238d5245b7d764f07e5f391b32b32bbf724d7d
-MISC ChangeLog 6286 SHA256 e20962f57e6a5c22b8324f60fcb2c3fac068ecfd02dd7c1a2b1bf2688f1c9978 SHA512 2c6c401317baaceb553775280e7fe683344b4bdac766d5600a332e1fecc183c67e77c8bc8a0ec593137d26fadcc8721a95107e57bfc11a4ad3fff19ff9bb8176 WHIRLPOOL d9650e521c370a3caaf0f32f3cc8590dfb07b60b528372670b8521417db8c1e75c563403fb40b1d2dbfb200b35db7120b2715e62eeb15dfcf1118ed943f53ecd
+MISC ChangeLog 6472 SHA256 e1f53ea884cb6d730121062f820857397e5b9cdb48e70f4a81fb2137ee37f69f SHA512 64cb8e7d615b5a012b8fd59d7b94df7b56fa2f07b8e7cb59cd23bca7fc238a5742b39bd6e30955828ea97c5fb6858ea59d3106668d76dccadca63ca33afd2801 WHIRLPOOL ad1328a11873df21862eb9bf7908b0c62d899e43d6b5f2d1d8865c1e384b1042185d0f5ccd80129130295447e94c72aaf36fe09c2eae932499138be677a3681b
 MISC metadata.xml 227 SHA256 531a308b1a7c1875c7e9a00c4d2f5de4dcb974eca029602e39bfcb478b9af587 SHA512 ec7be2fd7e2cf765e9f9e11be0659002d30c22763c7eabf400acadb56de95bad8562ea60befc3129a266b2f2d9ba6b10d3aba63c2bea9b430c12fbc9462d6c0e WHIRLPOOL f7605323240a27d3924e79080eb2c3fe0b90fbe06b0f6df5703114609950d98b03ef21a816f27ef8cf1d105897682c18bfff844e1243a2e7605a7514a2a0a9ea
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0
 
-iQIcBAEBCAAGBQJT5RypAAoJEC7dUkA7aK9HxqEP/iBsPZLQtbWBos7Krw5ETuRS
-/YmPK43ZJ4Oc0E5itiy/FzTgHRCgcJ1ewf7BexW0BXGHQqTSQVNtDuo410XZIpQ9
-E+XUyicoSoTRXJYjRo56JyWL+9tMVgcuGa3NrTJ56z8lD6S9yjdWLJvCmOSc4SSs
-ALTOOU5F/Fsuv+ZJgNiR/Ty+Ny3joKivqvGGrHbfeo6So6YeQ0BIlb1PoYQwk3oQ
-OSCJ5fLuFHM9A54wahYr7SUhE3oR2DQ8mGh8ExGtLCTINdbcIRfDKbbZT7otZfUh
-+XsPQ6ddnqerrasYGC2FuygpQQJfJgNzJoALeLLuFKtaFW/VXLZm2ypBDc/gbqk6
-zQDRGO2WepTuufTGR2njS6fgUKANyPHknR9qialuAsPSxVvCmN8iaZdn04Xs4k54
-kCKPNMwlK7jqu0mTpxeoS0dG901fHZ9a2LWcMdcmegO73orD4yiG19UVLmjuxDi3
-MHe8b0wLJzdBCP3YwZWsn/Nd52jS2FkYi79xjM6N5QXzclAB0BWTR40HYtOQDgkG
-huQdtD01zi0PC720n0BybjhXStWJiGkWWprwMsH0rMF2NiuFhgPwiszq51PbLfy/
-954nIUVrDODHG3ixXrolkizt/v8tK/3SZf4y3BURNGMSmmbKpvgqqme+ltMbIMNn
-xy6grVVObL6AVfnuz/e3
-=lh28
+iQIcBAEBCAAGBQJT5nh+AAoJEC7dUkA7aK9HLaAQAItGlOZT8ppaAuUcUhzwb+Wz
+LDV2ZHHg9h5roB+ato8xWFS+aD6w2VsgCDM7K7KJDxWtIveyqOvDXOytV0NsNgEY
+chjMX/YFSQW6oUptx1mmjUFkDYSJnL0wO/eJn03S0GcZTeIFEWbcs7ZCXAFnzdUi
+XVlYB9BJtXtQ9c6wrGRUxoohMswBPouzF0caScbiCFqsw4EVocv7dFwncIL0RWBl
+MyUn3FrCI8vH2N88Cs+uSG+N3hn7qG1c7rOAzbvF54pQObe/hARaE0dQJbMLUlaj
+tfF4MC12suCZIKS+oQGRsB78BOVAQFvOc+uWXV4yNDZeOPrJL0azvfj3Vp831In4
+GESCvQsPIHa0xvwK5xF4MOnu2i7CYZBvpqKWY9d0U8zrEOAznJXqE+CD3LGRU55G
+7/QOGEanVeHJXmwTsx6gso2ErbjQ8zuvrMx+XVoIoj7cpDEiz+u4xaUHW4SQSBU0
+7oagydzHFZG+pip+5JITEzG903ojYy/jx621bbmtTcjIjx89Roa4oY7jbmr2suZP
+S38za/xEDd92UmmOUosOA4FGjvwkIm6XT4Hts2SL22BD1Lj4+AzoauiUx+Ya4Kqa
++U4JaR/soBb4e4CuJyvRrAwJia/6YqSst/kP2blTfo3pE6meuebBzTN2w1ry0LBG
+UkHBmd0rCA5Z9YnmlAsz
+=Rx4D
 -----END PGP SIGNATURE-----
diff --git a/sec-policy/selinux-vpn/selinux-vpn-2.20140311-r5.ebuild b/sec-policy/selinux-vpn/selinux-vpn-2.20140311-r5.ebuild
new file mode 100644
index 000000000000..987110756131
--- /dev/null
+++ b/sec-policy/selinux-vpn/selinux-vpn-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-vpn/selinux-vpn-2.20140311-r5.ebuild,v 1.1 2014/08/09 19:34:23 swift Exp $
+EAPI="5"
+
+IUSE=""
+MODS="vpn"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for vpn"
+
+KEYWORDS="~amd64 ~x86"
diff --git a/sec-policy/selinux-watchdog/ChangeLog b/sec-policy/selinux-watchdog/ChangeLog
index c864b578f116..5a9c401562b0 100644
--- a/sec-policy/selinux-watchdog/ChangeLog
+++ b/sec-policy/selinux-watchdog/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sec-policy/selinux-watchdog
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-watchdog/ChangeLog,v 1.42 2014/08/08 18:49:32 swift Exp $
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-watchdog/ChangeLog,v 1.43 2014/08/09 19:34:05 swift Exp $
+
+*selinux-watchdog-2.20140311-r5 (09 Aug 2014)
+
+  09 Aug 2014; Sven Vermeulen <swift@gentoo.org>
+  +selinux-watchdog-2.20140311-r5.ebuild:
+  Bump towards r5 (fixes duplicate context for hiawatha)
 
   08 Aug 2014; Sven Vermeulen <swift@gentoo.org> selinux-watchdog-9999.ebuild:
   Make 9999 ebuilds EAPI=5 and transform to make master for version bumps
diff --git a/sec-policy/selinux-watchdog/Manifest b/sec-policy/selinux-watchdog/Manifest
index 1701b656e760..143dd84388de 100644
--- a/sec-policy/selinux-watchdog/Manifest
+++ b/sec-policy/selinux-watchdog/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-watchdog-2.20140311-r1.ebuild 395 SHA256 f9504ca28b9928db9747f72d2df99a3fcefe4107834c75499929f8e504d3eb1e SHA512 f90b65d3aa714bf4155b49934c466b008245456ece4fa54dba3a4f15a4d1d368412754acb2745adaeb1a6e728b5ddde9bb02406cd6374e86bbfad0e00010a1a1 WHIRLPOOL 0604e615cd800b426bb9b47b2d1739a02ef4f3af2936853e6b5597089defe5a9b56fea54c4e045a7074a8f3b915bc49be82fc74b21de71481ace56f245d28e1a
 EBUILD selinux-watchdog-2.20140311-r2.ebuild 395 SHA256 5a2c3b4be53d770f98bd9e043b7843b5d2989baf5cb1f0c9d896d12ad5a9e043 SHA512 43f1a608cb0b90f049de05e7a0dc5dfaf761062c19093155b8a4bb0b43ae0631b0f4dbfaf8db483f976570612d8673ede9f98a7e68b3b1d7ca0071d11bd6ffec WHIRLPOOL e9da14036145b253651c978ae8361745bf1cbe06e3eb6e5907bcd0dcbe87a0642da53d2cc39b0e8e3100f08e63bb654c9c63053d460e3142d309307ff21bf965
 EBUILD selinux-watchdog-2.20140311-r3.ebuild 395 SHA256 4ad2755db4b802617e1d4fb9a69ce2a46a72ec66175ca2ed74aa04e70db8b5cd SHA512 3e3797f19354fff2ed2bc115bfd6c44a127343df9efd76b5e2249d73f4d0205537a7199eaf99e9f791359bf2f88c6d3c3b9449730b5c21be56abe10d41dda5d2 WHIRLPOOL 50d21fc91c31c341b46951ef56d289e1ba93d19a18fb58759db16ba7d43b0ec866a5531ebf34ba748891f5a9975d09390d69df87f3765136459e5be448d5621b
 EBUILD selinux-watchdog-2.20140311-r4.ebuild 397 SHA256 ed4e6883e17ccd88a69f30c75bfe1c66fba32cb33dbb5748ad4c22c634fc4380 SHA512 48d42543f362068104a7c728c1d6db81e1e3eea2260d15903633e045e1144b7e16e7c4bedce97333e4e88844103f55bc966896407b747290b2a1f6227cfbabd3 WHIRLPOOL bcbbb626b9a3212694929a49d0a48e085a68e8953fe6d7e15b7cc71628351bbd97b7a77a026a8379252e173c0b0b3d3ba25d063258abc95366c1a5284e055457
+EBUILD selinux-watchdog-2.20140311-r5.ebuild 373 SHA256 80f0d3820c9d27d2f2be8db62fa0d94486c3e4d9ddc7cfe760c454e3d9c52ff3 SHA512 d744b19033ee449ca33f2bf1c5e046a6c1bf5a920f51e7c1b2008432bdcdd0d7513ab3da265a7cb1efd08ee3fd6891550ff4b64662d29191f08d9d069fc5d75c WHIRLPOOL 258454aaf52242573c1adae16883d572e3ad1548618f5cf30448b5236ecc494c38171287e7c9f76ee7c0f272669d0b92da56919ee0a17d4be4d232fb50247c67
 EBUILD selinux-watchdog-9999.ebuild 353 SHA256 db95af382de1b1f4bde91cdd95131a12598cc717bf1e5afef7ba1ca93628eb4f SHA512 1b87666bcd5eac8bc1971872d0af3e3d456da1a9ce315e234c723dffbd8daa25a3d6783e8bc95ce62141efc5ae3a4c60fdaf0d9ec01f71cbaada74273ea3aa29 WHIRLPOOL c76c93d7c43d8cedb94b1e60a9873b64fadccfaad30cc7dd57c5110bcb5acf93c2ffb7a2cd85fa364dfbc2d1cb99572f2f58010e6f878add4d983366ca9442ab
-MISC ChangeLog 6671 SHA256 0fa1f2773909a7c2c25b02957305f672fa958b44b848865d27c4c78e2486fd4b SHA512 795980c3202d379ed359e3803dbe641ee1ae145387293acf92b98ea29b6a95075f5c8dc8c9cfc7e651c3b6d903548c2267639bdec4d84d2808f2974a78e2518b WHIRLPOOL 78af314a071678204e19afee8a502069f00739bf3498405452659d15d930f0eea0018b266b658f1930e0609cde72c27be1e3975d84d37ae3ba7ff4e18c4d9ad5
+MISC ChangeLog 6867 SHA256 f369a7b962045a7c173ac8bbef28e01311f77cd852162e22e011d30e5dc9cb55 SHA512 c6d770b3e47bb441a45d9a69781212d0e9bbbad06669e6f81d0b85900d68eade99d2a6342b2948ecf6e304273109e4e1558bfb376bb229692461f3b997663ec7 WHIRLPOOL c08e1ef142cd9a2fbc168c30f1652074ca5f0688af8143ef7464223266fec14f2ef4dbb8a95f28ed38177373ccc71d579dd8ca63fcda1ebe0f35dc55eb34d2a8
 MISC metadata.xml 232 SHA256 701089dfd53f3ca8e1cbf39ce0827377e3b02bf697e5f8f351bfa2c3e4dfaaf8 SHA512 129eadc246fa04ab2885ecc5804e941e67ad730d61d9ad13d470111f10ddbe61c094e6b7398b90bcd5f59e54707fff85c6fcd7ccd4a1f821fd7564b00f6bc795 WHIRLPOOL 6f78d368fd11bf122b85d63d85388cdd9acc0a0db99fb69a2af081377d6d29488adb25dc2f07ced5cb25bc8ffcd842a964b40b304262195d56eaf95e06ae1b9b
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0
 
-iQIcBAEBCAAGBQJT5RypAAoJEC7dUkA7aK9HZoEP/1RFzW7oYy5B4In+D09LufJD
-RLRzLPYFaKnJOVOM7otOGKQGzExrdxDyT7eo8kyXqX2QEC+XpB1nsKw9+mhwk3bD
-ZGz9lArw9sgVA8M2ODYqTK9BrPNXiduZywwK34Mu8DBVtMEVjInTqqbrvu8V9Rvb
-zIHr5I92Pd4oHbjycIun8rFmmNwpFGB8cEkY9kkE0+JdDoYfYGBMDIwVlENJD/3r
-+zolx+J5PvQRkslgznA9FzCBVHVV4f54GADoHp8lps/1TwggMaZWNgzJRau8yshO
-7KiRG++CAocVJYG9/2dJ7gH9Sft5EQ1jT2+HoWghmrT+kV0KRo7ysSqpRBUgU1vb
-DusCwaZ6mbTZ2her5OJh7bNHcsY+gvLLP2eqDdVnZKMWdmq6I9o8V4IApgZSGR2A
-98sB2vDKJDP80uDj9DGzuHG148Uqp1PlP0mj/AdqPirJPWuwiq5uMSuP8vgcFKL1
-RoMko3sqOsKpGXXomcCU0kSysOVhbDNH4g93UqTBCqUAAJ1OADEtqyfXHlElAYHX
-y4M+nNXzCatqmt4IBO+1RdjagIWB+Q5zAHmNKyCSKtF7UMkO4WzInJR3l0bcQZHK
-30W3Et8zy+jcfJxos1R7nSSi+Vt2ut66+rgQfbJKRxmvLxpBv1SZzR/JsInB+9Dl
-u2zN+I8GubFp8Agadche
-=b9Dp
+iQIcBAEBCAAGBQJT5nh/AAoJEC7dUkA7aK9Hq5sP/1247cYEWZGoqG7S8DhSMw0/
+P9oMqco3AxyLz0iW6upNZYdYFTjYhy848+BmkKWIa9j4xfd7GaPURP9G/8UV3tLN
+uU644cizaRwNzI+puYZIQo3OQKTOQZtU7cRT16Mu+ZogptNWuOY6Y6ZivCp6TvMu
+2xg2oH+HxZhBP1TytUXiLd+Hx3B3f8Sk/mV5eXhe1Z1q1Mlh7zOu+VZLVo0Gxdqi
+GPSAsc16Ug4z6OlMPVKoCoBTnY61dPKgmNGBzF1On+XQMVmhA91jHk+nk/xqasAv
+L5ImUEaXSZl/m46UiYZsv7eeTJFHtDWSXbtI/7qm993jp+QcWUyjNj03LXuDRiTP
+0PgvgCy1GQTQYoa+j7xtLm5kGco8wbzZ4bAnyV03WHnlKdk8LP1nUpeoIQV8W3Ky
+EXtsJXH1vR8Bj5t16ntz2onp8YrUd3etw+wu95pl7TQOOAF4v+itNo/TAiuc0+tE
+TC186AEHhIDOMkJETXn9nFjWNrzC37a9RTyLunO1R8sBk5ZOzpacv/58NDVUzbNI
+cGuZrsMnZHS8d18Ql3vhi5FB/uzpel9Auv3TM96uuvQmcs5HCypF3VAZk5GaBbpG
+Dkr8e/Z6rm0KA9r30lkDf1W0xXi7sgiltGUuD9su6viM1q0ZBkOH+WmspXz95UAM
+O2o6qY1l43i3Pv3CqZZ3
+=L+oY
 -----END PGP SIGNATURE-----
diff --git a/sec-policy/selinux-watchdog/selinux-watchdog-2.20140311-r5.ebuild b/sec-policy/selinux-watchdog/selinux-watchdog-2.20140311-r5.ebuild
new file mode 100644
index 000000000000..80c0cf059892
--- /dev/null
+++ b/sec-policy/selinux-watchdog/selinux-watchdog-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-watchdog/selinux-watchdog-2.20140311-r5.ebuild,v 1.1 2014/08/09 19:34:05 swift Exp $
+EAPI="5"
+
+IUSE=""
+MODS="watchdog"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for watchdog"
+
+KEYWORDS="~amd64 ~x86"
diff --git a/sec-policy/selinux-webalizer/ChangeLog b/sec-policy/selinux-webalizer/ChangeLog
index 95af05280a85..498e868ab32f 100644
--- a/sec-policy/selinux-webalizer/ChangeLog
+++ b/sec-policy/selinux-webalizer/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sec-policy/selinux-webalizer
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-webalizer/ChangeLog,v 1.43 2014/08/08 18:49:50 swift Exp $
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-webalizer/ChangeLog,v 1.44 2014/08/09 19:34:22 swift Exp $
+
+*selinux-webalizer-2.20140311-r5 (09 Aug 2014)
+
+  09 Aug 2014; Sven Vermeulen <swift@gentoo.org>
+  +selinux-webalizer-2.20140311-r5.ebuild:
+  Bump towards r5 (fixes duplicate context for hiawatha)
 
   08 Aug 2014; Sven Vermeulen <swift@gentoo.org> selinux-webalizer-9999.ebuild:
   Make 9999 ebuilds EAPI=5 and transform to make master for version bumps
diff --git a/sec-policy/selinux-webalizer/Manifest b/sec-policy/selinux-webalizer/Manifest
index 069ba9b14cb0..da8c64d070aa 100644
--- a/sec-policy/selinux-webalizer/Manifest
+++ b/sec-policy/selinux-webalizer/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-webalizer-2.20140311-r1.ebuild 455 SHA256 254f981c8b3cc31612bf88b56db004c51f5b8291bd59f03c5320df9d993d1c9b SHA512 1ce4a835bb55ee6c48f0aeff14c7009d4abb34b0f57a03445556807e67453a05512aef5a6febbb2d382a7b0e4dd939dffce61bea70a8eadd9501d2f994c46fd3 WHIRLPOOL 6f7d272c35d4a01ec6d584aea2bf78898fae6e6f70b84bcc17ee971fa2756f357f67a6a3da344b409b075c90f395681201a80b85a2897788ea195bd1b56f6db5
 EBUILD selinux-webalizer-2.20140311-r2.ebuild 455 SHA256 8b52e4dc089d0a792c78e5982e8d5066c106d6a58e04e53debd18a675ff6ddd1 SHA512 67a51bc0feef0f1fbbf5a773bd38edd91242c21d1f7048dfb940721e9ca0e1dfdcb3ed94b8c75a1357620d13bafaf9e152946ea743a9dc7fe65785c9b45aa865 WHIRLPOOL 5c6d709a0809d8e92d3658f0ba0cc32b8c0e7755071fdaf19a92f0499d4b64ed969195af136a25f53672789c0821ba2c63c32e186dbec969aaaf9f1d0d92665f
 EBUILD selinux-webalizer-2.20140311-r3.ebuild 455 SHA256 ac38afd73d4cc5169672d25e20fb5bff029eea854c7d5781c151a7ea699af3ee SHA512 9e73ef2999e8ff09667e340fa0000c9066c9b9dc8a2acacf32aa1e0c68b1ea6f28cc0dc57c2a2af58160efa330e7f9297fd14ea9c7868bae2072136fd22a0fbe WHIRLPOOL 3e611d68bad69b79756459fc977a6ab20046ea3c3e998a2f222b389b1ad6b7992d3505832874e406e520a7d19378ffcfe055e454f5678f155a48d68777c64ae3
 EBUILD selinux-webalizer-2.20140311-r4.ebuild 457 SHA256 115950330afd7c46bab13aed64031315edee232f22c2c368506e66757004c415 SHA512 1064d81b3823ca701c5cea3497b1739f9b880e65fa28ca8754729a710f712ee3a50c13eccd6c409990279977b896e55815b8cb56f842aafa4bbedf36bc722068 WHIRLPOOL 1c8581e56f2c5cf8b5e5002c4182d67dc01408ebf77cee6a018b3eac92ccb65987b8fb7337b2f28ca2781e00a9c1cb71ef107dd927ca2c89b422f03d23324775
+EBUILD selinux-webalizer-2.20140311-r5.ebuild 433 SHA256 d82902f99596ec582c3bcc49d1db3013e2c6df3fc43ea5dc828bf901bfda0d35 SHA512 c8173680b41f899f9b23d03f30a3b89d8a5f9b3074cf53d70246592d8270dbeaeaad3a6dee270a098938d62c01baa91c54912c31216ff4f764735cf28a4b1b7c WHIRLPOOL 92a3133090d0f8977029109e176e6fca77f6b5af027ff4ce15c279a1d707c29b543e3158c0d2108ced71c65d29a432817864ed5daaa64cae76ceaa9ee66df0e6
 EBUILD selinux-webalizer-9999.ebuild 413 SHA256 2a14400e2ef329e9097ed67aac4d75e39b5bb7cb31630e2354574fa84a090f55 SHA512 a4204c532ad8af822728e7ef014431434d475ff3a3230c3f6ac98c7ebcc598c63983bca60ea5eb37ef5c6143d042b5b844251375a8a54338a7106b4eb031e4c8 WHIRLPOOL 544ee68d3c9f95ecefc58339d05c01446434ec179abe2e7e2bbbfd5f9601a25940dedb5db363d33289c5b0e0129c4608e5a071250084d52d0da7afef9f68ef7b
-MISC ChangeLog 6928 SHA256 4048b3764d54e8d804b1a3427a936eff3d3b664f867689dac52133463260273a SHA512 405b99a76e8761d0686325157359e15341e84076767ba93d400da6824d14d86ec28fed96a8b3d1652e43aa13bfa4e57532b79b0b487768c587abe1aadd2945bc WHIRLPOOL de44f91e68976e6873e275ce7febc5522c57c05839803e7ad2a1fb65685f976344bb08874127d10035e34b8005f18a09f1a6744615655ce4f79f3ecd8e110ec5
+MISC ChangeLog 7126 SHA256 c961e5a9f912d2d66f72fee83a57485cbb0ce6a917a09979365c9f77de728432 SHA512 554f19146e3fe16f270710c650152e550600d7dd968c57bfc860b2a3e239f3e53c2dfaafb9fbc09ab62630f90c842a4f1510f1ed64fd8960b31a9d2c68767665 WHIRLPOOL 26be354acaed940381e444d413532705516c9edc66f7ecfeab46ce9c208b2c351f2199600ca90d0716ae15e0da8dc66f0ca23069dc353ac9a8893879b5b8cd10
 MISC metadata.xml 233 SHA256 d642231ec54a7992dc5b7c39bd6741effe4af6c2193308dd3343e95ca5e20b1c SHA512 c1f4579db1d5d62024674290f9c809a47acec6481ba8d5ada9bfdf55cefba1b3f88ad9f7c7ac0efe5ef5644bfd2c693350a40ce7b9a4b9940aa3e856e9bfc2c2 WHIRLPOOL 83ab148ef829caac48785776dffab52add9ccb2a36fd2d8c89a44bd0c2329d986cf359a72d89c39c05e3626f2c51f52e113d16e7e4f5380df7df6f87c22407f3
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0
 
-iQIcBAEBCAAGBQJT5RyqAAoJEC7dUkA7aK9HmZwP/0Cf34PvgIXgK5hjjhQsyoOD
-tZ76TnsFjlm4/4wlBwuMXO0J1vUfzB3+V8geyv09QiY6UqbVk2+ztfE5AoWcXJ68
-C6sWLo3EtsMJQ96lL6HEYTHgyDM12W02ixYgbcwro3V8FH2An+jsXa3cPNA+Dm99
-3xKs+nz/oEhH7xOCxAd9WpmDhD2ASn463hm0nPo8n2Qk3f933FT1A2XeYZVN3PSF
-rxU9Z0f67FfyRiX9dbfLWW939t6QkFbH3p7sFY8OvJFvbOhmOlIdrxhnS/dtpg+D
-B2Lo6M0fp+ucsUtzRtkQG95RQ/xUuo8a0ddq6bvdxbVVcy3P2pAkg64SJev6Zh/l
-Z/HNUNBFCYMt/wgDtXxCRyLA51tKc0GLeChmlq1SYBjL2N0bH4/Va3J5413zXWjZ
-F7MJaXdv9Pt9lcmgd6TrsRTA42p4upEyRYmnBiSe1owreqxu2jnTEo2xUC6LLTLT
-Uwae0yRRDYI+yNPwWB8V8BuTaXhZ1tdR1Pvb6l/6x1b31xdc6nrE5BgNtrqIVaaU
-X0UOaoFAT3N0ogaFLZRWH2Hqub/cl99tn0L3/iN6Zb7NYuf0ZeKglh5lSSb5QnPv
-sCzwKQZBtSY4L6P5y2jjmDITr3oibyzKdLMSco1q78G124hWKPxkuYLrCK20kLQm
-AuGhnrQQYba6Z6m1UyLY
-=imV9
+iQIcBAEBCAAGBQJT5nh/AAoJEC7dUkA7aK9HTf8QAJQTXFc0MRXiQ+RMrIiQGMFD
+xCXAJzcksQbASlp9uz3aHCZ0deAYgQtSWsyHA0U09lR57rbIvuhjYn9AgCmMDKF7
+dmXYuSTFa/IgGEdg9cKFvV7SgiJwwPJLMedNaeXDG6iT0o6zJNd/sc9G8iHOS6ao
+qcT5i3aPCaWBOn2r3cLLv+/vK8z9Msa+erzKEX9zPtY6htGhYasL7G/6ba8Fg0/r
+EbJ4o9Pc1lLi5OOg2ww47EjbJ4Xr/hlRMFeA1Bq0I3noL6oytROWP2Gytjn8TyW7
+jlsdAenxfn4EuSXlse3kCy8UocOTY+EinLzx+PnUlL1pb/a9PhaXpicUAIiGCUZP
+Z6lul56kbT5IF6jlXoB+8h+KLIEL1xOSYY278XheTi8jgjXi/4dNkrUVoip8EI5E
+oehG0inygj/ReEt7BTxRNVZ7NNyORvCo1YPiJMNRkAnfumFFoGig6NYKM4kVamK8
+NFmq62IgJa56w0+JqgKzwY2hotb9KWU38p97lHYqjBz4Y7Q+3tDvf7i1SeETH0CH
+uR/ErlcdOTmrluwxIzopHzACds0+9rU6JJSMjfJ5dkzafJmVT9Z6P6djaBdx17Bx
+zHHCL4B0uov4W7C63pbmUkDq1NyI90YO/b+0l7SqcfIovb2zI5+rYvO1TjxpBLl0
+Oqhjyv/RMhZQEQWDV5RF
+=f/5B
 -----END PGP SIGNATURE-----
diff --git a/sec-policy/selinux-webalizer/selinux-webalizer-2.20140311-r5.ebuild b/sec-policy/selinux-webalizer/selinux-webalizer-2.20140311-r5.ebuild
new file mode 100644
index 000000000000..ed22c0720095
--- /dev/null
+++ b/sec-policy/selinux-webalizer/selinux-webalizer-2.20140311-r5.ebuild
@@ -0,0 +1,16 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-webalizer/selinux-webalizer-2.20140311-r5.ebuild,v 1.1 2014/08/09 19:34:22 swift Exp $
+EAPI="5"
+
+IUSE=""
+MODS="webalizer"
+
+DEPEND="sec-policy/selinux-apache"
+RDEPEND="${DEPEND}"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for webalizer"
+
+KEYWORDS="~amd64 ~x86"
diff --git a/sec-policy/selinux-wine/ChangeLog b/sec-policy/selinux-wine/ChangeLog
index 079b8bfbc40e..c46cc6e418dd 100644
--- a/sec-policy/selinux-wine/ChangeLog
+++ b/sec-policy/selinux-wine/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sec-policy/selinux-wine
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-wine/ChangeLog,v 1.42 2014/08/08 18:49:49 swift Exp $
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-wine/ChangeLog,v 1.43 2014/08/09 19:34:03 swift Exp $
+
+*selinux-wine-2.20140311-r5 (09 Aug 2014)
+
+  09 Aug 2014; Sven Vermeulen <swift@gentoo.org>
+  +selinux-wine-2.20140311-r5.ebuild:
+  Bump towards r5 (fixes duplicate context for hiawatha)
 
   08 Aug 2014; Sven Vermeulen <swift@gentoo.org> selinux-wine-9999.ebuild:
   Make 9999 ebuilds EAPI=5 and transform to make master for version bumps
diff --git a/sec-policy/selinux-wine/Manifest b/sec-policy/selinux-wine/Manifest
index 4b3efbe1cf75..23684a4145e6 100644
--- a/sec-policy/selinux-wine/Manifest
+++ b/sec-policy/selinux-wine/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-wine-2.20140311-r1.ebuild 379 SHA256 89995b9aa18871a95d2e0a17394bce9b44a4ff9b62cbe73f5713c8a86516395c SHA512 d1833f22b22a0d6a731f967b4e2972d4d8e522f4dfec680c62b40dad3bccb35642baae2ea62b63822eb8497837643db49f59278155b8448a5c1ede380ee56b1b WHIRLPOOL 23890cbf357071d03d524c769fa56b0e40ea6613f42fd8a1764b932f8afa45e3ae3cb52efb0ca7195c4506c5a7d2dff68da8b649ad2d2febdf35bc39aea76ebc
 EBUILD selinux-wine-2.20140311-r2.ebuild 379 SHA256 b7d262823cfcd9169e412e3fdb0af4187c0704836fbf9a7cb8a1bda3bfec8e7d SHA512 f0b62161424194101abde28292383302b7c073706373307a33c9784eb84ea87e72c2c397ca1c5340319cfec9e6e6605b6308f82591848193851b9789aa73d6b2 WHIRLPOOL e63f43c9dd83a428de7f86440f1e7c09ed7249d2e6ebfd551b90bdafbf32ba27a9d8e2cdaf90927b381ca4d5efb8f33d2db0a5e8138cb0d0d64690973b532fef
 EBUILD selinux-wine-2.20140311-r3.ebuild 379 SHA256 4e05533d69d665b9f284dbecbc9093fe78f8a451a92312da51aae5ce8d107304 SHA512 cf09ea8d4442a3588b59e83355cb59576a344db6d240524bfe72849482bdfddbb745ce2c93ad77943e97a8104d6c6ace643c849a441df75943c274203357493a WHIRLPOOL b56dc571120b29f406231f4adc08b507327cc0f7c19a0b8722f02eacf69f4189ecfc90f484aff6985c2be203cf9ef420d26c0d4bf921d9ddffa4a85289ae520a
 EBUILD selinux-wine-2.20140311-r4.ebuild 381 SHA256 8f920f4e78df228fe6c411c0909bf1f18605139a712bceb97d5db6bc53d27523 SHA512 f3a61b422b40c57da64516b8bed8e53e5d6887e22e74f88cc836fb1608bf06c1c1976dc4f2c430012c94364e9b06084e7d4964da65e76e5a18e9666a401a71cd WHIRLPOOL db13cc54bcaaf4870bf8b96ca5178cfbf60e0f7ce914b0a1cb2c4285b5f3568c4b84597b27da1859d4a21f797fa7436e0ff9fca44f17d2c322cec42103b016ad
+EBUILD selinux-wine-2.20140311-r5.ebuild 357 SHA256 55607c8edf1b28b26b633b2627f6c205f822474b0d25acec7dbef3aecd170996 SHA512 e6f47c053303f09bb1b0cb2d1320197bff70c374ac5fd50c2d8befcf03777d29e4f0914c0ebc99ffab9e5456ea7e580ea512d31b230a13d590ce30c27362ccc9 WHIRLPOOL 1ec7803d16f7207c8b0c90401e45e07f8dc4f016330e9fad48cd03153df2afd97220fa6e1eb3271b05b361ae6a784532b27d4ad8a33c720d9fe0178b670e6229
 EBUILD selinux-wine-9999.ebuild 337 SHA256 8d2842b39f66a2caff8a7ae4c177418c833dae535cfc07c10271f3a8fe68a0bc SHA512 5595132c8cddc60ceca6de40e94f30a1f864df26dd3cb62a61badb0f03e8df0d9f050409b697139a74822f2db94acd34c51c42a39c4dd8d7de45e947562d12b6 WHIRLPOOL 5d36b57ec315a3b194dc2fbd018b1b1fb31e063c39120bb3e4004e10630eefc6e285593c832a754c41099524f7a5061259e8d6e871a16049a911521bbc28ab7d
-MISC ChangeLog 6361 SHA256 2980149ab206f25eaf81327a6fab82f272827215f752711f3fe20efffb9694fd SHA512 610daff46093fac8ef885113d7d1467e411309a27c47842c23a9f1edd8327fb7318e9cc3562422d673cd3d840de2fda6580b6c1e24576d24e762a0941f519a61 WHIRLPOOL e499da027e92a75a267428acadd5dc5221da6b898a46821b0e73581ce5ef1b2df471bdfdb79b8dfaf8a1c322f7a6a285ca9219bd5c8ce44d43cc1e353d5a986b
+MISC ChangeLog 6549 SHA256 0e72d4b1f8e6a3c44a7d95321800e298ac590920600e774c712f9902960dd393 SHA512 efb4c41879a39f2b968b244e34cf469d263ce6669e6b3d5fea35d488c411bcb66b88c52325ee526e80822d6a9589850324635a5ebd2cc527b61f4c76a83d857b WHIRLPOOL a40e70a7b2200c15c561ed4cc7e3e38b76cecd73981356acba618d27e4fc4b96ca93e98fc139600b28fe1eabc1f7bf0210302bf431ab1b1bad57701fec173b9c
 MISC metadata.xml 228 SHA256 d84c5d17cee2508b42732b8d88f1c815782ee5a6814cc3ebda1944b4590fbcbe SHA512 2df94e8961918ede4e26ea890bd36911f4304f8746857348c4729c42feedea37c9ca00f6cab611764647a0c0a1ac06e23f4632c403df4958033f78b258392e6f WHIRLPOOL 3e73e7ed1c25bcb4ecf018f6a40f53f864097655e964aa33a44870b21f03db318a79fac40671758ed3ae0ea67b4c58791916f0cb003a741dfa6e3d6a29780346
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0
 
-iQIcBAEBCAAGBQJT5RyqAAoJEC7dUkA7aK9HAPwP/22HYoB07PH5D8d9CTivSvyx
-aRDqLE8+bkDWqitrPOtr2ttpqhA2HJrH/VsiEjlDvYjZyZ6vf9/OyAOD+u1Vw8qr
-cOADjmCBq6eCp1zVWX+Wh+OS1JVKup0rYwzzmpZWswhewgrnTTsM0OMUFL9mq98V
-if7RBIkMOPttfRc8cxfVMoVp5x0lu2wngyd/Ru3Xy/+5zzrLj9Jry3kXQt62pCu4
-gi8uJbo7tRIcdXSHpopcJ4dx8q529bXkEN3LqmBlYbp9hOF7N52CGE6jdSRfilch
-94nc/KatbEppEil+qeNaQImtEcNF6q8+ti0VCVsYxXJxzOp+xReRaPV3n9gQJKpI
-BEP3InWyb+DTV096RPeXc/qhsJ1TY1A/1iEcNTfcuyJyJuxd+HUvXmv0aAO/6mVB
-C6Y7tkomsPtdEOoE1z2khifMk7K/tkp51DFYcdMX9v4ajPK5TsZ1y4TJQVCdHDiN
-tDYzjNIxRFYPRfKCttXepg0k0ik8c2D86Oo3V5peuamJ42GRyb048YTscKKDp3TS
-WVGS9LVBXrxqHpzZHnThW9a4cwCpMWHNn5/WD82ZognxFKhzwvwSv52fXLSShoUa
-aoxd+p2OO0ikCjuYWZLmXEkG52+kGH6NzPi+TPDwRd+C28LkUKAh9IFCuDnKl89M
-BgLzmTVuHqhohuThpJJd
-=xtgF
+iQIcBAEBCAAGBQJT5nh/AAoJEC7dUkA7aK9Ha4gP/iDSM4kmAw26iryPRw39/ft8
+3YtPLSqFrurerOnfS5asx93YD7o/8yoT/4QRd6HE7su8S9eoA2wd67X2GPQ0WgHr
+6Nraa0n3idVKDem+suVqur6m6tkAyXxh8PFZByr/lXAkAGNSe1+2Dijd6BrHwd6D
+puLbuoxZpPkiSxTzW43aACFwikKNyjR3r4Dbkubg7K/8D4sjQa6+5QWMC17mfg25
+zlMgokmbFYf0vSEdM7WgchbKQicRy1jvOZCQsj6qRKOCa4u5LTxb6v9e2ZFaayYy
+KlRjbqweoAyKzHDBocb8YMkkYRGNcDcYJFSDFG8517KLd1M9y8xVxVFhWX84MZos
+ZKgF0geuOKCVlCfvtLCH4zxifmpxqJztbtfPLocDJX6O5hJCj9x+6biuYdtlRp6C
+O4AAD9yBmMQkStJI5Poq5Gvwr6jUWbt+kog10ELC6sTlZTnKzuSRvjdBiOhei5O0
+2Kc310kte7XtoVvcUgegSyQZ9+Iu3Y4GBEbFinCLk70PKajre5yUWQuXOithJqtb
+4lOI1Wob0T2o/uZIgW4umTU/oMfN4rcMdkb6+0rbke1DYWE3Dfy3x90RXEPIbZ31
+unP9WFLnZ2aIdR16EgzThOByGGUQfYr9lFuQ0FYZ4geei9QxLz6zyaUKZ8pQkaaa
++CZbd8SJ8KWQCsO2aS0X
+=YebX
 -----END PGP SIGNATURE-----
diff --git a/sec-policy/selinux-wine/selinux-wine-2.20140311-r5.ebuild b/sec-policy/selinux-wine/selinux-wine-2.20140311-r5.ebuild
new file mode 100644
index 000000000000..fb4e88c9b007
--- /dev/null
+++ b/sec-policy/selinux-wine/selinux-wine-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-wine/selinux-wine-2.20140311-r5.ebuild,v 1.1 2014/08/09 19:34:03 swift Exp $
+EAPI="5"
+
+IUSE=""
+MODS="wine"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for wine"
+
+KEYWORDS="~amd64 ~x86"
diff --git a/sec-policy/selinux-wireshark/ChangeLog b/sec-policy/selinux-wireshark/ChangeLog
index 7cb962131d8d..321d8975326b 100644
--- a/sec-policy/selinux-wireshark/ChangeLog
+++ b/sec-policy/selinux-wireshark/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sec-policy/selinux-wireshark
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-wireshark/ChangeLog,v 1.53 2014/08/08 18:50:01 swift Exp $
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-wireshark/ChangeLog,v 1.54 2014/08/09 19:34:27 swift Exp $
+
+*selinux-wireshark-2.20140311-r5 (09 Aug 2014)
+
+  09 Aug 2014; Sven Vermeulen <swift@gentoo.org>
+  +selinux-wireshark-2.20140311-r5.ebuild:
+  Bump towards r5 (fixes duplicate context for hiawatha)
 
   08 Aug 2014; Sven Vermeulen <swift@gentoo.org> selinux-wireshark-9999.ebuild:
   Make 9999 ebuilds EAPI=5 and transform to make master for version bumps
diff --git a/sec-policy/selinux-wireshark/Manifest b/sec-policy/selinux-wireshark/Manifest
index 20805bcca117..b5d6c7297461 100644
--- a/sec-policy/selinux-wireshark/Manifest
+++ b/sec-policy/selinux-wireshark/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-wireshark-2.20140311-r1.ebuild 399 SHA256 e3d5d80d9bcd49723349942cc53dee816477fe4e7cedc6ae1cee23a80a36b532 SHA512 35839c21af7695ec2fc8c9967b3b66a5705465f1bba34f2206a1849958906ee33563cdfe41e2811262615b336985c15ba490fb22104c8b528bbf476b3505088c WHIRLPOOL 78ae6ad18d848ee8ae866e402bf24bc702800664fea2f3b3c43d071237859fcead399ce625afaaa556b23145fbcd9b4e59c1f5c44ce542b57f3986746d5e930f
 EBUILD selinux-wireshark-2.20140311-r2.ebuild 399 SHA256 91b283f01f10b47b2505b541ba42c2774dd2d7265af5818630751e6b940d808e SHA512 0c0c970250050c0a053162bccca388815f656e22719823b9d0898c96e8665f69ad613c9413dda8bb3ba17631160027fdabe1de54d408ae09f6af8abc294969ef WHIRLPOOL 4b413b6a5a4e2aab185538d7d63d67835cae352c9a76835e8fc5409c28c0faa6da7322fa44c4d9bec813cf69244827e951ed42017b3d86ebefbce3a23bd017db
 EBUILD selinux-wireshark-2.20140311-r3.ebuild 399 SHA256 e0cb8b2c4d482c93fc524b7a06d2267dd0d67a615199dc7c182d4f1b4d192ddb SHA512 358ef3279a5e66a3920c9f55b352ec51d3cf66a78958d879bd953466e9814cfc7ee2cf9cb7d1d375c81231b771d6e16ac2c4af59afdb6489cd0542ddec30108f WHIRLPOOL cc65ae9e34f988bcb0b0f79af756f2f0736aaba4e6fb44dbaa9f0fbda3ab463eb9859c3dabe7c3195f85b2ca2b1adff37b258dfcc6d21eb12dc7279cd6fd77d5
 EBUILD selinux-wireshark-2.20140311-r4.ebuild 401 SHA256 1871cbabffb9e9871144d05acb9b5b13371fb9ffb1cf9a33d7a39516b64b6def SHA512 6c4c75f565cc7b861cfb38ec1e90c39b3e02c77e46aae75e53f1da873c9a23101cb8b4b4f466e1d80b37614215b331c0207f73adfd5ee7c835bf699afe865125 WHIRLPOOL be984dcfbe6439d6f224a81f768977248e87ca00beb85e68eb3635a6b5f0062d46e454f8baf23707d6ad982c6ad08ace99589c05bf6972fd729527a5bb94410d
+EBUILD selinux-wireshark-2.20140311-r5.ebuild 377 SHA256 fec3df2da67689f320613106d350d86dea3ef361cf73d5a435c5435117b157b1 SHA512 f6091453eb368ceb8e7ebdf9800cf8edd35b7e8a4c8e6b66e77372d176659fd258c80441f1e631e6766480167ba8cf660538569cb00cf4cb0a73ab70662ec6da WHIRLPOOL 1ea6c78f12e318d2ed49aa56568b2accbd3c594a13753f74543cf78c03a312fdbf3d70e74f157122e19a639d18ac805611c3940685d86fafbff468c652ed97ce
 EBUILD selinux-wireshark-9999.ebuild 357 SHA256 8345c026dae2d97824e9db04d619ac1f57f812ea66c6bcecb6e5c50e577df895 SHA512 472535a50c76222d9726b317d0d80fe41b78a1e53021c960de354303fb09d35cf6f31a0644e0f16824d938285ab457a78a45f6814bc3c54cf1a7305f0acc53f4 WHIRLPOOL 6b1a0e88fc68db7edeca78057cee3147780e6afe17f941e21c32e1b7e314be5e2d8ea9ad9c8cbb32f729bbe4f949f8d42e4300624382c863b832c24544defd0f
-MISC ChangeLog 9062 SHA256 c7105bbfb1ee1a1de1b2835882f94723c72f07e162c3e08cf8073ab6dfce6992 SHA512 e074f5ab86783398bf9c32a57510797f8855838d6d16326c9c93e42da638b8c181d457f56b5a9cee527eb255624c726074d2a88d4a4aa6de6f70f9412d7ed282 WHIRLPOOL 33fd7a01f802531db27ccd7e47110132377bee51aecde289f70022f86c4fe7dbcef1fe880f1a06ae9397cd3f20e06b6170c32783596c97357748e0bae7d8da7e
+MISC ChangeLog 9260 SHA256 f593b201533c9ff0013541e7612395dd3c247cacc92e64b19e4cea871b23a224 SHA512 946bcd5223df9c92e7b30e0e91c67f7e5a2179fec7a223508c2d52a10808d74282db6ebbd5592138515358108e5d7db20e45dd7c0d7dc79db1b35b28b143e232 WHIRLPOOL 95e2dcd400f569967943b5650d44ae1d222cff15c5123607e853fcbb9deb169b2c8c663f30fa7925162377b002b8b7e8217a83512ab061429e24f5c35c70bc4d
 MISC metadata.xml 233 SHA256 3f45b05c57fa072ee4233663df963a0bada68f3fabf8945f810d4a6883acd93f SHA512 f3d0f6539b9d268ff3e0e675d27333417473edce1031c8b94ee85c19565641747bc8229e7c25ee8bd35ff32381edd100240728896195f244682ce91cd5dc7c81 WHIRLPOOL 77c74d8ebec739f63df31e4b21982f63c2f311624e608bfc1f36b475015adbe7c093e79c05b3d204e19bdcd6171eb74735a676de1873e41683133157cca30a7b
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0
 
-iQIcBAEBCAAGBQJT5RyqAAoJEC7dUkA7aK9HH+8QAIUlKUjO6Tz3fb8fdrOt0B98
-lZMkz/UUqj2haluYe2mKDfdmLzoVzHT+XX2Xtiu0ft5kEESIPOOt43griJtcCxP3
-YyBNpO/Uiuv1c968I+l/X2ZsH8qljDfoisQiKUeNq6Ve76AFQb3ReVobhvi297zp
-Zb1/sJMuQf1hLRMnO5+PxA3CyD23mkGMuTLKB4iX+Dk0jeFaTBC3NmpXoxCvGhy+
-kF8rNxvg3PwDybkGsa04kF4s9OExyuVsDYq7EPuQJLklP8CigUU0G2dn+pxEb9d5
-fi4L/I8S481mxtpmtnCHmFwCERhC8bw68355921VvmHYjhBaLyrgUPtz3sBXCYAx
-HCS5SsXllcrcyCU63WM3J/T/qv6uj3e+wtVlVEilrREmRn8vPnZS77ZimNnNySJt
-OX7DBZ4OhEREXA5LdC2ZQJk751tfoD0ix5Yabb+HO5cflitUtPHseHiUwc150bh+
-73kCtuqW5I9F5ntOUkaxDlaSphPegiHMjvOJwfFr56dg1bO2ezmUCRTBodCOBTT1
-BfEkKHPLUdt5tHRWOXtjuTe4Tbeecl1ecQ5pXKb4AJcfdUEKjoXFR8nTyvk0zczX
-xWrWE592gp8drIvc3Gd/LEb+pwQDqmLsEVq/d0Q7wkcanw1ksnqXil0Lf72Uc7kM
-IThvNFyfgI1Qz8T8XYtW
-=YYYf
+iQIcBAEBCAAGBQJT5niAAAoJEC7dUkA7aK9HKNoP/iwQdnFvi26Praih3kI7XLll
+QlTmyb3/Ll2F7/MinLQ52R38BbvAMPbYlYU7vMiORjHUvnLW1cpXgkzfJTURh6Sv
+vuZ/u/DXhh0Z7874TstgHJ64Tl8pyKjC/m7nakETLEf/ANN3xGRhSm8OJTI1KFtM
+6qW1WmjvcVaDfK49SCkKJJ+vvW/3YbMW4Zv4uRr6nCZ6OanMpGXwoJeSwZOU/N56
+lRCpLkm/b/+9Oe6gK2l3HB49MPg4tyPWXf5ZYCP0RxxMXr77zlkz3zkhNxmCCkL/
+TYOKviudczSSIQmR+olrlgUMKaFAehgn16ZGCPNqWy5j3ZVGN8/H2fitO1+yLPHe
+hXJd/eTS0hRCq5SR+aYUnmTi9/oxIUO9uSj8VqjCNm0qKnxGFCowHlXta09imJW1
+fNnPqd/TK5c0aE29LEEUJot18KW2fu4xKhgq67pnPVNtVSLFrKK89PVNwXlhFcip
+AiO4DnhL2z0/b469YKvIhMrxcahrRkAl8K1aq2OAJpFx8dCwNJtHFR6vVrMKcmYU
+3YkuLbC/hbA7MfUEiY3+79pdWCd0kXxUh0JniMRA0bPOMgZTCsCZUmbZo1w2REO2
+tZJgwxGiR2DzS6jOIA3o/5CurAOoQaAD6mb3QciM2pzti6AInWaSyNcMFsg6eTNt
+I+oRdmPHposMLJVjKcZN
+=QBz3
 -----END PGP SIGNATURE-----
diff --git a/sec-policy/selinux-wireshark/selinux-wireshark-2.20140311-r5.ebuild b/sec-policy/selinux-wireshark/selinux-wireshark-2.20140311-r5.ebuild
new file mode 100644
index 000000000000..daeb6cfde1e5
--- /dev/null
+++ b/sec-policy/selinux-wireshark/selinux-wireshark-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-wireshark/selinux-wireshark-2.20140311-r5.ebuild,v 1.1 2014/08/09 19:34:27 swift Exp $
+EAPI="5"
+
+IUSE=""
+MODS="wireshark"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for wireshark"
+
+KEYWORDS="~amd64 ~x86"
diff --git a/sec-policy/selinux-wm/ChangeLog b/sec-policy/selinux-wm/ChangeLog
index 5a90737f2cad..af0425619b72 100644
--- a/sec-policy/selinux-wm/ChangeLog
+++ b/sec-policy/selinux-wm/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sec-policy/selinux-wm
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-wm/ChangeLog,v 1.40 2014/08/08 18:49:39 swift Exp $
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-wm/ChangeLog,v 1.41 2014/08/09 19:34:26 swift Exp $
+
+*selinux-wm-2.20140311-r5 (09 Aug 2014)
+
+  09 Aug 2014; Sven Vermeulen <swift@gentoo.org>
+  +selinux-wm-2.20140311-r5.ebuild:
+  Bump towards r5 (fixes duplicate context for hiawatha)
 
   08 Aug 2014; Sven Vermeulen <swift@gentoo.org> selinux-wm-9999.ebuild:
   Make 9999 ebuilds EAPI=5 and transform to make master for version bumps
diff --git a/sec-policy/selinux-wm/Manifest b/sec-policy/selinux-wm/Manifest
index 6c453d647fa3..1801e11d66e4 100644
--- a/sec-policy/selinux-wm/Manifest
+++ b/sec-policy/selinux-wm/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-wm-2.20140311-r1.ebuild 371 SHA256 53a628eff84cdcd9135744e239cc200060db9eb19cded7435dcebc09d15b0299 SHA512 edf5d458e67b0ddc7b8c364156066395dbad330b85f0e6113d502b1b6364a6d8a8b094e2fb3a7e5d248f06c4aaeef30a8237ca1359319e6f12f62feec1f81265 WHIRLPOOL 1140ddd8246bd998f0c5a26ce1080763bec9db739fe9292079afb0346da2e1ece0e8046a5ebc7304052791c20cd8f7f4adb754f7a24c0847c876deeacfc9f4ca
 EBUILD selinux-wm-2.20140311-r2.ebuild 371 SHA256 48c208d95e9dbe07ec0229bf8877d469fee0f7049c2f9f9db7e28b93c191026d SHA512 0cebff85f21958ba65e25c6b810f2ef93dccf90d7f10706144da71c024ae575123890a4bf627f1422a3565c86e2f9c7eebf45c7f7d3becc758f6eaaabfd39139 WHIRLPOOL 3ed416bf55cd88c3b42d258120739b8464a39389684987506c0b60dcf95dec5fb48501297f91f2d4e32495f79d15d2363a4a02cca0844a2c58898a5a485bacfb
 EBUILD selinux-wm-2.20140311-r3.ebuild 371 SHA256 e01aa650419001f0fbad343afb8cbd07344b4324b61b9405139844e406b19ead SHA512 408cc48fb97428237e91f3024fa7a174829024401102b1607d54ac75d02c56369367e70ddeadf4345e4fb7fd681450e69f2b301e1f2108310d960f374de42a10 WHIRLPOOL 740fa1ab1a43b33bdea5d0e37e03e813e4c6bc14a80a60c3cbc8762c4952efe237c4ee5e8bd7b41c25eb8d3856c1c21c61a1b3c23d83d11f327108432eb899b8
 EBUILD selinux-wm-2.20140311-r4.ebuild 373 SHA256 83b3790c40ca2eb3b16b05ede85504adb66e07309be51efd032cefe96905154d SHA512 3a9cb69c7091b9fc647d1b5f8aa07f315cf7673261d6293047981fd58315d58fdfca881d2040b84f999814c007e2fe02c5c48d6d0f48582211c663a2a6435268 WHIRLPOOL 960a536decd3c3c92af48d3441caac1966d08636ecf36f46ea2ede37068fa07b1c6961ac310280eebccfbd042067b2550442970b4c2d52276065ebe1fe739367
+EBUILD selinux-wm-2.20140311-r5.ebuild 349 SHA256 e6a38ab418fc07a35cb1b17d6bbe640292fdb4dfc396c930e8ddcef964012671 SHA512 febf742d232aaef1e1a52a8899ae175c37d4f90fbaf888eaf2568d2800ce25f9f3668278fcc4df5805c103e328f7ee7f6dae245a1f889778c52c1a4521524fb9 WHIRLPOOL 357a55b0df346e015055fede5634e2798f0b576bbbb9c272659ce9ca640c0b679d1c40e9059d8f3d6a818c3f66b879f1f1aa969be1506ee94d31eb38b3e206e6
 EBUILD selinux-wm-9999.ebuild 329 SHA256 dd997340ec159718f5bb0471cac5fc8ad35df3be2ea61b72a12be6fead78b6a2 SHA512 fed0ee7b7b56065db0326f4076548e8df1ee3c5b5dbd9f8c4ffd0988a1fe4c60a5757fba36cbf3164ae59d75c99060850c3753a6ac383847131485fd04230d59 WHIRLPOOL 75ea935dbd32842c98ad327ecbb7343da039f517a88ff02592396bad06f6631956537387fd68d7f92fc473d5cf7ca323c18e8fd9a875b99ef20eb951fd715c5f
-MISC ChangeLog 5946 SHA256 c99114843e071d83d4c9926b32c5be6e431d8c3017b204295b9c2207f34dd4bf SHA512 a890a7c28126418cc35954cf5f8bf334cebfeab8a31c1c36ea06a5b9c020baedb549b17ba465d21d2954be0a0c875bff667517977297708e262a7ce4f8de3902 WHIRLPOOL 844ed17d719dd27619f73be7c36dadcff775b78aba002faabd156ff16e18342383b7e2632b5833cca7f98861149601817ea5a75c00438c263e764369fbe4a7dd
+MISC ChangeLog 6130 SHA256 d840381440525d6cc61e80da1bef23bf68f65a871e7ac4e9c308dde66543b15b SHA512 af3f33f65b84eb9c8f687b43a7d73b9386201a1e54e80a6d63db8c05a30358f3351b139ca77f6ef45f4c22321c8b929e2034d6d6b5c0c43f2ef6a826725bee7d WHIRLPOOL f8b147738957474db5eaf0b28f01b64dd133073e56083a8566567a0ad7cf19b5cf86ac446ea04562bfcee893ca49ae860979a72eaae0213727e81921ac120552
 MISC metadata.xml 226 SHA256 f330a29b62eebe80dc8dd49843fca86e79b729c9c9dfa60a398c0b3a1ea04b73 SHA512 7f50aa29ff7505cf8d7983d0a777d50334f42ee0d0be702faf15ca313c96167ea0c491f76eb40b2c1d821b3b26c8b50f3f145bd8443e59abea66f7a610c3871e WHIRLPOOL 80b40532b4019cb10c6bf14aa68f8fff5eb05767a11dca374b5104c15ad4d8dc652e4e2dd56c7f5676a8ba9834b6bf792a0332afdff006b459ad70aadf33d357
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0
 
-iQIcBAEBCAAGBQJT5RyrAAoJEC7dUkA7aK9HjEQQAIAaDwjVOaynzMiTjQ7GZQFs
-HPFgbecjlN6qNu7KBS4PCWMtqtLe1woQcR14nLE6bnrmV1aaNDd7veccVbHsB/gF
-hUHPlJsft2UeTXQUbpkocSQXH3jmsG3Zs0OCX7PtLTCaJLWNzLM+hz8naPB8Jolo
-9T1MSxlTQ6/iKOptvvH/OT7Mzld+tG/iQG/81wv8YBAeglSEgaWnaLTD210fgcpy
-SZ9sYH3erQbkffZm80e8H0IJk/c2AmEfb4LJ2XzjC7kBEyzcMXlNJSbJg0w2dcbE
-f8mV0n25QGKd2lxX8eKBrE5jF2qD4IqsR13C3c7SevOybKtiSxCUjEEVnu8gyAEh
-1lvn6YZoNM9QPPoUCVU8eat4QS1Ypzyanh6TD+sqnZs7KDQWA+Jbpz6wFDaf8bY3
-4TfSuhtKaDY+CObIDOCxdglsOai4MvCpH/6T4S+Ysn9uzzMt4qbqOUuEww03QIdm
-OLpFSvtG/oPX6zOPyjV4mL+2zN63hP+kdNal3yDgQZ7h498HvjorzbLESP0PmNso
-lMzbCtC71dba66woMXYY8dfWLA6+lnItsjtHFwaqyQbbgwZndd03sZ9i0jAUxdlF
-gfNifL0hf9xwxKWGs/EBTM5VoFv08HAUP5G/hRdhYNDiWCDPsw0AYfB+ukx0wuTE
-IBiLfli2LpVLauDbd8Zk
-=bINU
+iQIcBAEBCAAGBQJT5niAAAoJEC7dUkA7aK9HcQ4QAI0xQoKR/4KgAVr4wjcSW2LX
+J2du6bs5rQg4TyAJcgrrYvdML1D5PwJqSnSfIdNP1UvB3iuRSCvqzlR5vLoXVaEt
+l+GjKVwO7bOpsg+tAwhIlb1E/KlkK+P8ASH8yGK+yXKLJniXTOgMfoOUds5jHmnA
+Pwi6BwAAkiZ/9sZ9RJ+vsf44bvWc9N5yDx11ur5K9hCLZmepPOyuF1yvMris6NJ4
+s/GfukPVu2AOY/E/eBdFk9xQSI1PI8JZIRG9lq9/wW2AKQWHZmkJB0i12oIY38V5
+GDYAhZujsHVSvcZwo2Lf4r/TNAKq9OvSdEBh1qgw4M9vlqoP4XcO3IOv/L2pOuh7
+FNSI6S0LIMpx3qTN+BFRInbBzXWFIdf3wPpviNpFyRNVkVbDgHuizLbqnkmtUC7E
+FJcmMBVabppPY5czA7NxR04/kXm8PsngB+lkcY582/zfTK8LbBUmv0ihYbQlZKBH
+1UrJZeMGHIFxQEKYzsIr56DUAJe1NpqqfOQ5Kn30HhxmZ2mQWvjVpPArNYnhlf8E
+7QKklVD/g0wJCbzb0Ceu5s24mmJRt8Eulu9FLcbypjkLfGvUkZwpCUyGScpQD4Jt
+L91MaxYI/QeYww9E0tqsKl+m3DziNETJaly08OQDFd1GnP31QM1kGEPdmCmO+aJ6
+mvnZt4hQkxkaJeKYueEp
+=kdw4
 -----END PGP SIGNATURE-----
diff --git a/sec-policy/selinux-wm/selinux-wm-2.20140311-r5.ebuild b/sec-policy/selinux-wm/selinux-wm-2.20140311-r5.ebuild
new file mode 100644
index 000000000000..f37199e19ce3
--- /dev/null
+++ b/sec-policy/selinux-wm/selinux-wm-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-wm/selinux-wm-2.20140311-r5.ebuild,v 1.1 2014/08/09 19:34:26 swift Exp $
+EAPI="5"
+
+IUSE=""
+MODS="wm"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for wm"
+
+KEYWORDS="~amd64 ~x86"
diff --git a/sec-policy/selinux-xen/ChangeLog b/sec-policy/selinux-xen/ChangeLog
index 2fd18c72f8da..f9a2da79f803 100644
--- a/sec-policy/selinux-xen/ChangeLog
+++ b/sec-policy/selinux-xen/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sec-policy/selinux-xen
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-xen/ChangeLog,v 1.43 2014/08/08 18:49:32 swift Exp $
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-xen/ChangeLog,v 1.44 2014/08/09 19:34:47 swift Exp $
+
+*selinux-xen-2.20140311-r5 (09 Aug 2014)
+
+  09 Aug 2014; Sven Vermeulen <swift@gentoo.org>
+  +selinux-xen-2.20140311-r5.ebuild:
+  Bump towards r5 (fixes duplicate context for hiawatha)
 
   08 Aug 2014; Sven Vermeulen <swift@gentoo.org> selinux-xen-9999.ebuild:
   Make 9999 ebuilds EAPI=5 and transform to make master for version bumps
diff --git a/sec-policy/selinux-xen/Manifest b/sec-policy/selinux-xen/Manifest
index 64817c0dd1df..d928c3c420af 100644
--- a/sec-policy/selinux-xen/Manifest
+++ b/sec-policy/selinux-xen/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-xen-2.20140311-r1.ebuild 375 SHA256 e3f5a47fd72bd7960fd66140d25bfd98d1ce7eca1806232054cbc28769854433 SHA512 9faac61a53addc7423b7de429ee6d3eba9ec033a8d64c1b21d7013943e961ae172216f72446d95490375b64e342edbc73e6bcdbf3e9d7987eb79378f097ee28e WHIRLPOOL 5968aabe4440e00e31f0bb7298e2bc8aeb9fd0369e9187eebb865911f8153f33fe444f0c1bdb2d08e132bedf1fb09be4645b8cc7bee104f5db4434a3bb0acd65
 EBUILD selinux-xen-2.20140311-r2.ebuild 375 SHA256 504f3de90979a98fcbc5f24448ad9f8f3d7febbf5530b10e9ba6b83548b903a6 SHA512 eda2966901c72e8950aa823e0b0ec17d9f9567b0cbf7c5e1ba070b46665513f5d42abc592459697fa06a0fc2b88a21cacc005cd84c3b7137b560ca6074d63aa2 WHIRLPOOL ed0e58552342194156c55ea36a321eeb41a5414f4d8d58312c446947157eb10c675347209f5511e29414506e003087dcc23b9925390c68f6cdf66aa165116e0d
 EBUILD selinux-xen-2.20140311-r3.ebuild 375 SHA256 77752fd20943b426a445f6aa110aeefa300ac463ec25aa3b5d6fd8a9692a81e0 SHA512 f45da16f13fb514cfa934965445695c7894404464b83bee4d5895d979f68f9d3e1d3aeffb5898db325d7c4deed3baf0a6e2cf8d4095ae0314f008bb7fbc2d752 WHIRLPOOL 81db7a2a9e73a88e9e2d8b98f851ab43a34eee9da000ff93350a5201d5c5c1efe502f860542a2136b1bc9943578669267dddb7efb1d17155f0696eead8e5334f
 EBUILD selinux-xen-2.20140311-r4.ebuild 377 SHA256 b97f429ea928ac33f2c01ebb63ce125d590dfec241d011d630f944fba1013510 SHA512 840a083bed5cc255dd358d772d1bcc7fb0b6e802504a9318569162adc96d094868124cdeeff4161e7d3c334bb20d6607ddc1573acd808411b57e5b658e50a105 WHIRLPOOL ab5e3d63fd7df66a8c8ae961864da7243c8ef73b1cf590f4790d63694809c8b454c7b4736d1a081928d7b459e9516c4d9a0bf218276b823b015441a301a11cc2
+EBUILD selinux-xen-2.20140311-r5.ebuild 353 SHA256 aee056909f13c60bdca1361e42419c1105932348325459b7f52c21831950b23c SHA512 6f50b50d4da2de7915848543e6d6e8a702c08b2dd54866e5b71639341cef425cad525badb159ad1d1e0b2a8315bc2fb7f921b364df0a4c33367649402de06d3c WHIRLPOOL 23bbe760cad0c5823e62f240cb4c1f9cccd74c8be7bdb8edacd8f6438f63a6d60c3df5314daebb4dde4b2f263446598daef5f712712566bb718207a209e6dd14
 EBUILD selinux-xen-9999.ebuild 333 SHA256 f5fad0fd15f3895e76e7e555c2d808ab15b692ef481b3e2673649297928277b5 SHA512 6c5ce44ed52c261d72e859903f898ea6ae2e1f969f91e9b36781c65038842a578b95a175db4b1a426af760315577f95b38a056b02334f6f04708141575061cee WHIRLPOOL 071b2e143205e52d189f479ab39459f79141ccab992be139cb4d5a717fd9c813adc165d76f37e33c43d7732409cf50a9bab0f48716e95fa42f6aa2c4c156c21e
-MISC ChangeLog 6758 SHA256 f7bfa0cc6036c1edda7c77c9e5ee32017d39e0ff93e459bc1782448abfc04a78 SHA512 ab8b64f9e8cf8bc5b0b5a40716d369568490696c42cb66df907e3a8fc69a54f1948ccc3c9708d7386bf196624d1f4ef342efd950232359cd35eb036c7f7f5b87 WHIRLPOOL 1bd6cf491c06d8a2b4dc4b6ec297cd8862c04e948065e7aaf4f46df2a8de92a1c2b8ba50093915b2f174d60a19e68c0db05907bb5170f42d241f7be173bc2127
+MISC ChangeLog 6944 SHA256 3a77c99318f66301e463da02c3fcecc45cd6dcb7c313c4e1125d99add2d3f053 SHA512 351fa037b6c2018328aa7d31eb2f0e3a7a48fffe21fce3d76f1accfd1898cc3fbd0b318b2bbadd58db1ad9c8a99bee8f32aea85f4a21439fa6cd8ea7fc87c5fd WHIRLPOOL 597e51441eb543218742adc65878c3627cb77a2b7da00777fd36195d102d0f162543a559aec60f3af5d84113b510213b6a2b5bd4753872712258a3d440177f43
 MISC metadata.xml 227 SHA256 995c2b11265433cccd44feb382a3fee9044934bd83c639f22ab3b5aef06e1ce1 SHA512 7f7127f733964cc9b96492399035f2843154c0824f66e60c05a053218ba740f65dc8f5cbd70fc04b319ed9f5db4ac7f4f29fc605ba59030404e9e6037c537df0 WHIRLPOOL e169c6a82b1cb0258e8e2d48ff92f63e5c49fcfcb20dffc0f98b0fad8179367e5e079f6e83b07d2842d0d02007881567a838a99096d8905b67ac7aa66a01aea7
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0
 
-iQIcBAEBCAAGBQJT5RyrAAoJEC7dUkA7aK9HTlsP/3zclyyK4FjTWj/jqj9zG6/B
-EPeUfnZJW7SqJmz3j3Pxms5qYX72F2P8PFpWNaCW46/wJDBIps6SiTgD2Kcd6uCV
-3iJVtzFDzOLuBtGTln3GVfE7hHKap2345FBHBz9JqugbQzK01cexa1ijAROd9xDD
-fv4hlQ7ptfhHV7wi1qiOp6HNI904SF2ebgoApj8Cz5C2BFqU3Vb9+wFtnYp/uz1r
-V5SZZsFuwtKbmMHOXQqNyFSzlmdPyHNv+hMowPzHP6TNyCUHZvvW7CS0hpGAR/qs
-W8+UiLyTN68BR7+u1vHc5mrvsFoVK0sE6yGGJ2DNBKmq0Lpocok+EcNzl+KKiBxr
-lpqI3izxOkkcsKPe/aoW+98oHdbziFUIxA949cV/JZ/kcLlHGnNt6uV3VGhg38lq
-f4PSkVQp4cIytBYmzPyru6okOAguh6wDC6FECvdmn9DOD/rCDecP1M4sDGhKJwXG
-9efXcTCRBRDWbd0ByovdlajQUPblzhqXklyuLAVWHg7abNp7Hl99VYqolvpYhluP
-V58BH+IFsaKzR6XCZ0LKfAMD+KsDyC4vI+d353T0fKVqKWi9G0MdHl6IKDHbPUB/
-e9vyeI2x50NoB5+SuNxVr67kudLpV35/bdrodscK/xE6jfdSTT73X0NRlYJ0gRUN
-V5YUm07wt/QqLonjOr0L
-=IT3E
+iQIcBAEBCAAGBQJT5niAAAoJEC7dUkA7aK9H2YsQAI1vJpecFpB/NrU2wfJHaJzs
+eZQGg9jY55S/Ii6KDhSq9jShVtHvnRi6601Hz2o80wo45f1mT14416lj0iiPGVN2
+owwi1NNvkGPYl5UZJyDNNeNuEw4/4NxeqEVSGjg4tgTcpE+59mJTWGTqh5d5VPmH
+T7pk0VNzl/agUzthgLAtGq1OfWdY4C3wZk5TIbm21qDeNGgjvm+CHqyEsKscp2tr
+b9XdWU4NfdO2IApKe6vZ/qt4/LmNhbfZSyksRJuHby56q853oh/M4nAXfkb6yyg+
+1SkuLNDAfRfUejRGfTV0ln8/sFPBcfODC9LntEylolF2pZ9G17HUpru2MDxrM45O
+UXy0YTra4jvvDQohTBACX1SHe2wdCppeZzdhhdLNqS6OoYiICNWuD7FjQJ3IlHO7
+lj4PWTJKDLxukl+L9RmOBegOrKGBYwy2bweoO0y4DLvKkixkdcFEggiq7LUgBrOm
+UH+rxNAP++3Oem7pe2MI66EAX1UQAMjloK0T79E0T2qCsw5Rx+DsmLrs6EkeWqjT
+4N45ART/gE2L6GLUyNluW+vMJTBsypQpTwey+W33Mv15B/WkfqgY89GDMYEShCa9
+ifNexn3j1sm1kVdy9yfD67GIBTHSriURId+E/B8tppvJ5+C4zxVXnZiaJxgmlIwA
+z/vC630FSeTy/8zihPYp
+=TUQ+
 -----END PGP SIGNATURE-----
diff --git a/sec-policy/selinux-xen/selinux-xen-2.20140311-r5.ebuild b/sec-policy/selinux-xen/selinux-xen-2.20140311-r5.ebuild
new file mode 100644
index 000000000000..4c5cbde3ef0f
--- /dev/null
+++ b/sec-policy/selinux-xen/selinux-xen-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-xen/selinux-xen-2.20140311-r5.ebuild,v 1.1 2014/08/09 19:34:47 swift Exp $
+EAPI="5"
+
+IUSE=""
+MODS="xen"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for xen"
+
+KEYWORDS="~amd64 ~x86"
diff --git a/sec-policy/selinux-xfs/ChangeLog b/sec-policy/selinux-xfs/ChangeLog
index f208e04f3abd..a56ac2d29130 100644
--- a/sec-policy/selinux-xfs/ChangeLog
+++ b/sec-policy/selinux-xfs/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sec-policy/selinux-xfs
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-xfs/ChangeLog,v 1.42 2014/08/08 18:49:37 swift Exp $
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-xfs/ChangeLog,v 1.43 2014/08/09 19:34:08 swift Exp $
+
+*selinux-xfs-2.20140311-r5 (09 Aug 2014)
+
+  09 Aug 2014; Sven Vermeulen <swift@gentoo.org>
+  +selinux-xfs-2.20140311-r5.ebuild:
+  Bump towards r5 (fixes duplicate context for hiawatha)
 
   08 Aug 2014; Sven Vermeulen <swift@gentoo.org> selinux-xfs-9999.ebuild:
   Make 9999 ebuilds EAPI=5 and transform to make master for version bumps
diff --git a/sec-policy/selinux-xfs/Manifest b/sec-policy/selinux-xfs/Manifest
index 2637006e021a..a819195faab0 100644
--- a/sec-policy/selinux-xfs/Manifest
+++ b/sec-policy/selinux-xfs/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-xfs-2.20140311-r1.ebuild 375 SHA256 d26abf7f77ad2212912ce3a9a317693bfbd0c18872ec534bdbba43108606d273 SHA512 06c65af6e92c72b5eca132e1b44b3387e8c99212b9fbe0bc3cbd2d14bd1b1f0ad02a70194fc679be087daa2e6a2eccb68d62140960a82a491c5e5ddb18ceae19 WHIRLPOOL 102d236196a9b321543998d469d02a81266f33139cfcc08652423ea94792227b5fe1e18e80dd8963b290caaa9db39c8075629e0430b81d1043a925ca0e318a47
 EBUILD selinux-xfs-2.20140311-r2.ebuild 375 SHA256 796ae43fa4260f21592e8a001f700a7c5fcedbfb4ea9383d6f98076b6d07e5f0 SHA512 c3837496b082ddf89e302ae1d8ebfbd4a63e34af15fd4aad58979d9bfcd42822b0e880d5c3b478946259e0b6d05b2229c6768dab9caae9584b6dc0a30bf0c752 WHIRLPOOL 1b132b27217c7a8514f4b134a1e10ad38dbb4207fd3f60e5b54d2a31ba989e1e8d69a22be16e16d4d45987f3ca3dcb3bcf106d720a44de443edcaa68a9ea0e3a
 EBUILD selinux-xfs-2.20140311-r3.ebuild 375 SHA256 8423b51a6e83b0cd029f13104201d2a6d34486e8b1e428c85b9477c95068c00f SHA512 3f28b920c4fc384c6de1c58926172ba1d03c9d887b3b573d32c1b919d4262f4e4453713d1f6fc8613b82d49f94c747892dbfebaad4ac60fe478451e82faa3183 WHIRLPOOL dbeb878da3d94c85050407154c2885b885d14e2135dbc352afe4dfa2337ebe5e3a52867b5740a3ccf59e6ab45fb0fb4df2be7b8df31c1dcfcdb96c76c5bc21f5
 EBUILD selinux-xfs-2.20140311-r4.ebuild 377 SHA256 dc02f1f53bd43dd89970aed01bc526416239d6a365a42328444a05ab3134a4d5 SHA512 63e1658637a1d49b120f950e36881e2597d30750191eaf0bb93ecd63c1f3ca1f664565390237fedb5703f9f9f2bd4774e04a014d3d8a251dbb332edcf4d3e356 WHIRLPOOL d362a85dc9ded0ead8d43a3179b7de279ee249537444bf4a32a1c89368dfffaf4d79f7a16a601a1e09fdcac898d4df09f199df13cb7e871df26ede0e03801488
+EBUILD selinux-xfs-2.20140311-r5.ebuild 353 SHA256 a44ea3ae293ab44beb202850c52316e1fd81b3d00e69d1a21c2cf7c48760a8b5 SHA512 5ed5d9c11f27993f956aba3fd1bb071f0f82782e7d49500b676e104b48f4ea327c626ce6334f2e312c02d329796a70c4f815a031f3760047f11e85bb972211aa WHIRLPOOL 791d74b3e6e72dad042a4ba26546404a3138707555572c4910469220c672797f4d0413f8d21bbeb55af41e1f4e04a6bf3ce6a583349a49b5c2748de51baec6c8
 EBUILD selinux-xfs-9999.ebuild 333 SHA256 972bc75fcb6314e49db6019e8ec80fef651928e4766231299e8a3d06b2e2993a SHA512 8055f4a6a50aa8abfc372c6e912c289db1f33def7c0b698e603868a5393200b91105a4ed47975d07ed3c1409d2fdff50b2f5d0eac5b6f769e8d25c38177fdbd5 WHIRLPOOL 9c44812a41feafad840a3757fa91be35d1176f921c838e2d147e77c36c77b5e12f8d1b29e848c1dcaef0fddf3399677a074004d684604123a735651f638f72a7
-MISC ChangeLog 6286 SHA256 494238193b3f61223157573498824274519bde49d28eff2173351e4fb10fda30 SHA512 84164368d3ededca82630011fe1a8da34feeafb61e7a7b670eeee7276aef621e85d0fc1062c13e5c05d03646779e6044e96a1ebe427105afd576de7057298a94 WHIRLPOOL 2b3702ce1c27292667d44431616078e5a3530c09d39e72d857171d0f6258dafa76d7eaff83eef7aa7798cf2682cc9fd99d5216d0b99c19c28e016d67ded0a4f3
+MISC ChangeLog 6472 SHA256 6c72db017bcce38a319c9f03297294b130fcc470d10921405e2aef9e48d64670 SHA512 c6a48319c6be90ac2eecff9a0876ad8a23f1cd2bb2532d2b390eca5be4a68a7601df01866793bcce4d5a8236381b0feb1443ef2eb70b26af2f1b8587b09ffb3a WHIRLPOOL a75447f28d7d1f6790d69c014b47bda6d68186cd8d20fa88cb98961b4e9d1fcc4a3f111233e605bd93df59affced78ea21912c4113d4fbd1118020db5400a8f2
 MISC metadata.xml 227 SHA256 c547a6af35ee8505baac4992d991fd96b27c2d2cdca92e8b9d978b333237fbe8 SHA512 2c300f2cf8315625feb410bc2aff1d897a44eb7656d60c750773219c0c518a14d6f334fa3d9a7c1b80bef8419f77d0504f850554bb3a121d49def851fad7f60c WHIRLPOOL 3fed0013d06a4f906c0a067e79fb9f12d230449a6e1dae41cb562035c0125fbc40a7f9b49646aaa075aa2b5a00b336c6842d9c70348b3fcbaa3e14ad6165a6e1
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0
 
-iQIcBAEBCAAGBQJT5RyrAAoJEC7dUkA7aK9HcFMQAIT2djUR3SYzX4h3tGt8Vsj5
-H0ufk/ibmn2/dvwMqx/xFAjPaf+7Kraga8FUhmlYWyY3wQv2YYEYksqmm5gjIs5n
-pXzrnPUYeDDR2rsw/tr7uhtJ1/6ko/vtgOM/yQEBuv1FbwCMnP4jQIZj6h0syhtu
-MNSUptoMzhB7biF/wqZqk/oPdTwToXN4NWpyACA6a76VVmqaLkl6JOBq+1mTHG+o
-VQBzgjQyrFdUh/u2e5YhUN4CYnt/2scKchmg3PcDJXZpBQdLASXIlRDZnrVE13tb
-JVI5B1yYdGARtUFEsSHnboT1TEJ+qwyLn1K9N3LDq0BpDsNZBCcbf5NSKEjHFs2N
-JOTmD7VLFteHudvBys9lHt5Duur3Z8ZWjr4994iYbIH48KGGszCEhLz9PCEQOa8i
-L8Kc1r59NDVrKfA88ZUlZZ9NmmRRaRK9z5fn7tgyu6WYdjgbXVI56kWwf1erES0J
-u1v8Km2WyOVYfYC6q7tJp9sXZgbjv6KqaN+Q1I4iECkAf3P3NAYLnoSvgeysArQL
-vuzjl6LZpKbtJyanHjClCZlfYktYHlR/xH9YxJDWiYN25gMYgUVYGsjueu14KFOL
-phU5tedYZRtdzda0lKNerWjFX/UlondC6kzpYUmUtuxZ7rtgZvDwEbP5O+92gIgG
-qQnmtqHx86ym7RbjXI+Z
-=0dgw
+iQIcBAEBCAAGBQJT5niBAAoJEC7dUkA7aK9Hos4QAIvnfndXfF8KL++G6JJeZa86
+ExUhqXRn8VPXeS40gdCJOuAhENvXUnMT5Gxk+akXVv5qmW/6h5NgQNha5e7oQ5Re
+ucEqVs91Rt5/oy/gyGDQWMM2226BHBgwVr6BhLKunLj/EUHkldt1aeqkTaEUkLNl
+Q0aveH9zrFfrlzdbYHgKwjwmLcXqa7bv76YtSEmF/t1dPXQA30MB6jOlPg1W+bhX
+GtE3VLRv7wkhStdb1iuuvm1QlD+gGK/AF4btDRG/0He4RJcbkEIlWrWyqlAFmotj
+Krw9rPB7REcHW027gmHQhrkUl5nmwc0kJII9pXRaodIeHY0sQrTdqDD9f+u+J0Ar
+PcCDAZT3bXYFhfTBwovdKxUE+PTsom7vQtKH3+/m2SDbxnuxPeUlLAtCPDOy6WpI
+pIx7G9YLsrfAhArluL0LnMWNc/xj8jXEnfNzvUKfNrqfw/ULKRs/xV0c1MELbjyd
+ctbA1u8Ua2YlRZz0htediCD6ZuxnZlz5Gv/mDM3BGdNeVHnmB3KVLVV3EHLiHIbg
+Smu7HTVq33i+8X9EluxbRs722k1/kPIO0ehv5iIdsyIbcOPbXwQF0dpz8yrLBjN7
+s8sBuwF0qrLVuydcE+GEHDIyKpk+DEC7NCMooXAEuA6UjvRLSDA3M0RhGPBuJUo6
+ptifK+Dw+yJSYG+MfUR1
+=swlA
 -----END PGP SIGNATURE-----
diff --git a/sec-policy/selinux-xfs/selinux-xfs-2.20140311-r5.ebuild b/sec-policy/selinux-xfs/selinux-xfs-2.20140311-r5.ebuild
new file mode 100644
index 000000000000..f2aa7b3f0f36
--- /dev/null
+++ b/sec-policy/selinux-xfs/selinux-xfs-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-xfs/selinux-xfs-2.20140311-r5.ebuild,v 1.1 2014/08/09 19:34:08 swift Exp $
+EAPI="5"
+
+IUSE=""
+MODS="xfs"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for xfs"
+
+KEYWORDS="~amd64 ~x86"
diff --git a/sec-policy/selinux-xprint/ChangeLog b/sec-policy/selinux-xprint/ChangeLog
index f5529cbd3697..9fbed56ba24e 100644
--- a/sec-policy/selinux-xprint/ChangeLog
+++ b/sec-policy/selinux-xprint/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sec-policy/selinux-xprint
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-xprint/ChangeLog,v 1.40 2014/08/08 18:49:36 swift Exp $
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-xprint/ChangeLog,v 1.41 2014/08/09 19:34:34 swift Exp $
+
+*selinux-xprint-2.20140311-r5 (09 Aug 2014)
+
+  09 Aug 2014; Sven Vermeulen <swift@gentoo.org>
+  +selinux-xprint-2.20140311-r5.ebuild:
+  Bump towards r5 (fixes duplicate context for hiawatha)
 
   08 Aug 2014; Sven Vermeulen <swift@gentoo.org> selinux-xprint-9999.ebuild:
   Make 9999 ebuilds EAPI=5 and transform to make master for version bumps
diff --git a/sec-policy/selinux-xprint/Manifest b/sec-policy/selinux-xprint/Manifest
index 4b8809d19d79..41cd603edb2b 100644
--- a/sec-policy/selinux-xprint/Manifest
+++ b/sec-policy/selinux-xprint/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-xprint-2.20140311-r1.ebuild 387 SHA256 7468e2ff735ee6beeb60b985d1cc709dd940bd871a657a38d8d91827f0ff35ed SHA512 0f003705722b2d8dcfba110b5a917f53652670f901ac24b2be541a31e3f28ef439161cddafe03d10ce80de9b5ae8ee4deff7a786595cf395cacba6865801db02 WHIRLPOOL 660448a705185df1a3f7e98cf49906f275e11bed328111e78c83cb536697947d8a0171bb3245ad9b2fb630c297aaf487bce6d88bf317d9678473ea15c708d973
 EBUILD selinux-xprint-2.20140311-r2.ebuild 387 SHA256 4f19d5ac8e483087e9a5f3dcbcb1d730ce3b7d8aa4f01a36708e00aef1e80204 SHA512 6b5280882fb7171522baf3f6b3d5bc2e456723a5785a2c69dc8290361ba0b6832428e4327626f4815d5df0721994c39260f37ded0932e52c4dabbbcbf2012f1a WHIRLPOOL d4358ccacfce2692c48edd36e4e5dea468950eb316f3198eaeb84e503b87ae3bf188c2ef50c8354f78ae10f40bc2dda7d570e701249379b3b087899e519fdf5d
 EBUILD selinux-xprint-2.20140311-r3.ebuild 387 SHA256 d5269f99d1c05583b634fd91d5137b8ca1908bd22c55c409e060fc1226fec208 SHA512 6a68b9c6755ccb1c1adc776c68597ed5487e055149d21d209e27af91c13366e488e519d2e99400399d558f2ce671165bd80e56f08116e2564d1847089d574f9f WHIRLPOOL 73a20dd61bc5dd7d2153277a3a38bdf57771f3873485f0730a1fac1615be6de8c3a700d383a07164f3821ea2dde9b5e027e40d3b5424dda43f5c541c92e693ec
 EBUILD selinux-xprint-2.20140311-r4.ebuild 389 SHA256 d0b31cf618789bc9d0c16117c6732ec8e0feb53e42510e13ccbeaa893a5d5eb5 SHA512 c1799c8d7f33ccc4982ba6ce3ea3c6b89d35dfa5ba65cd508d8ecf4c01bb7498ce849836ade187dc866ac94c3d8de976faa3417ee29edd829c005ca229dfcde9 WHIRLPOOL a7d92cfe985d1da0808c25b30269a86c61d07507bd08ca05ed38e7d2854c00ce055aeeef5825183b0bc721351e481fa82aa4050ce2aeabcbdf256c19b8ced7ef
+EBUILD selinux-xprint-2.20140311-r5.ebuild 365 SHA256 3e8ecca9578c9b9a2561bc108873c0f5d8a4b1607053a825910339aafe2bf3ec SHA512 c4bb3ebb3fec2a07a41e994ce63bd7f582c9acb6a97a9dfbe356702b2539c4fdfb3f910c486e9c53ba12855b00601a0473ad6d8caa248da2f6e5d204b02efb11 WHIRLPOOL 8ddccf39311ac7c703dc9a7d908398cb8169d7a0f5d4dff72538e0d52f2b02490e1d50e4c00e720c8a85de77a14f6e9659ae6b49cc5db582a74888907c5866f0
 EBUILD selinux-xprint-9999.ebuild 345 SHA256 f99f0eb23e4215f9ea8618991f06cd24365303e93d8eda91fd0a598e822445e6 SHA512 95a457310f882fd50b050cf3be934228abd83a6378a670c86a5c0999d4e4954a9037a2dcb731b5a08ae22cd315c909f8ee71b8f50707ce39243698dccad8943f WHIRLPOOL 28aaf92044cbc49251140c8f50c692c93da059d186904f695261901c18945fe8399e4fce96d59c54446f5765db74278d686e9d133ad021b1bcff558e02d51258
-MISC ChangeLog 6244 SHA256 4e9054940567fe48e58a50c20570b61623a031b6c34d91957459275983ee2a25 SHA512 4891a1411b4fa94b62aff4541d84cef1daa0506a76de6bc667656ab5d91e866c0c8558ea2a0413ecfd5852f4ab408c2dcd98eefbe046f909b274c197891f6835 WHIRLPOOL ac68b1ddd04377dc0aa6741bf1cdb4356b58f049e7144d07b2f4b458d796ba3385e52d9574f3f250dbf67ef422b8a7497f1f66b676f3c8df1ff1c9e7f877f8fe
+MISC ChangeLog 6436 SHA256 553290310da50414f32f6f28fa7e3a27df5bc6e2e996dc11da7d44087ddaaef0 SHA512 9a1274d0db8dfa82251d5d8df1e3e00cd80dd532487988124c10bf853425b25170e106cb46e4ada5d468ee2d7a944e74cbc09b47538bfc7df784fbcdf9c11b25 WHIRLPOOL 7745f726ceb606213ddb4f12cdd0aeebd36ff66a30ea6262cd627fabcd29f26268ee7bd9b8b1c6c7bb568d45231ed3a63d5d67973467892094b9917d2897a84f
 MISC metadata.xml 230 SHA256 3693680570531cf925405adb9c97390e0e29be179a620a75e1f57729fa4fc113 SHA512 39ac6397986a71cf63b9478ac1a7620befe461ab44102ce21f9cfb951a2e147f27f5c34438fbf94d234224f5ec93bb8cfdb8fc502f59d8e2d8d4f99e563bc6a8 WHIRLPOOL 03a0254521142cfc3394fa379f3f678b6075c6067e38bb04709d37b1abd36697bdcd8e8957e78c092a136339174579435a05986e5bdf8f39ec0b02bdfacfc010
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0
 
-iQIcBAEBCAAGBQJT5RysAAoJEC7dUkA7aK9HknAP/iWIhehTUzSXZMcI6EPIUDia
-DQ5fC0z+IN9Ke5aWXjj/BmTH1cno0GC+HUx+tTqmh2rprkxSvuo0/MxEYmrecmVt
-mqcIipqdDfutj+5g+BJ/+VvNhVaZHTVuWkt3ZxhinhfBv8RsctlABx8Mno+Xpg6f
-RJ25mD09v/MMWyD5INnTGm6EaUtuWMm4mwKNCiMgXVgmSTMVJ6duQSypVt1jD+1w
-ABTsTomtOc8VDOxDsVyBNINfaqKamE1CSvssnQhZoMX5EXiwBeCXWMsZ8Og4gQco
-PN0pWuiJ1LWzS3LR7pUezYTRDdQPQgQQ97cMgdcjLcmQK7kOXyXZr5rrdhik7ozP
-tlqjVNjYz/O/sdfZ1usXxCXHS/nmUAbAYjafu3AMFse6WiP5Ed0Evtk9WFZzVW3b
-gClSWI5qNVrwGdOr7+WbbLzGKw9Xsw247Kj/kCwHVm9H4wip6E32+ZL6gcPsZYh8
-wU+pKPGLzhCQnRpE17J65rZ2FJqqIoaTrioViOedtg+0divCK/OlrvBTEfJFxo9r
-BQRHeE8pNpANfB89Jw/RpQtjhoOWU59smKMUxGsxRCO8uKWaEH4fvO+dbpXHSkld
-U2tb9UK+eE1H1G70ZB0WzOnmJBfgd1RtR56G3y5xS2PeQvEXXeSNlH02wO2+WCI4
-ABnafeE8liRoAbsetJWJ
-=ChJN
+iQIcBAEBCAAGBQJT5niBAAoJEC7dUkA7aK9HLI8QAJ8AOQ9WaAt+yh8vhS412O3f
+/4mZ/7IyJhk3QfNfbt6A4CfKwWiX/QAldSodjrEsWFyizS7H+L2vCKQDqDQcIwJl
+C+Y4obdjQf8Z+yXE+Lfy5MfiLNf+iqt5YUZzfe0vvjlLbblupGsfKS0nPY4KyJsy
+IcYiRgY+5bbasTdPB+3EOkEgyFDc6n8ZSGSBCjtp8faMla3JSVz+EBcWaloRXZz6
+2SMChEJ2qDKWN3EKwx/dJ/Pfdjg/eNcfU7asogjFYA8rfZ3bD5nMmxKObfzlCvOT
+nZoc0QsG2OZmV/JtQLv4FzLSgOi8cqpQll7Ncjv0g9qhQbtZqqOnA1seM7ko9OYk
+5bE8jsc9IuQJcbsZN1A4/fYNKxBaQKW/Q0vMyebu1fCuPNhkboB5zg+mtFCADjBv
+LjnZrgnjAxqNE98N17fjodqCQYuEkL5+Fg0bXFfsv1H8douVLS9oirj1movC4OhT
+iU/wmIxJ6ZI/yIsG/ZKJSIVcAVDWeaFy+qU4C1/Fe78pd/VzyIBU/Htl8sTPWeIl
+W8veeAB6Bp/2wsLgw/L7dPRdIgs0Ho+jBdBkVGy4Sw+pQMQarCSA3PbZ1zJshuGk
+XCLnMFPJM75fVk9fWdIVU16IlGhv79Zal+pygeFEwt6+Cm9aUFuK4BU0L+sSXYFg
+AYvcv7hSbcg7y6ygFdgQ
+=Cnrt
 -----END PGP SIGNATURE-----
diff --git a/sec-policy/selinux-xprint/selinux-xprint-2.20140311-r5.ebuild b/sec-policy/selinux-xprint/selinux-xprint-2.20140311-r5.ebuild
new file mode 100644
index 000000000000..824540c8c83f
--- /dev/null
+++ b/sec-policy/selinux-xprint/selinux-xprint-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-xprint/selinux-xprint-2.20140311-r5.ebuild,v 1.1 2014/08/09 19:34:34 swift Exp $
+EAPI="5"
+
+IUSE=""
+MODS="xprint"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for xprint"
+
+KEYWORDS="~amd64 ~x86"
diff --git a/sec-policy/selinux-xscreensaver/ChangeLog b/sec-policy/selinux-xscreensaver/ChangeLog
index afd37a699b87..7c6cfed9988d 100644
--- a/sec-policy/selinux-xscreensaver/ChangeLog
+++ b/sec-policy/selinux-xscreensaver/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sec-policy/selinux-xscreensaver
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-xscreensaver/ChangeLog,v 1.43 2014/08/08 18:49:35 swift Exp $
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-xscreensaver/ChangeLog,v 1.44 2014/08/09 19:34:07 swift Exp $
+
+*selinux-xscreensaver-2.20140311-r5 (09 Aug 2014)
+
+  09 Aug 2014; Sven Vermeulen <swift@gentoo.org>
+  +selinux-xscreensaver-2.20140311-r5.ebuild:
+  Bump towards r5 (fixes duplicate context for hiawatha)
 
   08 Aug 2014; Sven Vermeulen <swift@gentoo.org>
   selinux-xscreensaver-9999.ebuild:
diff --git a/sec-policy/selinux-xscreensaver/Manifest b/sec-policy/selinux-xscreensaver/Manifest
index 6fdf48ac79eb..61804cfc37cc 100644
--- a/sec-policy/selinux-xscreensaver/Manifest
+++ b/sec-policy/selinux-xscreensaver/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-xscreensaver-2.20140311-r1.ebuild 479 SHA256 c38d66972db1ba56702504237a013a4c909cdb291b7412d9c0c76b687f0d9e26 SHA512 90348576932e750b0538a9bcff8f0ff3e126e8277daf46f46e004841753bce5412e3aad969043f562327ff41069ba1dcfee012722e2084e398b12f0e0c0c2cde WHIRLPOOL 0a8aa29ceeb423dab034cc6a76d2c8cd7d02d49a350df450dc5f39287427920427153c2bd18d6952e30102aa874c675ddeca488506e79c63d581eecb07c4829c
 EBUILD selinux-xscreensaver-2.20140311-r2.ebuild 479 SHA256 78f63f008f7104350dad6771bf09bd830fb0ac944109ffff155cecb89684d7ae SHA512 0251c3474b8365d317e7109467466ca6c40f9c6a4dc7fd3e7bbbf2c8db055cef1af797c4689ca32ea995ffae25038d6bfa964602b4bbcc80856c4c4630507323 WHIRLPOOL 55492a0cf918096bbb38d3733bd93c6be9236b6700c8f310bb72d6cec22c0c1c6f0763d4b8d3725b5dd1ed35351fc84a4e02880ce11630f3db3ae311bca2b8ff
 EBUILD selinux-xscreensaver-2.20140311-r3.ebuild 479 SHA256 3f5e2bacfe09e9a9d5e4541f4007adcca43a7d946a33f8a7d9620f5947e6d497 SHA512 ed5dad33e4e4be1152f2bfceea22b6e4f75342d344dc41188219e49315b8d23e5e0724148aca71a08b3194214fa381b649d63db8c0a9de9b1d41b2681af0bfd3 WHIRLPOOL f4a7eb4b31beb45b0c3dea6fce128cde7b59c2f67dc277039d43a10cbd7d3a5721c314e301144ba41ff6c4af5f77701a29dca792c5ca267dd11e0e2e5698c766
 EBUILD selinux-xscreensaver-2.20140311-r4.ebuild 481 SHA256 1238a70b55dd018889daf08be86ee29c832deac0550da483e1093b3ba4fa51c0 SHA512 1088c64e461a8b32f703cde6f14c484b62253eb4383f05d873c61b37d70ffb6fc76aeebfcf5a4a9cbbbaa64004b07be580535daa2972e82d377fce87b3ea87d0 WHIRLPOOL b9e0e20bf286ef4c64ef7b4fe3d5023c5da7151fe60851ba5fcbf4ae4de8b709b4543403cf42668f9653001d030073eb9102af8cf60a0238170fa3e8ea81ff73
+EBUILD selinux-xscreensaver-2.20140311-r5.ebuild 457 SHA256 cf2ed750e820819430dd6a60ef73a37d207b1163fcf34efb2d1d99a3dba24ecc SHA512 b6cab3a2a35a0a6da672596432e7daa5b54d53a494a25023a1abd0f3fa0bd77209ac12b0779665a71745201d091fc2cea34dd8a8e88a4289cf10e362ddb52d0a WHIRLPOOL 9056dfee0e33ebceacae2679f122239f367b06ac0ed8368dae6b08be63c292bbb561a751d129158c64b8cf4cb1df451250fd5f1dfe6f2d6cd4da43e3b638c6b4
 EBUILD selinux-xscreensaver-9999.ebuild 437 SHA256 7333a1db16cfa57b858ac73555f745646ec1fd0ea3710b3fed56db99edec9a43 SHA512 3be20c5f6f22031777c7018ba01d9aae91d6899aa2fff08ab7c14d4145c3a2d472cb4f1001961178e844d4f5a066b982d6b05c83c2a4cfce9ff53bc0ece86671 WHIRLPOOL b8804d51d2224bf0651869549854637eb8b1f9aa964ff7b98ee76b07eb8e883de9c552b2a3faef5930fd844aaf8c1c945f5bf4d1634aed7b65ed3b6ecd6d38d4
-MISC ChangeLog 7132 SHA256 aefcc41af3561d50044582e4e694e03ffa17680a501e192bcfb5795c6e504646 SHA512 61f04498d4dabf26a0e721ddb8b0e30bb715c5168952873929ce0fbefe1c5606e2b4ab81649804ebe857ef72fa7179b9cc0863c4e76bbcd7b58aa44809ffb4fd WHIRLPOOL b5fd3a2988ed7dfe2269f2c81a5f30ff57a475495e46d815b8b8c39581c7b86fa49fa30754137c4d8c538d22bedc1c3270e28e0fef6146c7a02155f2675d0e54
+MISC ChangeLog 7336 SHA256 dce925e8affd959c4a21de87d60b4b348751446ea26f5534d5f941a6a9d035a2 SHA512 da2625828ed909873179f05f1756953ed5669cea1cd1a8c0674554eb127ca1f97c578c1b93a889f53ef3ea232440817c697dcf23add1a259ac002bad5d641376 WHIRLPOOL e9e341e233755983f2cf6acc3dda463033a790b456608f11a483761f058de53b9ef3c32d05561f7108ed86fb76bbe6b1e17436713582b91a4f99a0644b56c5ad
 MISC metadata.xml 236 SHA256 ea747881de8ad37afab6fc8c0915d6fdf23f99a14ea7566057afc01fb924109f SHA512 a5722e2354b02fb25a77e986c573bb46bca2e87cff14f82f0c2fdbf5d192a6e8a1cd462c559280e89211a9c30be135f514be9792a20e60f205a2c3d1257115d5 WHIRLPOOL e924dbb127f26b84ce84e8587eb5b8b1949c18926b81ef0798d07d7dd7cb115a05603930602ee84d92bc02d43df7a21c533b667eaca7a250da66f9037bc9db26
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0
 
-iQIcBAEBCAAGBQJT5RysAAoJEC7dUkA7aK9HWaUP/2EVh0sXYHMaNa0r/DPp9Az9
-vKqDqcgNqm3kpLMmin7etQ05ZkJe/kBltYWuPlvq4/PHwJNugWw/OZ4fv4K2iJEE
-7USmugIc+Rg+nZTkYRENj1a5tWb6ZBNraLHciJxUNkaczIFLZSjQAf9qBDCwiYC3
-lUoaKH/u4VA3oI9v/5TgWg/GsyZMBXXfsm4+W3sigGjhtGNIDeRAPPXdR+gJ1MST
-mw1NU83iwI7p1BU25GsD/JZKkuej6iYHGz9Mzgkdp2AnE40m3QmS0uAjS6ZIuhcK
-PvAIUxcmed5gBWg0HtPxFhn+h9LVV4ojpW0+2GnfNutb1kSma0QhSYSYN4XaFAtO
-wo/cgX4bk6qU7vfSY2W24LZOZM9ctOQGRhqv96eNoBKADBXKofX2ErqJFyY0oZpI
-sHX1Luv8IiG++4QrntJF42VR/Mp/dklU4Xbg2yBnsfScvEVneHj64Q7s4j4n3+Up
-ICpT9GKGD+5TmfTGovKxcB+n0/w1eDOFrqTyM4PmPF1fH9zBlmB1tNHYffau09E7
-hBim3tSnUddx/69QzPwgamg9qsSwuU49pC+NCuzMY40VMX9cCdJPVf0FArXt6m1p
-UfV2IqjHETMkvTSqeE/EyRP9/IOR4oMySof/I0KL7175xKeJUdFmPv5oHydaVbys
-gweWmCEfYFwlmnF0Izfz
-=83t/
+iQIcBAEBCAAGBQJT5niBAAoJEC7dUkA7aK9HYpIP/0O7v+AL0hwlqK+m4SMsUZpV
+QEnMZCxJiO+2uPRg2ZFYqu4jctbuB/vpoFVu77lbCOEl/uktxPOqkn87qbr/LX/a
+GK+tA+yei8LHD/meuWnh/MtKF2dtmLBfsrfn49ffLOO7DAXKGqQkSY7NZi3nU8MZ
+qTUB4fNXKLTdUw2sTmbOaplVgsS6MFUYtwOSpcq7NIe30ik5aP+n/EPgbRsZ+AGr
+CQvFSO13oIH8c4lafokx0AqYe6590jbv1jA6XohbHwnaVmICkRSwyMWzEWxKzqPr
+YclcBv4y0ZeSmXcxOh1gw89+c79rp2eySCLaqB/+dcLJbBcP3v8oqQFD9QQRapJJ
+ClYTFwcgNUErC7+eL7tDRez8NP+CtAXxasGyoBNLnnnuc8GGJv3UBqdAXaozl4t4
+150F3ZXFjuZUBXXESHP8Xvc21GKPSvMd6U/qQsEDRbTLZgmkosdutsNIAcw1bmwC
+UpqUfOqAyV65gJRwigiJJjXL9HFlXDJ1i4jlxmw2pCpEPr3KQ0qwxk2/IEh2Y8l1
+NBosDMy5kbKYXy/pGQyH1U/yZj33/uJpphoNQh60UB8BiPRK1tIFjFlkMyq2szX+
+r8rI0Ga6+RX/ejp1JG/ctMIFDLUNsqRCkjfSPzpw+MCtiYD5XTudg3WED0VVs3xw
+IRlmlYUuX3WF+kMbGq4r
+=EEzS
 -----END PGP SIGNATURE-----
diff --git a/sec-policy/selinux-xscreensaver/selinux-xscreensaver-2.20140311-r5.ebuild b/sec-policy/selinux-xscreensaver/selinux-xscreensaver-2.20140311-r5.ebuild
new file mode 100644
index 000000000000..ca036ad0ad29
--- /dev/null
+++ b/sec-policy/selinux-xscreensaver/selinux-xscreensaver-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-xscreensaver/selinux-xscreensaver-2.20140311-r5.ebuild,v 1.1 2014/08/09 19:34:07 swift Exp $
+EAPI="5"
+
+IUSE=""
+MODS="xscreensaver"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for xscreensaver"
+
+KEYWORDS="~amd64 ~x86"
+DEPEND="${DEPEND}
+	sec-policy/selinux-xserver
+"
+RDEPEND="${DEPEND}"
diff --git a/sec-policy/selinux-xserver/ChangeLog b/sec-policy/selinux-xserver/ChangeLog
index 70c2f24861f5..27679cf1a3b3 100644
--- a/sec-policy/selinux-xserver/ChangeLog
+++ b/sec-policy/selinux-xserver/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sec-policy/selinux-xserver
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-xserver/ChangeLog,v 1.49 2014/08/08 18:49:23 swift Exp $
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-xserver/ChangeLog,v 1.50 2014/08/09 19:34:20 swift Exp $
+
+*selinux-xserver-2.20140311-r5 (09 Aug 2014)
+
+  09 Aug 2014; Sven Vermeulen <swift@gentoo.org>
+  +selinux-xserver-2.20140311-r5.ebuild:
+  Bump towards r5 (fixes duplicate context for hiawatha)
 
   08 Aug 2014; Sven Vermeulen <swift@gentoo.org> selinux-xserver-9999.ebuild:
   Make 9999 ebuilds EAPI=5 and transform to make master for version bumps
diff --git a/sec-policy/selinux-xserver/Manifest b/sec-policy/selinux-xserver/Manifest
index 7b2850c7d9ff..bd568f9e2d3a 100644
--- a/sec-policy/selinux-xserver/Manifest
+++ b/sec-policy/selinux-xserver/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-xserver-2.20140311-r1.ebuild 391 SHA256 9917ebcf6e5d02f36105eef785c0928123715efd1d4135040d0651e41667e3db SHA512 c0b60f0355beef15b23321d1cd112ff57ff183cf3894ff392bd54fa60888d5bf6a51611f069afe003196b6ce260ba747771625d9e036bb9f2f00341b8de575b4 WHIRLPOOL 00fac8ee0c8ebf0f6e4d7e127feb538ac1a2038c279e96a5aa992e895633b5156f5b9a6fabc31d84bdb54510f92af3f2c463af702e0d63f33483cf0dffd6f54b
 EBUILD selinux-xserver-2.20140311-r2.ebuild 391 SHA256 68d48ba56ccdf71d5646e74bc12297cde621c9a8bef045450fcb50d32e1f5a49 SHA512 21184fe1c58d179b6d83def1ec8b7907700fe70f6657ecacb635addb90406df7f19c9f504d590e8fe84423e5e16fc4c7d35d80f7a5c49db378a4c4f32b0d7a53 WHIRLPOOL feccffabc8d7656422650388ea1aed1b4c3baf31d4cbf3aba57473cccd2ee63619813a037d490119dbf33060f1bc4c6bc52749d9822c9b852cc72d254facde3c
 EBUILD selinux-xserver-2.20140311-r3.ebuild 391 SHA256 3934598df2929236bbfb3006a5d9bb9ad003cb71361e0c372dd081ea51bae72c SHA512 73ff2649c2715dc624b649f8c0467b0f126ab0cc05ec2412faf04e164f91ed78cfaba5ecda8edeb962949b2884c578a120588b83581842b162d2b48403f11e9b WHIRLPOOL 6eec1b433a8371ffdf69e25d36931c5e82bf1ae18d56a2f90d617d9c21a82d19eaf014810fc68ac4419ce37c2d30a866f9f764501980169ce52018f4a14775fd
 EBUILD selinux-xserver-2.20140311-r4.ebuild 393 SHA256 de70b7d9944504b3870b78d398335aea282c5eea01cd751b972138cef74047f7 SHA512 cfccbd903bc5b49a97b6f637feadb041463b11aa1aeb7ea04db30ed1abfc43256e09eda531f821679f95978137811863a19953ea69806b0f7433aaee7de52566 WHIRLPOOL 73a8ca95a03b44f1e920a4aa9590ed8f551207b6285d2065443e4be8de2e826bc59db6d7661abdcc8e5758d2b36bb72b8ecc5e04af68b87eec7bfd20a9b7b5f6
+EBUILD selinux-xserver-2.20140311-r5.ebuild 369 SHA256 c72126701becc4661a2889b13217ea3c0f64ddfc1892cb050b22a0ba5c5ab01c SHA512 9d9d8f01149781503fe4496be6fc8a6d08ac58565d33b65dc286e87f40476256382831373f7d93bccb88840923e9a4caeae57bc8beadd9b27881f99fad1aa269 WHIRLPOOL cc59a2d12b114aebf8f9c4fa52520ede4aead6ebf57a374ec3da59a82bfc7063aeb2cef8fa347363efd39b1995abc6d7272daf8984debea2f62d900ef92d16c6
 EBUILD selinux-xserver-9999.ebuild 349 SHA256 fc41afe58c136c1d4c97a560597b5f1bc1fc14a9558f61c6e90d719319eab3a8 SHA512 30420e853a64e9da95810b0004779507459efa0ff3db9da46ee328196b3935e5f69a85c481ad76e670623833e0878695afd58b05c8b0115f400fe3080acedde5 WHIRLPOOL 258725e82ad3147e09a4bbc33502b73d614de1dda2fc8c92ce9e3b54ec320484064f2e0c7e27589ac79d64b5edf188c1ac6f7083036468d7f07434607fc4c4df
-MISC ChangeLog 8192 SHA256 9e71b1fe3dfdbeed0eaf105ca4fdd36f991b12090ecc621617db7a13a0f91948 SHA512 6b7647c9de5001d786b11db4e79cfc68fb68f0ac6e4867f85bedbdfe16319b75ef42c435048bc1d56535ec0102c2ac9be6ff406ca0efc9a450b227d260e97ba1 WHIRLPOOL f6a87d1c66fa8047528847a1b22f7b9de081deb194290f955a6d9b96e84da339a58b84454c00356660a05e36fa91c6db10a32722d1e190cd35e83996d96fb5e3
+MISC ChangeLog 8386 SHA256 64a2a0e8e09bea4da570e3cba0abf327f6dca24345f577aa52b9cdf5961a4bf6 SHA512 86b0a5a0e03114f1f39e6c292a733d363f98b27b3bfb455f4ee884f995a10ae4e34e0a9060add8a85ba04c1bfcd6a343c7a992698372f267428e25f4246b950f WHIRLPOOL b587b0fd5e2c4586fd469978116c07fea972557b467aed3993e5807dbb47cc028d4861c257924b11ac06c8429b6db5aef60dae089e9bea701c347025790dad70
 MISC metadata.xml 231 SHA256 60030de2edfb82398b329de41fe7f59a8b05f74bfb96c4480437e3f6cf767780 SHA512 c620368448245d83d7357d4e7d2e122bf1ad3511940cd9a298bcd3bdb9185ac24f9f3fa1a59458c02e9272c58748ff1fadacc7445a0a6ebbd2d8f4512ea7921c WHIRLPOOL 83ec6f1046d216f913dad8102a5eef951685fa583daf815847b8bafe205fe10d0b551468869b450347fe8cc68ce4c5c3b24ba04682c13d6ec60c727f5dcee451
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0
 
-iQIcBAEBCAAGBQJT5RysAAoJEC7dUkA7aK9HOmsQAIi05h4MayL35SxOBVDjmShk
-/n6ThvhmAVS5WZ5cKKrjs8OrofyppY0o8FG1SjlAKIwSShMxEUrr36+eqtOYUB2r
-GM1eW/ZVG0t5auT76VVfjYiFenqMiFOUW1BERYaGDimlo5fzerHsOiZxVzLmVDIt
-EmGIvLI36Ji6iiZwuDslLUCZkQgoidfgFvQ+ZTURh+qlA1mvBodQuUyCMH9sa7kZ
-CtSIrbi3kfrTg8dy1swZM09LMWtISpM+yKXu9Qci/J/5nqvTtOSQnNapQlugEGpL
-2P+ueGyqEy5CQafdXJhQ+v/b8z+nw+/Bvy3WuHhdMpHDZRTU7dSLdETt0vUUfEze
-Oi/Gt1zdP/vsoyeFqac4JSRMDAXhGV2y4WvhiHWojFIKJbYfwAXqIXcTdzlPd45H
-2qYhfDuPcXi6MeJlsWxFuev+4ZYKNIG6DN4rRfCQuJ6sVjStne3xzjc9mAfzOcm5
-jXUDmchQTx40COZE14MowCfruy/4bvR0BlyZc1lLCy/BF2q4n7Lx1er4VEGRy7yr
-zPZyGp7u3b7v24lNU2doX4vrxwvNVTcawzPibjVTEdeJn+qukKqM0ckPypgMMhpd
-QYbD/e9mONvRMS+nW6SyZuAsB7BVyPYTEWe2U5cxr8wjTBtVIcyIOb5s4VTPex0j
-tuqqIXtePaHYL9WKfmfv
-=Dqf3
+iQIcBAEBCAAGBQJT5niCAAoJEC7dUkA7aK9HnIEQAJc7V/vETWZkISZWGcNrjAeY
+D94bm7vY498dBagRnDeIvEpVViryzBDBOrGKxfpYEtHWrFvMjIyzmr/3f3t0aeT/
+FBcP4l6OA86rup5nBfoj8hLxoSI0V6d54D+HI8JMaHJUIX6rZqzmSOGUnO6EB6Kw
+zAlmxHzIOTYbOBMYKWLpCpq+gkk0b3FATdfWeyS0CSU6xuFAuNi1Hp4JDpzV45rl
+/Ypz4jpvyMeBY70Bz4bCaEZ+wQIKeEEZr50upHL+pPUl5/E6bt+/a6Tw+LTbxO01
+9UuMGNDlsPJgs98jrAcD/FTchepoNMfT73NG5LPaTbk9AEWMVHav+1WpunQG6GDk
+RDO92BTEOO2kSSbNv0Jf3NyEmNDYJd07ZOz0l5PAtoxUxrN2Ix/g/yVulP5pYjMe
+OnqeHiEZ505THPz5735RMUfu7qzqhITy60Vb1wNufwH5nR5INRb8tgAF9kZkyhta
+lt7IzZBhmiQacLhF9FjOHiTIbXJmg5qrbCx1wkvYncjznn/aLYT8xkYL2IjRcIiP
+9fbMqFRADI8w4LIWfXt9izo8WWxs0CN0i4kXrVp4d8680+X6Y5LsQYyMTDg8bkFF
+sdgm0IBAkhc6JAglHuxi+pc6VS3gtNcO+u54PpAkfp/VBLCty3KPNcbp6FTyB5QT
+hinSOeKh+hMWx36q1K+o
+=GCKL
 -----END PGP SIGNATURE-----
diff --git a/sec-policy/selinux-xserver/selinux-xserver-2.20140311-r5.ebuild b/sec-policy/selinux-xserver/selinux-xserver-2.20140311-r5.ebuild
new file mode 100644
index 000000000000..64517d501d64
--- /dev/null
+++ b/sec-policy/selinux-xserver/selinux-xserver-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-xserver/selinux-xserver-2.20140311-r5.ebuild,v 1.1 2014/08/09 19:34:20 swift Exp $
+EAPI="5"
+
+IUSE=""
+MODS="xserver"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for xserver"
+
+KEYWORDS="~amd64 ~x86"
diff --git a/sec-policy/selinux-zabbix/ChangeLog b/sec-policy/selinux-zabbix/ChangeLog
index 5b8f52dd0b4a..5f19b683fbed 100644
--- a/sec-policy/selinux-zabbix/ChangeLog
+++ b/sec-policy/selinux-zabbix/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sec-policy/selinux-zabbix
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-zabbix/ChangeLog,v 1.43 2014/08/08 18:49:54 swift Exp $
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-zabbix/ChangeLog,v 1.44 2014/08/09 19:34:06 swift Exp $
+
+*selinux-zabbix-2.20140311-r5 (09 Aug 2014)
+
+  09 Aug 2014; Sven Vermeulen <swift@gentoo.org>
+  +selinux-zabbix-2.20140311-r5.ebuild:
+  Bump towards r5 (fixes duplicate context for hiawatha)
 
   08 Aug 2014; Sven Vermeulen <swift@gentoo.org> selinux-zabbix-9999.ebuild:
   Make 9999 ebuilds EAPI=5 and transform to make master for version bumps
diff --git a/sec-policy/selinux-zabbix/Manifest b/sec-policy/selinux-zabbix/Manifest
index a120dbce6650..ef8a483e7112 100644
--- a/sec-policy/selinux-zabbix/Manifest
+++ b/sec-policy/selinux-zabbix/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-zabbix-2.20140311-r1.ebuild 387 SHA256 63f7bd43a2cdd4b581f01aac88438b1a79ac2c4b802207f756a7c882c3499025 SHA512 d766b7657246be29f2774633430e878aef6b2a8f676f66e1166c7e54c8e7b97c2d8eb813828cbcaec01b61b20dc47158ab5059ceab2dd41738a4aac5282a81bc WHIRLPOOL 93fa46abb7c92c98e7daf6a127b2b0ecc1749093d35b0fecee5803444bae3ba1ed994c29f95c2b3a0215bd8c505d80944b31918638d476b4cc6068e6878eff96
 EBUILD selinux-zabbix-2.20140311-r2.ebuild 387 SHA256 c29eadadfda60e4d7901f9a70036037a549a36461805e2ccb9d04745be73babb SHA512 e432e9f3eef1252fa0990ee364ce3b6c60262f39511aaa8ca410247334f3346b3c9d9efe1207d16bd3099534ffae56cc02466f4c15535c2afabc3b376b50543a WHIRLPOOL 0b0d4283bb37e65111ab97e9014c272166e04e1fc29637a3bcb13fc4b1133196216a2af5087b284cd111f28429f30a1aeceab4dc3282d511032802973852b9c1
 EBUILD selinux-zabbix-2.20140311-r3.ebuild 387 SHA256 02fd28ea8779c49f7c4709ef7325f4c5e6864cd85daa3f515b003d295d9e7128 SHA512 49dd7bef6cd705b88949cc0e9266b34605a5b7004a686fbc04620b833899c43827c2723e55981d8a5f88c88f41e8f232ee383887b3d1f01f64b643a2dd1bb948 WHIRLPOOL 3bc8a31d6274dc3f944fa87f479e95f05df40e761db8f1d2cffbc7a715b94ce4fd459e5ad093e73e9d27d2fc8eb342407648d3b6711f9b76dbfed22a41cc7e77
 EBUILD selinux-zabbix-2.20140311-r4.ebuild 389 SHA256 77ca3695dbe9504113c44a855a85fa98fefb5f0900cc28418a9266c54b06c194 SHA512 d4fceed4fa2764fc366dec00267cf19f2c28b444f100d0aab49d55cb9e011d625f447de874a65b73e57380226273d4a05a2304dd3e6597df161b67701462c649 WHIRLPOOL 8abe3d4eec3147b6e8b65ce1148e0a35fb2bb98c245f3ba9af3d262084455784b417e2bad1d62eb5e13f19b884897a9aad83ddc06cdd55648973d05e5c5165c7
+EBUILD selinux-zabbix-2.20140311-r5.ebuild 365 SHA256 dd7da5975ccb14925fbd25688377e434610a199ed5f515f64d0152c3bcf9a687 SHA512 713ff5c265232f58cdb2e2e55ed54621390185ce046a1db0963036a6b5fe79d64d86a7207acd3d4b213cc7df87f213fd8f342dea81bfc0dc0c5b0dbc891cf6ca WHIRLPOOL 0d41e154291de7e0861bd14933a08349c47f5be2d2bbefbffe584a1b9fcd67dde3192cf40c63878da862f0ab9dd3a41a11ba69eb12bf0a5c03e94d7251555395
 EBUILD selinux-zabbix-9999.ebuild 345 SHA256 6833742c9078be891737e2c2ec31d03de68915908dd41e45cdeda3976f8b3e95 SHA512 cc0c6eac26de8eddbd103b825d199b0f5a0ef480dc1b11c5b3e7a9985a9b3de80ee5c6a939bd9e34d8d61e5010a7cf9a28dcccccfb788b987587ac87dfcf785b WHIRLPOOL 728d70c5203849a0cd1361795037b943bb4939590310dc8e27dc41fa50d67da6bdce5c4ec00cf40250d3ebd811f9e7271bdbf2d20e10e51fe7e862c40bc4a41c
-MISC ChangeLog 6825 SHA256 d739228896713170c0c7b4f899405c999ad0e1b8150727de379995ad934cd79d SHA512 72d3d43cd7b7d8d888016e2ea37d7a1058ce8bd795e3dff6085a4fb2bb35c0010cf7e496152e6c8ee8e62bd277d3beb299903f4c36c5aecd9a98182568f12af8 WHIRLPOOL 42a5e47e6f4c3f97751a29acb51a63ffb8f66b64b0dda9b4024853580e88c1587c49c6d986f7ce125ce5f3575859a308e6cde0a6aead03bd3a438890076c1a8d
+MISC ChangeLog 7017 SHA256 e57e390d5b946c5af14e513c754b6b0ba5ef35c52d3cc6eb6c3bd03351f1533b SHA512 19612d4e72ab51b86fe19431c1a7ca95e645584312b8d8108629e450ab109f2e22a126c4073a4a8036b2dbccb43a7d031c1e58696526627cddbab8fd6b6b12fe WHIRLPOOL 73622812c7afde779a9fc8e6169af5dad2cde8a9cd677c72fda0f7110c8c24db101b7720da7e203fff29faa3677469c350760c9e43d1eb6f4bec7ae509c958a9
 MISC metadata.xml 230 SHA256 e9b3160af532a6e966a9a73bf5c180574ee4c9b9ee6e852ab75b11acea984444 SHA512 7bb0ccfac4874d36737014ea1214d48b615f678c75b5a77d42948b512adfab07be1b2241b5e8765da136ff3a3ae31950d67bc9f521d4146bfde8d30cd0d40def WHIRLPOOL 3834f84d9e0db37b99575b9921510984c0a4242d1d6bbb71ce10bcbdf1376787c8bb2e13a1a6ba71dbaeb6820cae87b68618a89132cfd438783387dd6777061b
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0
 
-iQIcBAEBCAAGBQJT5RytAAoJEC7dUkA7aK9HIHsP/jGPvYsoOcRTkmvGVE6QjrKB
-JA4btP4h1aHCvHnsKs1nSpkx9rRjaSp6WIZ2OPZ2cjsxZ65SL8idbWGl6uVMqWSY
-SwV5nsM/7sDvQsV3hBKv2JHwmkTgK/nDrm+5M7a/LkbDlZP3YxuP+LbO6zJxbl4R
-0BaOgw0nnWn9NNeJ+8SWkWWLtkUPqFApORhQ0Uay2Z+S2Xvlc99Drbmc9KdoRnPN
-4iTtX3oH/v+WKaAFqtL61z6rE5fMtOOwU05+Xoew2rK/g3VKS0JCFwNggd5Xbb90
-Y7WjqpwFGu1g95xZPkntQXVDlTUP1AN9VcTBLgluUpRjIM1sJjmspimfBkZIaiin
-uRMArLcIJsQ8aCwyIOZDITTgFPj4PMFHbUWpFylI2jqVqRPhZXZg0eSjiCFiDk8h
-sIFAcS1Q+cxUdJx+BbaTMeP3gbq69hQBpj7FhJc8/riY4RsRYSY1Mr6bn/ZX6bue
-HbF184pOQASwX148JBgRrjcXN2Kyk+jZjovbO21NTtxmYawsxj5bsJKGuA5ehlht
-e93NgAb8ao3V8UilD04Ek20UBjfMDkP+rAcQde2LmgKYozlCX+RyXkHQwv9E3szg
-bdVw9e4sFCcUFUY+3VqZ+7fpHB3jrkDY+A7Ck4Kxnm+eHVw3jG5qsLX7lXMLD9YI
-P/z/fy8EdQtaPyy1r7nJ
-=DkO2
+iQIcBAEBCAAGBQJT5niCAAoJEC7dUkA7aK9Hmo8P/j2jTOZZ88Lw7r38Tsby29q4
+op+M5WCxTX4vUHHPjrh+cX42JXlZ6S/6C3uB5CsQnFMYIAdASmRLbweunmREEHf/
+kh2be6pKUCuZMrduOqiTzkYeoYdsy2y0Rr7/vQ31tqcCRhi6ETAIMPTEwfOA1lBM
+TEK6vpQdMRr0OU5QDm7mIl+wbQyJyYj4YIy6sfsq/mOfZpY8m8ebfBr3cIlU9jWu
+/wrgPHito3wjJPtL1unlmMSXaLC07jSP1Yuevj0XLMa9gZLdw7P0uf2IoKCILCdb
+GlmzNeUmDnyigxgixpHCvj+qLf+KZSFYaxNIJHjdTXrgDNHYxevFUDbtzQ+YZ2GL
+66yf7sGpKu64YdXm+VWfd/yS2Lz33n6whyMvO8GY3Va651SMJN8g+R8PnH8zcBjp
+qy0pKHD5q9zaWAgNx+MdkinqFyjcIx8FSlwjLJPpH7iPGsEpQNr9m7pRNrcQg71t
+avfsEeIVCxzGl00GqkxpF/8FflOeSI2TsQ116uXfV17sj9nv9gF62rO5hIcn/k3/
+YvgngEfbDhObDiThbZ++fkGIh4DBhxSgBQ+GUP0OO+tEkD3LZshOjt2xLrlIt5IN
+tXteHj+SOu2cRfUDEZk4MNP42AmGBrze/KFrwcXQCulQOj4SHIG+TgF3xSPxmICo
+SYlXoOrA1UkWPDrk/Jmb
+=bz4h
 -----END PGP SIGNATURE-----
diff --git a/sec-policy/selinux-zabbix/selinux-zabbix-2.20140311-r5.ebuild b/sec-policy/selinux-zabbix/selinux-zabbix-2.20140311-r5.ebuild
new file mode 100644
index 000000000000..11fae0df952d
--- /dev/null
+++ b/sec-policy/selinux-zabbix/selinux-zabbix-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-zabbix/selinux-zabbix-2.20140311-r5.ebuild,v 1.1 2014/08/09 19:34:06 swift Exp $
+EAPI="5"
+
+IUSE=""
+MODS="zabbix"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for zabbix"
+
+KEYWORDS="~amd64 ~x86"
author	Sven Vermeulen <swift@gentoo.org>	2014-08-09 19:38:11 +0000
committer	Sven Vermeulen <swift@gentoo.org>	2014-08-09 19:38:11 +0000
commit	e9436eb0b43ada1b03a415122dc3d2082e2db696 (patch)
tree	af2839ab40c812eed8e02542c8dc3dbdb2308019
parent	Drop insecure versions wrt bug #504088 (diff)
download	historical-e9436eb0b43ada1b03a415122dc3d2082e2db696.tar.gz historical-e9436eb0b43ada1b03a415122dc3d2082e2db696.tar.bz2 historical-e9436eb0b43ada1b03a415122dc3d2082e2db696.zip