gentoo resync : 21.09.2018

5 files changed, 12 insertions, 10 deletions

diff --git a/dev-lang/php/Manifest b/dev-lang/php/Manifest
index 3d2df313fc1a..b1de6b3a4f39 100644
--- a/dev-lang/php/Manifest
+++ b/dev-lang/php/Manifest
@@ -15,11 +15,11 @@ DIST php-7.1.22.tar.xz 12227848 BLAKE2B 72fab94b1c7ecfd3479f6d6c9a76a9d8813f7789
 DIST php-7.2.10.tar.xz 12160864 BLAKE2B f1959a00622c1bd11fa87c61d152c802b307f0b9e89b51ed86b40086cda03eeb6652d47b59df8cc7c9b4e79ab687ae1292b978f453e9f07ac352d209b64c62d8 SHA512 aa90fce17034b2649012d66461626ae74c21ea938b1c71c7eb12419e562c641b432df87a7e900c245ad28df39624cf64a1b2f8ffb123608d94cd35e41f09c0fe
 DIST php-7.3.0RC1.tar.xz 11920364 BLAKE2B 82a7fa5359c4fb3e6b66249d1c45dad5275b251261d33d07d5c5e86360c1a32affa3d80145802d8dbf391f253d895d4107affcd773f1637c373240ce854606e3 SHA512 40f8fe3367fb42fe739888d1f2335e6326a7ca35c33b8ebc8de59fd5d35a2a7ab6866a6bd837b8a0eb41b89d3c7c3a49332850ff2e9a2b9d244665da91422725
 EBUILD php-5.6.36.ebuild 22792 BLAKE2B 0f22bd52f4acb9d69803120c63e3ef3418af89810e98da7b034d4e959b89da3e25e82a579127b427ccb533869e459cc59cbbd7069fa21ba7e05656be3bbb7b65 SHA512 097f033cfb430f5a57258319127c7604888a5026710830a0845d1328be729705834069235a45e326dde4277de6cf0001214b101efa1cb1f5ab7e27be30b2557e
-EBUILD php-5.6.38.ebuild 22805 BLAKE2B 358ead6edbe813ac1c5122813c996b804deaa5031dadfca9bfe9ee5b3e649addba24e8364895e469cc14e6edd3a5959411e30f19cd4fa42cdbcca9cb9bc34cbc SHA512 2dd8c37ecffefcfca9fd182051d35d712d49751d2e0ddfc5d4d42c06bc678e1bc91bc82fdaa377b7daf53115bfb25d90c04addae61f326f70a0f08a4bc45fa95
+EBUILD php-5.6.38.ebuild 22800 BLAKE2B 233ee19e2856697b9791ad447756cc6943ca517d826af700559b6d2f6986a185489c04ea0274456ef522769ecb41f5bd22f70cbf52baa6c98be99971cd164ace SHA512 bf7263668ce842da53bcde090b97cc7f635396a3324417e127683ca81de220da4c6485142b278ea8954f8e618229c3c29752f3ce559eade93a36ac20e01fa622
 EBUILD php-7.0.30.ebuild 22002 BLAKE2B 5766fabda46f0faf07cfd5121a32af05a7cd51f5ef694c083fd737612bd7575026bfdbaba1a5bf109c316c46d38a233658b75f79ba3622f7ed0139f6e2a4f397 SHA512 535391d50959e2e4f3094f2f6a7b0bc75810c4f5695bca319ed2fc7df4273d9f9e01feb1625992938b84ffd04ef350cf2dfe49e4e83b2dd346af75b79c476f31
-EBUILD php-7.0.32.ebuild 22015 BLAKE2B 06cd34d7df4444bb04daf8c5266e3932acbe40923dabf2fe901537bcd292810d1a39dda09fccd1a32a61a407c4ecd283cb8c2b3912c9c30f8321509fc35ff3f6 SHA512 2793320e840f1f6c86738d541c01903a0546973914b865c471114bf1213bbf491d90053a753691d165a617645d9bcd49a205465ad35e3ae6bdc9550fc76d96cc
+EBUILD php-7.0.32.ebuild 22010 BLAKE2B 3a1c1893aa13237794234bc936d1ad599f31ce47c17235eb6b659592cf156c713b474d0ed8e61924926a189e322d720775d78f833eda2c235da1e483a564625c SHA512 9d1d9e8e6bc3e4f0827610a9fd4b9407d8966c88599a1cee1be0f71648c8284320e250b29df2abca56654683a960b1c905d25b63f6dc2a4205051144abe96772
 EBUILD php-7.1.18.ebuild 21845 BLAKE2B 3752df2f5c1e9123e1906c315e07de6142cf4e37b6ae48b24af4858ec1491d4934daab688c747ffc06f6a67e54fa7fd80674a272fbf45bc2b56e0f2ba58bfbfd SHA512 4dccb83f1449520a0f4dfe78605ec1b0fcfaee46b67c32b8bada1811692042081f3c1364adecd077dec940a26cfab8bd4175b836d6a5fb5bf9893e546fc1eff2
