gentoo resync : 10.11.2017

8 files changed, 37 insertions, 6 deletions

diff --git a/sec-policy/selinux-cvs/Manifest b/sec-policy/selinux-cvs/Manifest
index eba8eac73f92..e82f2883456d 100644
--- a/sec-policy/selinux-cvs/Manifest
+++ b/sec-policy/selinux-cvs/Manifest
@@ -3,14 +3,16 @@ DIST patchbundle-selinux-base-policy-2.20170204-r2.tar.bz2 354083 SHA256 95a77b7
 DIST patchbundle-selinux-base-policy-2.20170204-r3.tar.bz2 342266 SHA256 c5d99de3af1a6aec5aced5c4776ee47e15dbf467e116daa9d2df6f69653cf1c9 SHA512 df46b785a17c633d6fcd063b48258a362a0df13fcb71fb699b6c19281f4d647db43639e08e083157fcd49405c5c38c8408534decff99536d28ada64e9192d130 WHIRLPOOL 703c227d4490d9ba291089ac425c1e2924ad28644e5e7fbacbdc43c77eb7df6eaf776bef52b4019316f104ba29f06f90fc6222eb43106f7a9d678cf369eaf807
 DIST patchbundle-selinux-base-policy-2.20170204-r4.tar.bz2 373731 SHA256 eaeefe826522eab8d11318ff319e43ed89baa26a1ea21a89555d38119a2e77c9 SHA512 93a0644440064d85db32c56a381478f8ef94824a04531e6fbad26dd79be02dacd939b804759db35d0627908ff653f8107e18c48858df458c80ae785d80374667 WHIRLPOOL f319cf44526cee2ffc9f920da03cd4d2679f0ab979c45160084dd1aa2df16e9a2f8541ab49fd50588c4dd76675feb73dab1b13d5de809c39ba92867567530ddc
 DIST patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2 314854 SHA256 9bacb18209bfc2fc58f10403dd4c1d0d38fe1be9558234e4d7df664d9096f72d SHA512 1358db158945b82e0e41907e3919a6888564b4f15ad765f0fe2dc7bf284485c18d11c5502d598268e33b2163a6fa0be2a4029a8e9f774abfd4377031ee9afd32 WHIRLPOOL 27d114929e6aff27d9818eb5351242ba57fe8e5b2f661a4ef93903e1afcbff4e34edc95b5c8a3546027769f9d0f6ccdf5878ff8b8d20ac391b29ec34a07a7e63
+DIST patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2 324834 SHA256 15fd073f54df243224ab08018a8c1067281e3db0a0d003750981ad8c3cb6d081 SHA512 62ec2e70397d06d464e95305a4c0699cc07063d879d986a74442955fb8076a00cbe4a4f7a3cda46876cbf2ad38189be06f0c05ce9698aadafa6e9f02a8daf668 WHIRLPOOL 068ca0eca80b5ff09e6566846583eb42b00e895170b55171d60be28c87ed8120618f3f24e0c12f8954aa53284ee8d9b3e74b4be014c7387b6c5aec98c6b30264
 DIST refpolicy-2.20170204.tar.bz2 709965 SHA256 5e4daee61d89dfdc8c7bf369f81c99845931e337916dc6401e301c5de57ea336 SHA512 30deabb02a5bde51c463e3e89988d850cff51596c2e72733a064245dec152ea46317eea79550dbe82a7a0d327ec0bcfbd9474ff8a902507392df0da00df6397f WHIRLPOOL a6b6aa1265f3e7e78c6e8012f0cb8098e0727e77bfcf8165866e876b41c18648711c82d87750c081cc49e89b85be03ef3b420a2df25269e2ce070181af308ec6
 DIST refpolicy-2.20170805.tar.bz2 740430 SHA256 045709f5e44199f402149b31c6aab9666bdb1540a5c5ed0312a46c90dedfa52d SHA512 dbb6809b028ae75296ad26d5997cc21d835c49555a0e37957cb39b36b144af6e817320073a29247448eba1876ab9e29d3956ff4456f1542b66ba38af459ec586 WHIRLPOOL 94320a34f0ae6a7a2c67ef335b9fc2007b55fdac282d6b602979571b8f47049535a8d0d1d1310e420f94aefaf95da065c398d4f724a73c74df52e8ef95209219
