gentoo resync : 05.04.2018

11 files changed, 60 insertions, 13 deletions

diff --git a/dev-lang/php/Manifest b/dev-lang/php/Manifest
index fc492d597d0b..c7b5d44544e7 100644
--- a/dev-lang/php/Manifest
+++ b/dev-lang/php/Manifest
@@ -1,4 +1,5 @@
 AUX 20php5-envd 145 BLAKE2B 06476b8fc04d1e835496b417ac752f0834ddbe8584e4fddc6db0aa5e6845b82cdea0a1355c77125375dcdd0f0a3c19de5f3a8a64ee93950f96c437a16f971567 SHA512 581aa86479e3cd584ee1bc6dc6d4a135fe8ec343fe5519566d728d81f7018cfb23658bd0c0368951d380982c75adbb4f45acf3c146868aaf4e4ec8e9f2fad1ce
+AUX mbstring-oniguruma-6.8.patch 1488 BLAKE2B 181aacdd5fc01e5b11246d624cd88a5d3184c00343abb8a9e36d1e224dce185a81521c0498d562e51768e4c035806f007f9cd5ed930b7abe2a3da2e5b519f5b3 SHA512 5a3334ca98da9ac22be67021e4e859c89826aec8393d4b56c4e52336a5fc689acd2579ff44ac984a40711ccaf917a810264b07a0071f8161da18e2bffd3d0c05
 AUX php-5.6-no-bison-warnings.patch 1428 BLAKE2B d37bc7a1ae803aa4a14d32f0ca5613b7bc82610248d6de5ef7b6078fdcfa944cd1c245aa919137ff0d6968c8621b5acf2638386307c46fdbb8c98eba991eb674 SHA512 8f751c638c833d535e022434cd8ace5c175703bf61dfab7bea3e52d9419700e2b85c4cca40da9ab6056e8fd9c0bc1fab55810bb1193bed14ce0a50ce653fe62b
 AUX php-fpm_at-simple.service 316 BLAKE2B 0ba10f3e3b004fbf14956e1e4f04f59b8a127e6717fe6b92c09b9f931033a11551c75fbbee9010f6b694c5a8758ca0eec9eed457ae304ba0dea8f2c256c3b8d4 SHA512 7367a3f8d3874f8e0c76f331ba613a0250db02f60ad9f87affaf448dcb5bc34bcecb91d88f415764a12b24b46ae3d1b738a002af9f77a4b707e916e83a0021fd
 AUX php-fpm_at.service 317 BLAKE2B f13fc38fcc0575a8517ee8d07b120efda37eabd2355061d0fdc303604c6b02ad42d7301180d86c977d5e585f5dd685343c592e37a6e0f44933707be79e0b77e0 SHA512 27982f9e2d958bfa75c89c7d3531e48d17fc388b1cdcbc8e09051b236b1184ee2baabdfcc567c19d9fcd067d4b3b86f171015616d8da42fccdabd89432d865e8
@@ -15,13 +16,13 @@ DIST php-7.1.16.tar.xz 12211512 BLAKE2B bf242e2438b2dc363368a9ef4478349a291f4834
 DIST php-7.2.4.tar.xz 12031892 BLAKE2B f76b3ccbfed4d309639ac5e35a12aa70a194f8cecde98634d7bff9123eb45ff3a4f0b3297149a44357bbc3287a9a3c1393d86b12bd53f38ff844db9498ee3452 SHA512 d1d0720f0d4bb28f7ce0ec7c859b14c1e74e9d0e7c73de6988d5ce737d7ccb7308c0a7a2651ee012c630be2cd53e6531505df0a03f0efbb6359176b446982244
 EBUILD php-5.6.33.ebuild 22554 BLAKE2B 0ab011b206772d7d83ee135cadcf0a9d304f29d6ce78fa0bbe7779d13cc1205287033878870810240996de89c519b805da989babcab926a2285e16e33d0352a7 SHA512 27eef42a39637986fe63823cb387e5d6ec481776baaa15ee51009f265d0fdc4ea0d8120349858f290f9c743091e679f309a190318bd02baf0b87931d0567dc24
 EBUILD php-5.6.34.ebuild 22657 BLAKE2B bdb8c324350730b55b2c9f77b9dd0b9dda01868ff30381d81a8b94562606cd8d9fa3c3eebce9b737ed2a8e02924ce44664f6d0da764ef20caeb9dae1a9321120 SHA512 eef581ed22de47aeaf02662e27422e8fe9bdf971eb99492de82b51906242704b8a119f950a1b468798bee1940b7824caa1ff37dd29752860d529d8742304539c
