Stabilization of r3, and make r4 available for testing

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

4 files changed, 42 insertions, 19 deletions

diff --git a/sec-policy/selinux-calamaris/ChangeLog b/sec-policy/selinux-calamaris/ChangeLog
index 653620121766..a8998e00ca3c 100644
--- a/sec-policy/selinux-calamaris/ChangeLog
+++ b/sec-policy/selinux-calamaris/ChangeLog
@@ -1,6 +1,13 @@
 # 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.39 2014/05/29 20:23:22 swift Exp $
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-calamaris/ChangeLog,v 1.40 2014/08/01 21:04:11 swift Exp $
+
+*selinux-calamaris-2.20140311-r4 (01 Aug 2014)
+
+  01 Aug 2014; Sven Vermeulen <swift@gentoo.org>
+  +selinux-calamaris-2.20140311-r4.ebuild,
+  selinux-calamaris-2.20140311-r3.ebuild:
+  Stabilization of r3, and make r4 available for testing
 
   29 May 2014; Sven Vermeulen <swift@gentoo.org>
   selinux-calamaris-2.20140311-r2.ebuild:
diff --git a/sec-policy/selinux-calamaris/Manifest b/sec-policy/selinux-calamaris/Manifest
index 3acf4b99f5e0..47d8783f6265 100644
--- a/sec-policy/selinux-calamaris/Manifest
+++ b/sec-policy/selinux-calamaris/Manifest
@@ -8,6 +8,7 @@ DIST patchbundle-selinux-base-policy-2.20130424-r4.tar.bz2 293227 SHA256 b5b115d
 DIST patchbundle-selinux-base-policy-2.20140311-r1.tar.bz2 259943 SHA256 0444ad505802b730dcc47daae8341de4f1a2f1cfebf85d90fcfe057cbc7aeb4f SHA512 d660442fdb92227a08d453a6e5678dfa63c1fe16172d05bc04ccc2a3e0860ec494a5747fa7baab794171e3bc6738b507e05b01485d3ed7e32ec2e2bd36fca5dd WHIRLPOOL 262421e7bbd1561e326f0616a36b8f3084a3bee4225526c00b1031a98dd31ca8d7266f3e696069bd8d347327ffebb86c08abe5924e4b917f9cf1128ddd74e4bc
 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 refpolicy-2.20130424.tar.bz2 649845 SHA256 6039ba854f244a39dc727cc7db25632f7b933bb271c803772d754d4354f5aef4 SHA512 82ab38bc3425eb4b7d50c42564ebc28603e32e6f3266da164502f0cdc3a2f6bfe457518297824cb78f6f94211f9823fbc7254bb9e1d9df1cc7f284d326299705 WHIRLPOOL ba7539261a072d33e34afb940a1899ccdb2493c3b11eea3b166b9eb565478fd93cf580d09ef016f799a5dd5a4452086a623f9b3f38fbfb9a812e6e31bcd68e25
 DIST refpolicy-2.20140311.tar.bz2 664416 SHA256 f69437db95548c78a5dec44c236397146b144153149009ea554d2e536e5436f7 SHA512 50bacee82ed41ac8b8007ecc33bf51d22303cc2ddd27cfb72cb5520dab5f8e255186e34b89cec492c7a2d4220b200814bdede9b46c19f987a3d3d65a1c9b749a WHIRLPOOL e07480beba6ab1f02ad36b7d0c50c4a71cb39a8ec78bf8d1dc3c82bb9dd1d69d9169d7c937165ea15f60ce1147f256d46644f944107a3a8a800d5bad70d4c255
 EBUILD selinux-calamaris-2.20130424-r1.ebuild 399 SHA256 a20395b2408af4af688eced5d4a985acee47397a47eccc3d4b1ecab4a546bd25 SHA512 b1b427cdae20b9e4e5f98555a1f7474a841d19439397414b188ce4d3d3e908f07d24fbff81b2f38f06750b90d705cf9358d0a667316cad1f60d422ca65b88e8b WHIRLPOOL 28dc077070f55086f8c01a3b3f9e5081c7d1996a351dec1ac8515cceea64465caa1bcde3284f8ccffb2c63232bcebe43f567b807335a041b03f842555b4b5f99
