Bump towards r5 (fixes duplicate context for hiawatha)

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

3 files changed, 40 insertions, 15 deletions

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