-EBUILD php-7.1.22.ebuild 21699 BLAKE2B 377f0d5fd482c1be10bd1d9efd7b4f243e1b0347c778b39ce01ff1e8fc9ffabc64481cb9d2227d4865091fae06eebc8d34a0e233ea2f6aae27d1768546fb313d SHA512 9cd00aeee51074c9c07d401dc9bf6065a76b9a7742bca861cd22dd7c055d0123e1e9aa8d64149cd66cecaeaecb8777e90160088a9f88889d8db8dd44747811a0
-EBUILD php-7.2.10.ebuild 22230 BLAKE2B 5cf6a9b883af9a8a238bb56e1061898fede1ec2beee32c1bf30e19cac3ca63c1eb22d71b3920bec7e378fcd6db6aa133548be1263491df7a396cd625833b9300 SHA512 4d17aa5dae81ee510d2b3bba4bfd8965c1914d370f2d89b1a7ce99619fd2fcedb3029b23b6ed26d074e20b326b4fae207a8449218bba8088dd45da72ed62e242
+EBUILD php-7.1.22.ebuild 21717 BLAKE2B 4280bc61498f2f75c0024055096d0a2f4e7450ddf1187a7a9d3021b54e3d891f499549891f5aaea61066f6ce8442ba1c2aa266a79298430cd00c27e5763ebe3a SHA512 1b6efbc0c77efcc0a0752aa0d3b1b139f642603ab181aa6f2d1c371cde385c1cc9965e5cd6989cc9cfaa2e8dcce4d0fc0d43956c8c57acc83763c9e8b65ca68f
+EBUILD php-7.2.10.ebuild 22248 BLAKE2B 4a8ad9022a4ab82ecf18743aaa16d41e659d1c79419031b351aaa07e2d2945e68bd239a8bb5c225086e739bc5e9f0ffb57014731f966c044dbf32a29b6fb999a SHA512 75b5d9dff3f065cd5aaf32553dab0d5ebbc748b86b5650285f78235fc9be1937a367c7eb2ad3c056542fd22bbe13d605aa389e447b44f46ece81a84815e451eb
 EBUILD php-7.3.0_rc1.ebuild 22325 BLAKE2B 629c41eb9f5184480f90f4f755eec426e12426904b0c63fe4f7a4cc51534a010f1fd679e1d95d1c1ebd1ac521a1bfc7cad2919fc3451196a18483e585ac6e92c SHA512 4c7c0e81790e28d149a265fd00c5f0d5b661c91fd9d1ae315041e6792bd4cf41380ce5d6540f52d3b5e9b9ab32b4d505c56178fef0172a68dd43ba340193ea08
 MISC metadata.xml 2577 BLAKE2B 9b15d6073181a5f5ff7b00ef8b68d24c7ea8763171ae84895ebc4a6925f589d2a02e4e29116c2741b3502b35d32aa58e7ed909e144c0e694f8cce5b4d26ecd3b SHA512 14e6daa693325b8a27157cff22d0b0cae9d89e4dada775f39188f7f36546b78a8b19efedb2f7b6f64ee1375bf29d3af32a8f7d6e7bf0d04cf2a7241abd154afa
diff --git a/dev-lang/php/php-5.6.38.ebuild b/dev-lang/php/php-5.6.38.ebuild
index 23d55d55250e..9cc15002a71f 100644
--- a/dev-lang/php/php-5.6.38.ebuild
+++ b/dev-lang/php/php-5.6.38.ebuild
@@ -18,7 +18,7 @@ LICENSE="PHP-3.01
 	unicode? ( BSD-2 LGPL-2.1 )"
 
 SLOT="$(ver_cut 1-2)"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
 
 # We can build the following SAPIs in the given order
 SAPIS="embed cli cgi fpm apache2"
diff --git a/dev-lang/php/php-7.0.32.ebuild b/dev-lang/php/php-7.0.32.ebuild
index 9494430e42d7..015758e60b46 100644
--- a/dev-lang/php/php-7.0.32.ebuild
+++ b/dev-lang/php/php-7.0.32.ebuild
@@ -18,7 +18,7 @@ LICENSE="PHP-3.01
 	unicode? ( BSD-2 LGPL-2.1 )"
 
 SLOT="$(ver_cut 1-2)"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
 
 # We can build the following SAPIs in the given order
 SAPIS="embed cli cgi fpm apache2 phpdbg"
diff --git a/dev-lang/php/php-7.1.22.ebuild b/dev-lang/php/php-7.1.22.ebuild
index b850d63d76eb..feba2bb1708a 100644
--- a/dev-lang/php/php-7.1.22.ebuild
+++ b/dev-lang/php/php-7.1.22.ebuild
@@ -18,7 +18,7 @@ LICENSE="PHP-3.01
 	unicode? ( BSD-2 LGPL-2.1 )"
 
 SLOT="$(ver_cut 1-2)"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
 
 # We can build the following SAPIs in the given order
 SAPIS="embed cli cgi fpm apache2 phpdbg"
@@ -142,7 +142,8 @@ REQUIRED_USE="
 	readline? ( !libedit )
 	recode? ( !imap !mysqli !mysql )
 	session-mm? ( session !threads )
-	mysql? ( || ( mysqli pdo ) )
+	mysql? ( hash || ( mysqli pdo ) )
+	mysqli? ( hash )
 "
 PATCHES=(
 	"${FILESDIR}/php-freetype-2.9.1.patch"
diff --git a/dev-lang/php/php-7.2.10.ebuild b/dev-lang/php/php-7.2.10.ebuild
index 0d4fcd3334a6..8056b502a1f4 100644
--- a/dev-lang/php/php-7.2.10.ebuild
+++ b/dev-lang/php/php-7.2.10.ebuild
@@ -18,7 +18,7 @@ LICENSE="PHP-3.01
 	unicode? ( BSD-2 LGPL-2.1 )"
 
 SLOT="$(ver_cut 1-2)"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
 
 # We can build the following SAPIs in the given order
 SAPIS="embed cli cgi fpm apache2 phpdbg"
@@ -146,7 +146,8 @@ REQUIRED_USE="
 	readline? ( !libedit )
 	recode? ( !imap !mysqli !mysql )
 	session-mm? ( session !threads )
-	mysql? ( || ( mysqli pdo ) )
+	mysql? ( hash || ( mysqli pdo ) )
+	mysqli? ( hash )
 	zip-encryption? ( zip )
 "
 PATCHES=(