-EBUILD selinux-cvs-2.20170204-r1.ebuild 425 SHA256 b67d846b7ac28d290f7dd7fa7d0093194ca4f4b992c40ff9683ccd1fb7718b9e SHA512 99557f9915629ac05f29e8fcb14c34fc85cbf6c9ab3b0e0f10163d2bcf0d86da93210edda81475f2c613f144a29d67e068ce981a49a30b7fb4bdc5c14c4481e9 WHIRLPOOL 0a1dc8eee2328026d4458942e87c67485b33e2c1955e8232554e026b023f3467bd17e75b6fc2c2f472c8e18445c48263ea9fe4ffc895ce56a0473c8a09f6ae55
-EBUILD selinux-cvs-2.20170204-r2.ebuild 423 SHA256 bb4b8954d98141b2365f1cee022692b47fc84e35f89ff91029b8b77be305ffaf SHA512 192c9e66428033c80247b8e2db2803b0f16addce9397ad79b95d10ba2f4adf49b185e6ef526378744afc4b83582a09a18eaeabae075b0fa3dd508cfead4f613b WHIRLPOOL d9390c2ee251ff5bf5b9bc544e4d60da1b73ff1653917184b30d8fcc8ad21373c83838ee45e16b2c89ef40ee53d3a41806990f6648c839dcc18f2af0a1a16bba
-EBUILD selinux-cvs-2.20170204-r3.ebuild 423 SHA256 bb4b8954d98141b2365f1cee022692b47fc84e35f89ff91029b8b77be305ffaf SHA512 192c9e66428033c80247b8e2db2803b0f16addce9397ad79b95d10ba2f4adf49b185e6ef526378744afc4b83582a09a18eaeabae075b0fa3dd508cfead4f613b WHIRLPOOL d9390c2ee251ff5bf5b9bc544e4d60da1b73ff1653917184b30d8fcc8ad21373c83838ee45e16b2c89ef40ee53d3a41806990f6648c839dcc18f2af0a1a16bba
-EBUILD selinux-cvs-2.20170204-r4.ebuild 423 SHA256 bb4b8954d98141b2365f1cee022692b47fc84e35f89ff91029b8b77be305ffaf SHA512 192c9e66428033c80247b8e2db2803b0f16addce9397ad79b95d10ba2f4adf49b185e6ef526378744afc4b83582a09a18eaeabae075b0fa3dd508cfead4f613b WHIRLPOOL d9390c2ee251ff5bf5b9bc544e4d60da1b73ff1653917184b30d8fcc8ad21373c83838ee45e16b2c89ef40ee53d3a41806990f6648c839dcc18f2af0a1a16bba
-EBUILD selinux-cvs-2.20170805-r2.ebuild 423 SHA256 bb4b8954d98141b2365f1cee022692b47fc84e35f89ff91029b8b77be305ffaf SHA512 192c9e66428033c80247b8e2db2803b0f16addce9397ad79b95d10ba2f4adf49b185e6ef526378744afc4b83582a09a18eaeabae075b0fa3dd508cfead4f613b WHIRLPOOL d9390c2ee251ff5bf5b9bc544e4d60da1b73ff1653917184b30d8fcc8ad21373c83838ee45e16b2c89ef40ee53d3a41806990f6648c839dcc18f2af0a1a16bba
-EBUILD selinux-cvs-9999.ebuild 425 SHA256 b67d846b7ac28d290f7dd7fa7d0093194ca4f4b992c40ff9683ccd1fb7718b9e SHA512 99557f9915629ac05f29e8fcb14c34fc85cbf6c9ab3b0e0f10163d2bcf0d86da93210edda81475f2c613f144a29d67e068ce981a49a30b7fb4bdc5c14c4481e9 WHIRLPOOL 0a1dc8eee2328026d4458942e87c67485b33e2c1955e8232554e026b023f3467bd17e75b6fc2c2f472c8e18445c48263ea9fe4ffc895ce56a0473c8a09f6ae55
+EBUILD selinux-cvs-2.20170204-r1.ebuild 426 SHA256 3c1cb736836734a735be939c27d994abc44a0aad33d4774549c8a5464916b5eb SHA512 a77b3e31cee5d5e262a50c0e98a33219d5e3868bb3639fdbe9683ab67d725bb04540a424d0915d83db31031dfbadf7c030ad7ca050ff170988268e7447277fde WHIRLPOOL 76fc380c046d1be568ecf91b0d1a4ff052cbed73fec72c7fa28f961a99c3b2eb5839c030f2261ef651b69ca48785f51c280ff70ad713273d9fe936b5bb84d3bc
+EBUILD selinux-cvs-2.20170204-r2.ebuild 424 SHA256 e605402e3af14a11e0b2428fe6bd84de5531843a9cadeeda4bcacffaf74b6e26 SHA512 32f107944ca64ba946da8922adeadfc79751e6e90efa57df96b6166b0148a1221a9ee36e671d4968d7ab78f5468d7bf01f0a2a065ff124fd3cc7ab1ab12f8c50 WHIRLPOOL a1c4e76b2417446c0d1a834707adc41073366a0de55fe4fc8edece6e620f8d2f63040664d25fc7fce96fdcafaa588b35d12e23418810eb6ecced1dbf5e81153e
+EBUILD selinux-cvs-2.20170204-r3.ebuild 424 SHA256 e605402e3af14a11e0b2428fe6bd84de5531843a9cadeeda4bcacffaf74b6e26 SHA512 32f107944ca64ba946da8922adeadfc79751e6e90efa57df96b6166b0148a1221a9ee36e671d4968d7ab78f5468d7bf01f0a2a065ff124fd3cc7ab1ab12f8c50 WHIRLPOOL a1c4e76b2417446c0d1a834707adc41073366a0de55fe4fc8edece6e620f8d2f63040664d25fc7fce96fdcafaa588b35d12e23418810eb6ecced1dbf5e81153e
+EBUILD selinux-cvs-2.20170204-r4.ebuild 424 SHA256 e605402e3af14a11e0b2428fe6bd84de5531843a9cadeeda4bcacffaf74b6e26 SHA512 32f107944ca64ba946da8922adeadfc79751e6e90efa57df96b6166b0148a1221a9ee36e671d4968d7ab78f5468d7bf01f0a2a065ff124fd3cc7ab1ab12f8c50 WHIRLPOOL a1c4e76b2417446c0d1a834707adc41073366a0de55fe4fc8edece6e620f8d2f63040664d25fc7fce96fdcafaa588b35d12e23418810eb6ecced1dbf5e81153e
+EBUILD selinux-cvs-2.20170805-r2.ebuild 424 SHA256 e605402e3af14a11e0b2428fe6bd84de5531843a9cadeeda4bcacffaf74b6e26 SHA512 32f107944ca64ba946da8922adeadfc79751e6e90efa57df96b6166b0148a1221a9ee36e671d4968d7ab78f5468d7bf01f0a2a065ff124fd3cc7ab1ab12f8c50 WHIRLPOOL a1c4e76b2417446c0d1a834707adc41073366a0de55fe4fc8edece6e620f8d2f63040664d25fc7fce96fdcafaa588b35d12e23418810eb6ecced1dbf5e81153e
+EBUILD selinux-cvs-2.20170805-r3.ebuild 426 SHA256 3c1cb736836734a735be939c27d994abc44a0aad33d4774549c8a5464916b5eb SHA512 a77b3e31cee5d5e262a50c0e98a33219d5e3868bb3639fdbe9683ab67d725bb04540a424d0915d83db31031dfbadf7c030ad7ca050ff170988268e7447277fde WHIRLPOOL 76fc380c046d1be568ecf91b0d1a4ff052cbed73fec72c7fa28f961a99c3b2eb5839c030f2261ef651b69ca48785f51c280ff70ad713273d9fe936b5bb84d3bc
+EBUILD selinux-cvs-9999.ebuild 426 SHA256 3c1cb736836734a735be939c27d994abc44a0aad33d4774549c8a5464916b5eb SHA512 a77b3e31cee5d5e262a50c0e98a33219d5e3868bb3639fdbe9683ab67d725bb04540a424d0915d83db31031dfbadf7c030ad7ca050ff170988268e7447277fde WHIRLPOOL 76fc380c046d1be568ecf91b0d1a4ff052cbed73fec72c7fa28f961a99c3b2eb5839c030f2261ef651b69ca48785f51c280ff70ad713273d9fe936b5bb84d3bc
 MISC ChangeLog 10295 SHA256 cdbc59ebec08720049ed408aff83fbda66a5c3d2afc4fd486412a2f8f7fc9965 SHA512 7292f0ad815bc55234ebf3aecaa8ccacc2c1425b3e0d5f9347f9dadc9a91f31947a93acf079483ddc35e5d3b8225ea3f76f6c97032273d7947919ffb09745c69 WHIRLPOOL ffb9ee916ab144e42dda416fb54c67aa5cd541140f9efdece3611cd4a28d26829fbd89d94faacf3769331b3fd8ace26b9f8678619db2e099569fedafe1ed2ca9
 MISC ChangeLog-2015 9806 SHA256 a7f45c1c53004671566de9dc02a3dc96fd0e1daf33d7e02db3b3988bd6893399 SHA512 998d3f539f74d20ca46d83389d549c6409b05936b71f16f36288d4cf93354bcd129a5d298162ff63595367341e2ceb61dacb7a7699ae9c4d21c90794220c13ec WHIRLPOOL b3b91a51e499ce62c86fbd92f07bf891d871e1bd818e477adfaffa8936e30fdd5bf012b5ba2f209da0f285c623544063a2cf855f4aca987d8619e1a73ba3737e
 MISC metadata.xml 313 SHA256 77282a43c9025ce0e16dcd0b7fbdf1f015b79a79ab302229124408b2fbc5c69f SHA512 6d7001e06d985c2395e10c6272950a5bc76279c60ad5ca17d54fbe12e449c2b6485fc5d3e88775f4ab2a3d9c5ccbc37f412a783a7841ba54901f34a520f8c5b1 WHIRLPOOL 4085082105ebf4cd6e56a12beaf51726d64ec6424453c31e316e5936aa0687eccc5620435d28fd1001b1693651ec785ec51ba55f8a4f9367fd43442be323aef2