@@ -16,24 +17,25 @@ EBUILD selinux-calamaris-2.20130424-r3.ebuild 401 SHA256 0d360058627c946b5d32667
 EBUILD selinux-calamaris-2.20130424-r4.ebuild 399 SHA256 fbeb9462596f24fef8c5c45ed908f51904e1c7b0fe449f2bee09b197a90e8759 SHA512 59a9fa2770a74f261e901da9f4b5bd63b32bd5c26d54a77b37e96885d6873a1663cdbb4cfcb31c6b3d16dba8b9c968c8a5d2a3bd2096dca81002545d3cb8b586 WHIRLPOOL 83cc896245e59319f867b582327bd86d75fe09d9de157ac95812c75e4eee72969c5054297227ef20894181e5a476e78407259470448ea2e8604fe91d4cbcd6db
 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 401 SHA256 71a9b2de168ab95241163012890872f3beff1e322bfdd4832070d1206037fb56 SHA512 c2c0afc82be0b95c4ac7b21c2dad54114ac164266a3b31de3fc4ef3d404cc8d2fc9076cb9d783c610626456415363de07371e37624c12ce09ac88eaf14606e69 WHIRLPOOL 467a458b047fb83068706b189032f6fa4000e8028a00ca0281532cd70c3b0711d038b0a9ac0b794dbc7da77f2cf61f3b5af8cb92b46c7a02101b7371a210631e
+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-9999.ebuild 372 SHA256 1710b42f56e6f6608b2b82912c10f79597be331c8bb810706a987c51191a33ef SHA512 b6761a828498e4011dcf40c03750a7146acca067b184a10291d4e1bce172b3e950db8c4a34e1ac6138570fb52877dd5cd31f5f154c7b30fbef726836af0e5898 WHIRLPOOL 36a65e64d378a7127e0bd0871b91a9eb78c2d675fa1178b7c149bfafea0c3721a34bb40a98950ce34de4cf44a865ce39f33f6c14201965da4bcdeac57dff8de3
-MISC ChangeLog 6107 SHA256 75f51f59f0feee1bad3236695c6a7c71e20958ee46e685433dbcaf2d4a2c819a SHA512 0df15b29537419ce7de9ae64a22c012bcc2178e592622229c612533a9e158824f9c9d5d0b8722068bde0333284ec9402c83001e9f91b86fd155d636fde27108c WHIRLPOOL bd7864b6d0388899c687f0bfb05315ad919d6eb0845f384f957529b6fcfdec570e5f3be1c4ac0c7070977de4389eb650bf94b06d3ac52b9a9c2fe60811b9271d
+MISC ChangeLog 6347 SHA256 3e72dabc7c3a3cf42222c87d590295edf3f96cf3ef9b0a77e3fcf489b90c9613 SHA512 3b4fdfe03a66a352c73c696afa29af7bfd932d41ec6b9b26284599cd2921ca77952faff10e029eb965c530420d4cf04429290907338eb83c220a3ee707ee320d WHIRLPOOL 92505175a6f9011ba3ff0bb3a722d329333f009374942061c8d171d7f826b76e0c2b6dfad36c7170047a86381f5316c06ae31cf4e3174484c24492f69c13f904
 MISC metadata.xml 233 SHA256 37e0072e69210c1cede0208034a5cbcc79f39a7ea051f04614b4c71ef1cd0ff3 SHA512 e90d194367c294da652b5ab68713b68d3490dd2421accd4beb9815a368743ba408f0a85caf80b1f4cc90680c46999532ee7234a07491a1b418311a46570f8d4e WHIRLPOOL 7f29d90aa8199b5448cfa35388f32f3e57125620ad94cec27a0c52ab1b0bb7adc9c3d21b494bfb43e13cc6bffa0e7576ed0467f90dc389c168979f2aad3c4c0b
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.22 (GNU/Linux)
+Version: GnuPG v2.0
 
