Update dev-lang/php-7.1.15

3 files changed, 35 insertions, 2 deletions

diff --git a/dev-lang/php/Manifest b/dev-lang/php/Manifest
index bab4f230..17642f0e 100644
--- a/dev-lang/php/Manifest
+++ b/dev-lang/php/Manifest
@@ -1,5 +1,6 @@
 AUX 20php5-envd 145 BLAKE2B 06476b8fc04d1e835496b417ac752f0834ddbe8584e4fddc6db0aa5e6845b82cdea0a1355c77125375dcdd0f0a3c19de5f3a8a64ee93950f96c437a16f971567 SHA512 581aa86479e3cd584ee1bc6dc6d4a135fe8ec343fe5519566d728d81f7018cfb23658bd0c0368951d380982c75adbb4f45acf3c146868aaf4e4ec8e9f2fad1ce
 AUX fix-x86-build-bug_571658.patch 2087 BLAKE2B 214dc612770fd2d5db3a892e8777f96e46767a985f24562ebce9868598f6cec12769b74eedacd6d286dcb5dfb1f98439d27d3c43d6ee58dad902293e65c7f5ae SHA512 644c12a5f6d63351b71d18033e2cfeeb78f59427fb0a68fced29e1417b4d46b9044ca0c524a89e9bb315b702bc1c2e76eca57a7b4f97626fa39c9537dcd32fc7
+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-r1.conf 12966 BLAKE2B 851e6b2adeb20f45164c324ec37fc3a8fbb6edc188ed68d70d6c916beb0f671d984ec23c429f2c8f44edef5ad8df3e6fe408afd0c64a70e8ed4641dd8f84f7fa SHA512 3d421c1e8b8f6ecffbf8284a7f79a1e5cc3f0893b1a47f5ccd980d554b058c363c1e236aa3157c2b66791b3291c6e98981cc527d501328ccc3ccb34eee2950ef
 AUX php-fpm_at-simple.service 316 BLAKE2B 0ba10f3e3b004fbf14956e1e4f04f59b8a127e6717fe6b92c09b9f931033a11551c75fbbee9010f6b694c5a8758ca0eec9eed457ae304ba0dea8f2c256c3b8d4 SHA512 7367a3f8d3874f8e0c76f331ba613a0250db02f60ad9f87affaf448dcb5bc34bcecb91d88f415764a12b24b46ae3d1b738a002af9f77a4b707e916e83a0021fd
@@ -116,5 +117,5 @@ EBUILD php-7.0.9-r2.ebuild 22763 BLAKE2B a4e7594e3bc4f221500863ed83574fd39a22504
 EBUILD php-7.0.9.ebuild 23535 BLAKE2B 2bfa87554d3000851b2a079400f12137b2b20d0265f0f315714d2307f530c71d3d4660e3290e522c587f36c5eb4c5da28b079bcf188dfd21008d7a9d172126b3 SHA512 65daf06274567bf9f2f9087203c553e696f25dc77e95db6f3db2d3024161348214c39e94521d208e47cb3e59ec40aa23dd4c1013a2ed019c7f85249e96c37fb6
 EBUILD php-7.1.11.ebuild 21684 BLAKE2B f29676b99f34dbf10f14b6ae93c3ff985d248b083a62c364f00d79cb349a12aff4a528125f3296f50763160bd68731f9ad34e320ae2a2b2f444d3bfe27ad9f1d SHA512 6db794b8eded8f4e7c056d736a2f795afcd0a492e570b9c9a2e6de9b2d7f091ffa32e906dcfc407f6805ca1621cddef9a27ebc2aa19380b3113a5144d03e0959
 EBUILD php-7.1.13.ebuild 21723 BLAKE2B c68a360087b0e01cdb661b43ce596ad07e75b812231cca94ecd2d436da7467f04fcf939ad1094785f9009cc09c5baba17e539a238b3a81af1cb917d94f03346f SHA512 ab7ce6da7806c0ab42f8dadfbb9b741b6454cd42008c469e3f7c3c907313f62805bd8e9df19857eeaa19eec71c6974ab8967a27e6b045a3ecbf9a3595de20d5c
-EBUILD php-7.1.15.ebuild 21845 BLAKE2B cb04d44804201c20d6839f3d15c958fd6918ffc5f779e2128298979cd4a864b0bad48579cba6a9e41c9b07128e6efea88090239e1958b247644e896bf920439e SHA512 95c0b646fa294bd0668dc5d10f0ea21687833873cba9710a628f17284fe714f89cbd15952e252e4f94476e070d6fc7f20e2b9d58f77a26950f7eb92bef8e61d4
+EBUILD php-7.1.15.ebuild 21903 BLAKE2B 3dc987de9106e5b58b254a0c91eaf6c246e2d35cc8cad8e68eccad3a623f1f1ef10f2c9dd768fe2843ecb052dc709d51b4489679a00bbc9caf0974342a997d40 SHA512 fc23c645b3feff64a71bb4908ec806cd77b1d8b327d495692e04d17e847b1811d6d6d7a1118c6f760d1b817fc0fe634b807cf987a21394808475f4955625f4cd
 EBUILD php-7.1.6.ebuild 21935 BLAKE2B 444a28c5678bbc0b50f86e46695a766834ca0393702e23029bcf8cc70bffdec13647013022c59710506771368c16d89ade3d6c79df27c49d6d131aa71160258c SHA512 79ebd165d5cf5b955c0fd1967d183859d6917d985acd52c8a59bec157ef0192302b5f3806be28c3db0a553c98fb599a2c5f4fc3c327bf1c4eaa616a0e2d2f702
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 00000000..c238f880
--- /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-7.1.15.ebuild b/dev-lang/php/php-7.1.15.ebuild
index e70745ed..74023a64 100644
--- a/dev-lang/php/php-7.1.15.ebuild
+++ b/dev-lang/php/php-7.1.15.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() {