Bump towards r5 (fixes duplicate context for hiawatha)

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

3 files changed, 36 insertions, 15 deletions

diff --git a/sec-policy/selinux-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"