gentoo resync : 10.11.2017

8 files changed, 35 insertions, 6 deletions

diff --git a/sec-policy/selinux-apcupsd/Manifest b/sec-policy/selinux-apcupsd/Manifest
index 32984997ef4c..bca8708aad95 100644
--- a/sec-policy/selinux-apcupsd/Manifest
+++ b/sec-policy/selinux-apcupsd/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-apcupsd-2.20170204-r1.ebuild 381 SHA256 884cd852490ac8e085ceb24eaac1ab7b7bb9824ed463a4c762fece10ee93e144 SHA512 5d01e7db4d76680ae335a0e694ea63d8c5b1321359ebaf45fa0f60e59ac0823af2d4aa81069bb4a2c4a9eceef69f087cf41d4039442533a57aafada347509341 WHIRLPOOL aa02b489af6f397aa76050328af9110c3c64fd0fe2f8605c55beef24154b1b32cd47fe4c9d394f10404ee900567a2dbecca0de49fca1e0b85a10a25df6d336bc
-EBUILD selinux-apcupsd-2.20170204-r2.ebuild 379 SHA256 036c6c8c0147c28cce28798e2f287c9be9a724126f97704ac3e7d3799e1dca6c SHA512 f886a4d4e6cd64a784de9899feaa3d87baa97e65cff97ef4c8e9e26260c7c6a65fa5464f978d6387e69890d92c31e6ec7ac99ebf3af4ac9162c0dde7e1d534dc WHIRLPOOL 29d42d275f8e57a91476264e391d01a1b794ad33a2b1b04d1f8ff139dc01977a63bddef9e9db416c71e370bc367929aab23a3e3255549b940408f9d95e3f518b
-EBUILD selinux-apcupsd-2.20170204-r3.ebuild 379 SHA256 036c6c8c0147c28cce28798e2f287c9be9a724126f97704ac3e7d3799e1dca6c SHA512 f886a4d4e6cd64a784de9899feaa3d87baa97e65cff97ef4c8e9e26260c7c6a65fa5464f978d6387e69890d92c31e6ec7ac99ebf3af4ac9162c0dde7e1d534dc WHIRLPOOL 29d42d275f8e57a91476264e391d01a1b794ad33a2b1b04d1f8ff139dc01977a63bddef9e9db416c71e370bc367929aab23a3e3255549b940408f9d95e3f518b
-EBUILD selinux-apcupsd-2.20170204-r4.ebuild 379 SHA256 036c6c8c0147c28cce28798e2f287c9be9a724126f97704ac3e7d3799e1dca6c SHA512 f886a4d4e6cd64a784de9899feaa3d87baa97e65cff97ef4c8e9e26260c7c6a65fa5464f978d6387e69890d92c31e6ec7ac99ebf3af4ac9162c0dde7e1d534dc WHIRLPOOL 29d42d275f8e57a91476264e391d01a1b794ad33a2b1b04d1f8ff139dc01977a63bddef9e9db416c71e370bc367929aab23a3e3255549b940408f9d95e3f518b
-EBUILD selinux-apcupsd-2.20170805-r2.ebuild 379 SHA256 036c6c8c0147c28cce28798e2f287c9be9a724126f97704ac3e7d3799e1dca6c SHA512 f886a4d4e6cd64a784de9899feaa3d87baa97e65cff97ef4c8e9e26260c7c6a65fa5464f978d6387e69890d92c31e6ec7ac99ebf3af4ac9162c0dde7e1d534dc WHIRLPOOL 29d42d275f8e57a91476264e391d01a1b794ad33a2b1b04d1f8ff139dc01977a63bddef9e9db416c71e370bc367929aab23a3e3255549b940408f9d95e3f518b
-EBUILD selinux-apcupsd-9999.ebuild 381 SHA256 884cd852490ac8e085ceb24eaac1ab7b7bb9824ed463a4c762fece10ee93e144 SHA512 5d01e7db4d76680ae335a0e694ea63d8c5b1321359ebaf45fa0f60e59ac0823af2d4aa81069bb4a2c4a9eceef69f087cf41d4039442533a57aafada347509341 WHIRLPOOL aa02b489af6f397aa76050328af9110c3c64fd0fe2f8605c55beef24154b1b32cd47fe4c9d394f10404ee900567a2dbecca0de49fca1e0b85a10a25df6d336bc
+EBUILD selinux-apcupsd-2.20170204-r1.ebuild 382 SHA256 09fcca6a8d32061e82040f3063a388a96f1f963d07a0d95b261677f0b33de12f SHA512 80e0949835c0c0b0a514af3cb932c22ff0a78ef7c1284209b91ee94e085edb5f23ea2c71d32c35cfb18013abc9a3b9fc445227e048194241d5f88e423a0244b2 WHIRLPOOL d66c668cf9b15e2b53691f69c12873c3df0610ed8cbad5a93638ddb2ae642b01464920c86d774970606595270acb5f451464d93b70d0b5c3f0eec2618d40dcb2
+EBUILD selinux-apcupsd-2.20170204-r2.ebuild 380 SHA256 eb2bc9059e3a74d54e4ae7327dac1ff42e3cb47e4fadcca3cac9ea222459d768 SHA512 3bde712a9d9e6e07aad57ae2c1f4d856bcf8d52198631b5633724594d27b8c058faa3aedd4446e64768075b49133e1e257ef4f86463413ab58b59b77ce74a513 WHIRLPOOL f37c398b6067f6465f7dabccacec0a9878acd406f5097d64661024e76f7d344d5f3b3f1eafeb931e25a3530404aabf12e8e91f3ffebcfa99c8bf9e0de747e87a
+EBUILD selinux-apcupsd-2.20170204-r3.ebuild 380 SHA256 eb2bc9059e3a74d54e4ae7327dac1ff42e3cb47e4fadcca3cac9ea222459d768 SHA512 3bde712a9d9e6e07aad57ae2c1f4d856bcf8d52198631b5633724594d27b8c058faa3aedd4446e64768075b49133e1e257ef4f86463413ab58b59b77ce74a513 WHIRLPOOL f37c398b6067f6465f7dabccacec0a9878acd406f5097d64661024e76f7d344d5f3b3f1eafeb931e25a3530404aabf12e8e91f3ffebcfa99c8bf9e0de747e87a
+EBUILD selinux-apcupsd-2.20170204-r4.ebuild 380 SHA256 eb2bc9059e3a74d54e4ae7327dac1ff42e3cb47e4fadcca3cac9ea222459d768 SHA512 3bde712a9d9e6e07aad57ae2c1f4d856bcf8d52198631b5633724594d27b8c058faa3aedd4446e64768075b49133e1e257ef4f86463413ab58b59b77ce74a513 WHIRLPOOL f37c398b6067f6465f7dabccacec0a9878acd406f5097d64661024e76f7d344d5f3b3f1eafeb931e25a3530404aabf12e8e91f3ffebcfa99c8bf9e0de747e87a
+EBUILD selinux-apcupsd-2.20170805-r2.ebuild 380 SHA256 eb2bc9059e3a74d54e4ae7327dac1ff42e3cb47e4fadcca3cac9ea222459d768 SHA512 3bde712a9d9e6e07aad57ae2c1f4d856bcf8d52198631b5633724594d27b8c058faa3aedd4446e64768075b49133e1e257ef4f86463413ab58b59b77ce74a513 WHIRLPOOL f37c398b6067f6465f7dabccacec0a9878acd406f5097d64661024e76f7d344d5f3b3f1eafeb931e25a3530404aabf12e8e91f3ffebcfa99c8bf9e0de747e87a
+EBUILD selinux-apcupsd-2.20170805-r3.ebuild 382 SHA256 09fcca6a8d32061e82040f3063a388a96f1f963d07a0d95b261677f0b33de12f SHA512 80e0949835c0c0b0a514af3cb932c22ff0a78ef7c1284209b91ee94e085edb5f23ea2c71d32c35cfb18013abc9a3b9fc445227e048194241d5f88e423a0244b2 WHIRLPOOL d66c668cf9b15e2b53691f69c12873c3df0610ed8cbad5a93638ddb2ae642b01464920c86d774970606595270acb5f451464d93b70d0b5c3f0eec2618d40dcb2
+EBUILD selinux-apcupsd-9999.ebuild 382 SHA256 09fcca6a8d32061e82040f3063a388a96f1f963d07a0d95b261677f0b33de12f SHA512 80e0949835c0c0b0a514af3cb932c22ff0a78ef7c1284209b91ee94e085edb5f23ea2c71d32c35cfb18013abc9a3b9fc445227e048194241d5f88e423a0244b2 WHIRLPOOL d66c668cf9b15e2b53691f69c12873c3df0610ed8cbad5a93638ddb2ae642b01464920c86d774970606595270acb5f451464d93b70d0b5c3f0eec2618d40dcb2
 MISC ChangeLog 10687 SHA256 954e580b5a9440c5206ef330d2827231d6ff6ceb77a731d6f03ffe9b9970110e SHA512 1dbbd86ff314781f56bdae49d987e7a958cb0715d38385acc216d555def801ab3e0dc71206ba268e1de09dbb6d3b335b724cf679d8d3bd425f6de27150642fa3 WHIRLPOOL b6ecff95672722a88fd38d6cb0332b58b47daa15fc4f8ebb02bb2ac5bf1f79c7ef4a2b5669998dafb9efaf6194045cca12bbb95e8de0a1fdbffd49f6b9d8897f
 MISC ChangeLog-2015 10219 SHA256 0bb2330b0e78968acb30c8619065ab1980f0ad957bed9b6dbe1893f208ff36a5 SHA512 2f611f34647b7a91855013a544873a1363b2907af2ebe1f76ab16e610a8caba44b92b989677a8b9acc5d594eddb644ad2350543432f3788d766b76acb5a6fad4 WHIRLPOOL a7eda08f30f07f9dd380b0e513106e3d4fd05067b5bb2e455961c158d529ac503bbf09d5e6133cdf885d4e4ad59a803046a37b7c10664291542284029c2febcb
 MISC metadata.xml 317 SHA256 d3209025070f628df9bc1d0456d90fa68c9b298d0702fd993a43ce9712649357 SHA512 60b1efe0a05b69802dc9be53e4420921416667159ec6a0803a119c1ef4524cf9178ef60521f1f5a12c62c3d405ca3fc145f71aedbffa14190933614091379a01 WHIRLPOOL ffed7126c69c0d5541d5c459b587312ea8b5611a815b6526b7fa10e4dc0e303ddf3f794ea27685a4b3328b4bd66a21b01f653071be5e3c92bc7a1077d57f9ef5