-EBUILD php-5.6.35.ebuild 22663 BLAKE2B 78398e49c4f999051a67fd34c270a2efd0fb1021da453750a9704e4299552d06fe9d82014d294cba2abf98b394eec1c8682b6d62d0adef481825580951a77b7b SHA512 edd441ed1fdb1d3f45e4f673053c22b70a231ea40e8f7fb4c873b1a5ad91cc40517d333d3e438aa7c40db0340372b9c17e754d388f1e8b46eccde0062d1c31d6
-EBUILD php-7.0.27.ebuild 21616 BLAKE2B 77a83b763bd9f4b6025efcd6463f7147a600b0b5a649dc3c877ac027392e5561485c9d6251f7d5efd9da8fd297cd658d6dce3d66e547c076cc243625e7bebbb4 SHA512 274b6ad641240d21df903f37193591e4461e0f2942c068298228ab4bb9ef35909ffc7be7cf6e82f348ede30cd97dc4ceab72d78934728f3b79a1bff66b06f5ef
-EBUILD php-7.0.28.ebuild 21719 BLAKE2B 1fcbf1041d98c433ea9315d664877f86595db3b7c60445319ff25b6960e9272ad85baabb7288a91b09befed49346346f7ec20af5a0646330dcd95ba7db9d2ebd SHA512 f0bcc0b53ea041a266b6779f620aa1d30ccc0f41137e33484965867212baa831972a123d39a04f5867e0f9db06093197f2ce237add3bfb2bb52b3265d0254089
-EBUILD php-7.0.29.ebuild 21725 BLAKE2B 5af80b163b96a9becfae5ae3fa4d71de4c29aa37fea678cff76f758c9d3b5bbea8a7e6c48ca7dbe0adcdea84156980d4f6b204085c1aa8df6b78aa3e4ea9c313 SHA512 3950d0bc16552a1089ab819b36102e1bbf97a47b69f95519947639bdc2f65999ae127c5b139a20449087ef89d3f10d716f2126576c96e3ade82a1a047809189b
-EBUILD php-7.1.13.ebuild 21482 BLAKE2B a5c1e77bea3cfc4e7020a858c19768073c51a2ebf6d1e3e7a43ad2db87ba317e9dd0f51d88c34cd7a3eb9eae0dd830cd4e347a615b58fc2aba5eaf9163d9a84a SHA512 890a25fc5475d67012dfa757532aa691676dc8e6a98b9d648cbfcabfef4dedb98ca96048ba183945e5f0e91942714191c18aa3120c8917159197a501aa05f378
-EBUILD php-7.1.14.ebuild 21513 BLAKE2B b04b090731e9e50b8cfe26b0763135405e8e1b0a89c89093e5ad78db4b5e3524cf0fd088cbc84be10ccee44436e49172291c17ce63703e952124bfb45cf3bf8f SHA512 0b2ab1f819f794519f46cc8c5897c8cafaec2a557c19fd674bb6828691993726468bbb0baa0ef5e978d3f0d4c8b6d7db83968838d72a28484788e56e5260f559
-EBUILD php-7.1.15.ebuild 21607 BLAKE2B 77eb6bdccb74a2ff441f12d5f8bc0fc52157f6244e8e9a6586f5d776d4c62261ab046570920b5f198e6ac39f2125506b5bd62dada8d19ff5cfa069ca004a2e67 SHA512 9aaa38c8610faa5acf202ba49e8803840b64e5c023135fb782cedb64436b4c5c10436b1aee765b9fb5a8122b9089e3e7df87cde61cc4f49c749059f1ea5ac563
-EBUILD php-7.1.16.ebuild 21613 BLAKE2B fd84672411f2697fd7352729fa032ba867320e7f7ad320875cab65638637ea96943a43a6076287e25cf80844623c6c402fb2cedf5a0e8e9172c3f76d5ca6b18e SHA512 6fce36db211839e81820084033db690d578d6428359081b390c38b0e0ca8b17e6b01930a0c8620f8d787d9284cedf5cc2aedba9a211e596ebf357c7f799c8574
-EBUILD php-7.2.4.ebuild 22144 BLAKE2B a1a4343e37b3cc7a3c3ab83f659335d44941f53681dfc436b8fbc0f0b6c83f44b93f9afc0517a2b34bbf03e7dec4804e2a04a51ca1d18fc3897d2de916f10755 SHA512 06156857b83d4f3744bef4e4d84b255c4d63e9e151507ac34b329982d0cfc1611ed22c24984e9b0c029d116601da15fc6f932842e91bf55e1809f40725032e67
+EBUILD php-5.6.35-r1.ebuild 22666 BLAKE2B 2a9b3ef938a3ac8c77c612e6fff9369c6a5eeba0101a8c2f4ad56cdbaa13c0bc8d41242f889ada677ed4c6234f5a0aace1f8e5683304d4a58309737e30424157 SHA512 01e18631eb77cc7a9b9100bbaa04f12d7e2698929c8df6d6c7f62a83854e679121335f3f8a6288120f27a7dd8721fda7ab0ea8ec25a6337e32552c4534220b6e
+EBUILD php-7.0.27.ebuild 21672 BLAKE2B d7f777112996d44d36b912639eddac4e5d2e415033793e5cb0e6e596f54f6a6922efc6e9b8152a56e5c35220c7bfdcfa0fbb21e98b34ed23dee31ad9499f93ee SHA512 7e9cc8ba4cf70338636b7048199fed99b967a26e540ddf605a28b3fd2053daff701202f822819bb60d528c260d137f4089de60e36460834fc6b716e212c982be
+EBUILD php-7.0.28.ebuild 21775 BLAKE2B 8e893ded094af9a8cbe9955b643765d0581ca6a08ea93667e74eed282e75749cee3a24be33dcd0054a34d3b453e6c79bc7d2f97cc40064e9e58ab39cfb112667 SHA512 ea564f176980bdbe19f9856ebca999c8583a1e88b2f90fa66a0ccdc8b126e7b74656356a18785d754527f9f8041d5c14c1c1588c2ea686e64aa811f7b812690f
+EBUILD php-7.0.29.ebuild 21777 BLAKE2B fcfedcd276ede79174e238ae81cf3fb1d764b26c102832999f82a1dc92e412a09aae3a18d8c6f547bef53b56fc7b7833dca3a1363ff93d18508116ae52c95fe2 SHA512 4af5b62457d3b74c3ffa5fac40acfdaf87b7283b96c3a7729e8a03a5d319bf71e258441ef4a9b18a845c60fbbbf69273f2aee4e886fb0f5219559db34c7ae3fb
+EBUILD php-7.1.13.ebuild 21538 BLAKE2B 69b0b2778758211dfdf3af43178034d0586547406a5e471b88097efe338278d799a1f1fd48c346dc0a10bcc815e3994e90cb901649325933fda1575b46e27037 SHA512 9f41de25f42053c059181833e1ce3a51eb63a0f8bfca48fc1a4bc8216b421832e3afe287e36857c568c5032622db7ff5650b6548cb5dfd91eaf7bb87277597b4
+EBUILD php-7.1.14.ebuild 21569 BLAKE2B 3f3d8d096bdf8de1333ca452751b9d2f5b9c5c5f2642f7e64f269f41e45bf27d1c5aff5f62eb7c5c88c549761855f307f31df7b901944869f6110f7f7ff07bb5 SHA512 36441126cb9b718b8b7ac8387ede6638a5f4068c554f335932613b7386b16871363115a4f9b6ae537be921edff4fa5038cc32514efe33fb33c1da2c457e24f87
+EBUILD php-7.1.15.ebuild 21663 BLAKE2B 5d83402936957d63aa95fce9340d368e162cab764b0aa1a50199fd2ee958ea566888504b9c5f7a2350c160b7cbff844dacc2813f41ea8c1ac518bb6a2af9bb9f SHA512 61ea9cc270fd65deb074e37b62911c3e22b0e66cb0cb00957244846d84373ade491ca2c926d9b58ae5eab68d8f7628aab6f3bec00952e4a58273b005ea582b3d
+EBUILD php-7.1.16.ebuild 21665 BLAKE2B 86a4184bc426e0259e67470659a1235e8c03a4e5bd166187507478bff3e349f5603813d870f90ce51ec2302ac903c92af2f36c01f5dc8b9f562ad46bebac463a SHA512 585862ad8b1d359ae7fb01eb15fa39a98cd05a297fc33c7dae73c7d983438074d49e9cec31e6aef4ddc96b76549f925ae875583c9c0e908360fd0726b3e27e6d
+EBUILD php-7.2.4.ebuild 22200 BLAKE2B a628bd7b910d20fd73693ac9ff9d815df42a119d164302e288af599ddddd0db3e1881be8963c48fa5ddc4bcf64a648b45708d75046de1a5a3881d21ed941ca36 SHA512 f1459160743bcb898836ef1fe7aff440bfc7f92d18e35cb3f71002caeab447f40bd3b8950d58fb58dadaea13f084556fbae136818dc65efe8bdde3dc9a039224
 MISC metadata.xml 2577 BLAKE2B 9b15d6073181a5f5ff7b00ef8b68d24c7ea8763171ae84895ebc4a6925f589d2a02e4e29116c2741b3502b35d32aa58e7ed909e144c0e694f8cce5b4d26ecd3b SHA512 14e6daa693325b8a27157cff22d0b0cae9d89e4dada775f39188f7f36546b78a8b19efedb2f7b6f64ee1375bf29d3af32a8f7d6e7bf0d04cf2a7241abd154afa