diff --git a/sec-policy/selinux-cvs/selinux-cvs-2.20170204-r1.ebuild b/sec-policy/selinux-cvs/selinux-cvs-2.20170204-r1.ebuild
index d6b511781ba5..5dfc34680758 100644
--- a/sec-policy/selinux-cvs/selinux-cvs-2.20170204-r1.ebuild
+++ b/sec-policy/selinux-cvs/selinux-cvs-2.20170204-r1.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-cvs/selinux-cvs-2.20170204-r2.ebuild b/sec-policy/selinux-cvs/selinux-cvs-2.20170204-r2.ebuild
index 0792f31f58d6..01387904e784 100644
--- a/sec-policy/selinux-cvs/selinux-cvs-2.20170204-r2.ebuild
+++ b/sec-policy/selinux-cvs/selinux-cvs-2.20170204-r2.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-cvs/selinux-cvs-2.20170204-r3.ebuild b/sec-policy/selinux-cvs/selinux-cvs-2.20170204-r3.ebuild
index 0792f31f58d6..01387904e784 100644
--- a/sec-policy/selinux-cvs/selinux-cvs-2.20170204-r3.ebuild
+++ b/sec-policy/selinux-cvs/selinux-cvs-2.20170204-r3.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-cvs/selinux-cvs-2.20170204-r4.ebuild b/sec-policy/selinux-cvs/selinux-cvs-2.20170204-r4.ebuild
index 0792f31f58d6..01387904e784 100644
--- a/sec-policy/selinux-cvs/selinux-cvs-2.20170204-r4.ebuild
+++ b/sec-policy/selinux-cvs/selinux-cvs-2.20170204-r4.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-cvs/selinux-cvs-2.20170805-r2.ebuild b/sec-policy/selinux-cvs/selinux-cvs-2.20170805-r2.ebuild
index 0792f31f58d6..01387904e784 100644
--- a/sec-policy/selinux-cvs/selinux-cvs-2.20170805-r2.ebuild
+++ b/sec-policy/selinux-cvs/selinux-cvs-2.20170805-r2.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""
diff --git a/sec-policy/selinux-cvs/selinux-cvs-2.20170805-r3.ebuild b/sec-policy/selinux-cvs/selinux-cvs-2.20170805-r3.ebuild
new file mode 100644
index 000000000000..5dfc34680758
--- /dev/null
+++ b/sec-policy/selinux-cvs/selinux-cvs-2.20170805-r3.ebuild
@@ -0,0 +1,23 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+IUSE=""
+MODS="cvs"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for cvs"
+
+if [[ ${PV} != 9999* ]] ; then
+	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
+fi
+DEPEND="${DEPEND}
+	sec-policy/selinux-apache
+	sec-policy/selinux-inetd
+"
+RDEPEND="${RDEPEND}
+	sec-policy/selinux-apache
+	sec-policy/selinux-inetd
+"
diff --git a/sec-policy/selinux-cvs/selinux-cvs-9999.ebuild b/sec-policy/selinux-cvs/selinux-cvs-9999.ebuild
index d6b511781ba5..5dfc34680758 100644
--- a/sec-policy/selinux-cvs/selinux-cvs-9999.ebuild
+++ b/sec-policy/selinux-cvs/selinux-cvs-9999.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 IUSE=""