diff --git a/sec-policy/selinux-apcupsd/selinux-apcupsd-2.20170204-r1.ebuild b/sec-policy/selinux-apcupsd/selinux-apcupsd-2.20170204-r1.ebuild
index b273b570e892..44ec399af7be 100644
--- a/sec-policy/selinux-apcupsd/selinux-apcupsd-2.20170204-r1.ebuild
+++ b/sec-policy/selinux-apcupsd/selinux-apcupsd-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-apcupsd/selinux-apcupsd-2.20170204-r2.ebuild b/sec-policy/selinux-apcupsd/selinux-apcupsd-2.20170204-r2.ebuild
index 82a76c3d7cb8..18f55a8b17ad 100644
--- a/sec-policy/selinux-apcupsd/selinux-apcupsd-2.20170204-r2.ebuild
+++ b/sec-policy/selinux-apcupsd/selinux-apcupsd-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-apcupsd/selinux-apcupsd-2.20170204-r3.ebuild b/sec-policy/selinux-apcupsd/selinux-apcupsd-2.20170204-r3.ebuild
index 82a76c3d7cb8..18f55a8b17ad 100644
--- a/sec-policy/selinux-apcupsd/selinux-apcupsd-2.20170204-r3.ebuild
+++ b/sec-policy/selinux-apcupsd/selinux-apcupsd-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-apcupsd/selinux-apcupsd-2.20170204-r4.ebuild b/sec-policy/selinux-apcupsd/selinux-apcupsd-2.20170204-r4.ebuild
index 82a76c3d7cb8..18f55a8b17ad 100644
--- a/sec-policy/selinux-apcupsd/selinux-apcupsd-2.20170204-r4.ebuild
+++ b/sec-policy/selinux-apcupsd/selinux-apcupsd-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-apcupsd/selinux-apcupsd-2.20170805-r2.ebuild b/sec-policy/selinux-apcupsd/selinux-apcupsd-2.20170805-r2.ebuild
index 82a76c3d7cb8..18f55a8b17ad 100644
--- a/sec-policy/selinux-apcupsd/selinux-apcupsd-2.20170805-r2.ebuild
+++ b/sec-policy/selinux-apcupsd/selinux-apcupsd-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-apcupsd/selinux-apcupsd-2.20170805-r3.ebuild b/sec-policy/selinux-apcupsd/selinux-apcupsd-2.20170805-r3.ebuild
new file mode 100644
index 000000000000..44ec399af7be
--- /dev/null
+++ b/sec-policy/selinux-apcupsd/selinux-apcupsd-2.20170805-r3.ebuild
@@ -0,0 +1,21 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+IUSE=""
+MODS="apcupsd"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for apcupsd"
+
+if [[ ${PV} != 9999* ]] ; then
+	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
+fi
+DEPEND="${DEPEND}
+	sec-policy/selinux-apache
+"
+RDEPEND="${RDEPEND}
+	sec-policy/selinux-apache
+"
diff --git a/sec-policy/selinux-apcupsd/selinux-apcupsd-9999.ebuild b/sec-policy/selinux-apcupsd/selinux-apcupsd-9999.ebuild
index b273b570e892..44ec399af7be 100644
--- a/sec-policy/selinux-apcupsd/selinux-apcupsd-9999.ebuild
+++ b/sec-policy/selinux-apcupsd/selinux-apcupsd-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=""