-iQIcBAEBCAAGBQJTh5e6AAoJEC7dUkA7aK9HFzsQAJ4gD0Q56xKLSvoFvWHbid+x
-+hr1hUypJp9tfcRvC1Zzd/r0Fem2XVkyYVGnHd2OVEOKEIZmSddLNt+EWZaWDuIH
-DqIstKtiMiAOwYtZqWNB05lE1ipgL/JC6XltNdi8DDXMUn3pt39EfQ536PP/6w3k
-L6DddQe3c5IrTDNOAoPjaBVUUtVX7N6Rv9xKRy5GWn6eKrFVeshhhEhw4CNxVMMZ
-9J42CFwPMdQONOLHW1BfBTykQ2BQGpNwgvLsQX1b5D4Sbagb2GiNPjCxOTlq34Bn
-TyY7o66Vq/RzSCrorjuF57qm3IIByML9AtIJKh1yjjbRz4z0qJGFtnlazAkLPzJI
-fSugC+/MInFdHtjUFbLCVv5SKi73PKgROOaUI82Ig63hLjA7Pjn4zzVONiYtp9/M
-WdReZX+bv1FYngbLQyVsQZZRlbdhu0lzqNIrhwjWoxj+LuKX+c3GqDIsLs8YyFVA
-xpvWx4XHcMge1wtvmeHrT06S8wiYKvvE0rvekgrHPyrxQYUzMS/HQmwHmq2dqnYS
-trLl/FRfy7h7/4Xb/V/VfQjXVy/vQwuFH2zb0OWo4PqwqUJfki82FkLKMO8MESnD
-Ty39ZMJUJxzdFbvVJT28q59aDq5DFIw8O8cQuagqrygM7Sx5539H9op3l99PGYIp
-RX6jNAvc2OPRXpDalXuZ
-=aZ8t
+iQIcBAEBCAAGBQJT3AFHAAoJEC7dUkA7aK9HWpkP/0W2sycV9pPrhgoKAzj+LG5g
+eIqfe4mmjNmBMuiONYz4P7SiqI5NULoAjHs7qzFnCoeqk8CPdV9WpX1Y9TYSXuXN
+qt1mEnYgNTO5CuSUoX7hMvIIObe8EobFvGIvLHwDQSl//ZsfpE5E8svnzfTatg+F
+4U2lrCeK2Lj/f2U9vqYre/VfwGhOhSS+hiMCrLZ9B+q7cBWvGYlMNGMbUN1Of+4z
+ABnbeeV2OolCDvgj0p5jeGGolJdx0nk8svampMZB0LcikkG/2Yqs79qBFHricHPp
+vwsA58sSFUx9AABW9BkqLUJiY1JXVm6pHF/G43/WA1lVWZW9VKZ4XTZ1Anxs2Csm
+8j7l0q3K0JFRApkF+6WpIA+KBH2UxWviiubDxpZxhvPMM+Do4haH7oPzMSKy18VJ
+HKKsqcGEBj0frAu4xQZrcmHuCha5U2qoHLN/Pj19dQQuDZ9wJg9JNRM69lwgGEwq
+Z4Xvo0FKoSJP3FJc8XyV2iddMTeLWLgBpXA0rvI4d6aE8emu/03rLS72GFkUeguz
+Gtv/XUFzLJIVeRhM2KZwsMSpnD41AILKG5ubeknh4eX2waDAHgeviymdg+55pJQy
+FAwjIXAjtZCBY21Sbs6PoyNxTsDeDEeoBQFNTtv0hyRMPNTehgGysFB2EieVtwF1
+Eisfmxe3QLet13ZkZROk
+=KgtI
 -----END PGP SIGNATURE-----
diff --git a/sec-policy/selinux-calamaris/selinux-calamaris-2.20140311-r3.ebuild b/sec-policy/selinux-calamaris/selinux-calamaris-2.20140311-r3.ebuild
index b831001d3b4a..d72a9f096ae1 100644
--- a/sec-policy/selinux-calamaris/selinux-calamaris-2.20140311-r3.ebuild
+++ b/sec-policy/selinux-calamaris/selinux-calamaris-2.20140311-r3.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-calamaris/selinux-calamaris-2.20140311-r3.ebuild,v 1.1 2014/05/29 18:57:49 swift Exp $
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-calamaris/selinux-calamaris-2.20140311-r3.ebuild,v 1.2 2014/08/01 21:04:11 swift Exp $
 EAPI="5"
 
 IUSE=""
@@ -11,4 +11,4 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for calamaris"
 
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
diff --git a/sec-policy/selinux-calamaris/selinux-calamaris-2.20140311-r4.ebuild b/sec-policy/selinux-calamaris/selinux-calamaris-2.20140311-r4.ebuild
new file mode 100644
index 000000000000..c73321971246
--- /dev/null
+++ b/sec-policy/selinux-calamaris/selinux-calamaris-2.20140311-r4.ebuild
@@ -0,0 +1,14 @@
+# 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-r4.ebuild,v 1.1 2014/08/01 21:04:11 swift Exp $
+EAPI="5"
+
+IUSE=""
+MODS="calamaris"
+BASEPOL="2.20140311-r4"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for calamaris"
+
+KEYWORDS="~amd64 ~x86"