diff --git a/dev-lang/php/files/mbstring-oniguruma-6.8.patch b/dev-lang/php/files/mbstring-oniguruma-6.8.patch
new file mode 100644
index 000000000000..c238f88007c5
--- /dev/null
+++ b/dev-lang/php/files/mbstring-oniguruma-6.8.patch
@@ -0,0 +1,30 @@
+From 4072b2787074ee8e247a6639585b49e10c5a55fe Mon Sep 17 00:00:00 2001
+From: "Christoph M. Becker" <cmbecker69@gmx.de>
+Date: Tue, 20 Mar 2018 16:35:39 +0100
+Subject: [PATCH] Fix #76113: mbstring does not build with Oniguruma 6.8.1
+
+As of Oniguruma 6.8.1, the regex structure has been moved from the
+public `oniguruma.h` to the private `regint.h`.  Thus, it is no longer
+possible to directly access the struct's members, and actually, there
+is no need to, since there are respective accessor functions available
+at least of 2.3.1.
+---
+ ext/mbstring/php_mbregex.c | 2 +-
+ 1 file changed, 1 insertions(+), 1 deletion(-)
+
+diff --git a/ext/mbstring/php_mbregex.c b/ext/mbstring/php_mbregex.c
+index a5a6cd0..7a70c63 100644
+--- a/ext/mbstring/php_mbregex.c
++++ b/ext/mbstring/php_mbregex.c
+@@ -452,7 +452,7 @@ static php_mb_regex_t *php_mbregex_compile_pattern(const char *pattern, int patl
+ 	OnigUChar err_str[ONIG_MAX_ERROR_MESSAGE_LEN];
+ 
+ 	rc = zend_hash_str_find_ptr(&MBREX(ht_rc), (char *)pattern, patlen);
+-	if (!rc || rc->options != options || rc->enc != enc || rc->syntax != syntax) {
++	if (!rc || onig_get_options(rc) != options || onig_get_encoding(rc) != enc || onig_get_syntax(rc) != syntax) {
+ 		if ((err_code = onig_new(&retval, (OnigUChar *)pattern, (OnigUChar *)(pattern + patlen), options, enc, syntax, &err_info)) != ONIG_NORMAL) {
+ 			onig_error_code_to_str(err_str, err_code, &err_info);
+ 			php_error_docref(NULL, E_WARNING, "mbregex compile err: %s", err_str);
+-- 
+2.1.4
+
diff --git a/dev-lang/php/php-5.6.35.ebuild b/dev-lang/php/php-5.6.35-r1.ebuild
index 0cbd2484dc08..e42da1d7bd41 100644
--- a/dev-lang/php/php-5.6.35.ebuild
+++ b/dev-lang/php/php-5.6.35-r1.ebuild
@@ -18,7 +18,7 @@ LICENSE="PHP-3.01
 	unicode? ( BSD-2 LGPL-2.1 )"
 
 SLOT="$(get_version_component_range 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"
@@ -113,7 +113,7 @@ COMMON_DEPEND="
 		!gd? (
 			virtual/jpeg:0 media-libs/libpng:0= sys-libs/zlib:0= )
 	)
-	unicode? ( dev-libs/oniguruma:= )
+	unicode? ( <dev-libs/oniguruma-6.8.0:= )
 	vpx? ( media-libs/libvpx:0= )
 	wddx? ( >=dev-libs/libxml2-2.6.8 )
 	xml? ( >=dev-libs/libxml2-2.6.8 )
diff --git a/dev-lang/php/php-7.0.27.ebuild b/dev-lang/php/php-7.0.27.ebuild
index 07116183964a..88d8e93bc686 100644
--- a/dev-lang/php/php-7.0.27.ebuild
+++ b/dev-lang/php/php-7.0.27.ebuild
@@ -163,6 +163,8 @@ REQUIRED_USE="
 	mysql? ( || ( mysqli pdo ) )
 "
 
+PATCHES=( "${FILESDIR}/mbstring-oniguruma-6.8.patch" )
+
 PHP_MV="$(get_major_version)"
 
 php_install_ini() {
diff --git a/dev-lang/php/php-7.0.28.ebuild b/dev-lang/php/php-7.0.28.ebuild
index 889e707ffc32..7964fdcd189c 100644
--- a/dev-lang/php/php-7.0.28.ebuild
+++ b/dev-lang/php/php-7.0.28.ebuild
@@ -163,6 +163,8 @@ REQUIRED_USE="
 	mysql? ( || ( mysqli pdo ) )
 "
 
+PATCHES=( "${FILESDIR}/mbstring-oniguruma-6.8.patch" )
+
 PHP_MV="$(get_major_version)"
 
 php_install_ini() {
diff --git a/dev-lang/php/php-7.0.29.ebuild b/dev-lang/php/php-7.0.29.ebuild
index 45b3218e4f64..d06a323f46bf 100644
--- a/dev-lang/php/php-7.0.29.ebuild
+++ b/dev-lang/php/php-7.0.29.ebuild
@@ -18,7 +18,7 @@ LICENSE="PHP-3.01
 	unicode? ( BSD-2 LGPL-2.1 )"
 
 SLOT="$(get_version_component_range 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"
@@ -163,6 +163,8 @@ REQUIRED_USE="
 	mysql? ( || ( mysqli pdo ) )
 "
 
+PATCHES=( "${FILESDIR}/mbstring-oniguruma-6.8.patch" )
+
 PHP_MV="$(get_major_version)"
 
 php_install_ini() {
diff --git a/dev-lang/php/php-7.1.13.ebuild b/dev-lang/php/php-7.1.13.ebuild
index 4fc386497f87..65425f9dc6a3 100644
--- a/dev-lang/php/php-7.1.13.ebuild
+++ b/dev-lang/php/php-7.1.13.ebuild
@@ -145,6 +145,8 @@ REQUIRED_USE="
 	mysql? ( || ( mysqli pdo ) )
 "
 
+PATCHES=( "${FILESDIR}/mbstring-oniguruma-6.8.patch" )
+
 PHP_MV="$(get_major_version)"
 
 php_install_ini() {
diff --git a/dev-lang/php/php-7.1.14.ebuild b/dev-lang/php/php-7.1.14.ebuild
index 682890dc86d0..ee42a9c8acb7 100644
--- a/dev-lang/php/php-7.1.14.ebuild
+++ b/dev-lang/php/php-7.1.14.ebuild
@@ -145,6 +145,8 @@ REQUIRED_USE="
 	mysql? ( || ( mysqli pdo ) )
 "
 
+PATCHES=( "${FILESDIR}/mbstring-oniguruma-6.8.patch" )
+
 PHP_MV="$(get_major_version)"
 
 php_install_ini() {
diff --git a/dev-lang/php/php-7.1.15.ebuild b/dev-lang/php/php-7.1.15.ebuild
index d3c61673621f..7624b2d8a8a7 100644
--- a/dev-lang/php/php-7.1.15.ebuild
+++ b/dev-lang/php/php-7.1.15.ebuild
@@ -145,6 +145,8 @@ REQUIRED_USE="
 	mysql? ( || ( mysqli pdo ) )
 "
 
+PATCHES=( "${FILESDIR}/mbstring-oniguruma-6.8.patch" )
+
 PHP_MV="$(get_major_version)"
 
 php_install_ini() {
diff --git a/dev-lang/php/php-7.1.16.ebuild b/dev-lang/php/php-7.1.16.ebuild
index 34ff2d2648dc..e40cced279d8 100644
--- a/dev-lang/php/php-7.1.16.ebuild
+++ b/dev-lang/php/php-7.1.16.ebuild
@@ -18,7 +18,7 @@ LICENSE="PHP-3.01
 	unicode? ( BSD-2 LGPL-2.1 )"
 
 SLOT="$(get_version_component_range 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"
@@ -145,6 +145,8 @@ REQUIRED_USE="
 	mysql? ( || ( mysqli pdo ) )
 "
 
+PATCHES=( "${FILESDIR}/mbstring-oniguruma-6.8.patch" )
+
 PHP_MV="$(get_major_version)"
 
 php_install_ini() {
diff --git a/dev-lang/php/php-7.2.4.ebuild b/dev-lang/php/php-7.2.4.ebuild
index 5407f131e1a1..9db1463e3a1a 100644
--- a/dev-lang/php/php-7.2.4.ebuild
+++ b/dev-lang/php/php-7.2.4.ebuild
@@ -150,6 +150,8 @@ REQUIRED_USE="
 	zip-encryption? ( zip )
 "
 
+PATCHES=( "${FILESDIR}/mbstring-oniguruma-6.8.patch" )
+
 PHP_MV="$(get_major_version)"
 
 php_install_ini() {