Update dev-lang/php-5.6.35-r1, dev-lang/php-7.0.29, dev-lang/php-7.1.16

6 files changed, 316 insertions, 5 deletions

diff --git a/dev-lang/php/Manifest b/dev-lang/php/Manifest
index 4d7dbbb8..467812ec 100644
--- a/dev-lang/php/Manifest
+++ b/dev-lang/php/Manifest
@@ -1,10 +1,12 @@
 AUX 20php5-envd 145 BLAKE2B 06476b8fc04d1e835496b417ac752f0834ddbe8584e4fddc6db0aa5e6845b82cdea0a1355c77125375dcdd0f0a3c19de5f3a8a64ee93950f96c437a16f971567 SHA512 581aa86479e3cd584ee1bc6dc6d4a135fe8ec343fe5519566d728d81f7018cfb23658bd0c0368951d380982c75adbb4f45acf3c146868aaf4e4ec8e9f2fad1ce
 AUX fix-x86-build-bug_571658.patch 2087 BLAKE2B 214dc612770fd2d5db3a892e8777f96e46767a985f24562ebce9868598f6cec12769b74eedacd6d286dcb5dfb1f98439d27d3c43d6ee58dad902293e65c7f5ae SHA512 644c12a5f6d63351b71d18033e2cfeeb78f59427fb0a68fced29e1417b4d46b9044ca0c524a89e9bb315b702bc1c2e76eca57a7b4f97626fa39c9537dcd32fc7
+AUX libressl-compatibility.patch 2978 BLAKE2B 714e268149d973beb0d2d76f90e15adde57acb7aed028131c6dee2a34b11980fedff487ccec67e20d9a9094014878e13bd7e180e98bb0ee304c5916324016823 SHA512 58ed57061f31da72c96cbca6f6e86d1466c96c8562dfa6551b4a8d16bd6e537b848ca34cbe57c5c220c72158e176f9cd7c07d282fe1fd69ebf5475c48bf95c26
 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
 AUX php-fpm_at.service 317 BLAKE2B f13fc38fcc0575a8517ee8d07b120efda37eabd2355061d0fdc303604c6b02ad42d7301180d86c977d5e585f5dd685343c592e37a6e0f44933707be79e0b77e0 SHA512 27982f9e2d958bfa75c89c7d3531e48d17fc388b1cdcbc8e09051b236b1184ee2baabdfcc567c19d9fcd067d4b3b86f171015616d8da42fccdabd89432d865e8
+AUX php-freetype-2.9.1.patch 7609 BLAKE2B f1dbcf00f4097b303ebca5275d2d188ef6d8deba0349c07fa8406f41571b14fcce3879070c8fc51e9318c9d267542a661126ce56b8ce7d74d40a4fbbf2612c45 SHA512 b3ae8a2dddd39e46c791934546d290f54a0c6d0d4a1fd7b06f06b6accc71f72d7289e04f04cb41ace619c663ccf81b19855433709ef87be495aefb86a28a2062
 AUX php-libvpx.patch 959 BLAKE2B a870c7aff366e2875ca4a8fd84de9943fdc5297bd94f211dce1812b02eee7770feaee55fb90bf45b36b56da655fe71dd93ad566897212a9f30351a06c4d921a1 SHA512 4b16d5045d37e962e709de587f49c8c9320e2166e5245a42d8d005dcbb5f15d88dbac8ddee122694df5ae89209547f0217f5d108b4a9e41bffdb3e59e8f37f1a
 AUX zend_operators_x32-5.patch 4503 BLAKE2B 5c261c0be37c58b206c425be826221f36f9923de29237c199c1f01652275a294ad459b8711d54988988ec7c49be4533841e79450e333cd0b327c6c0321b97720 SHA512 d3ee1b069856ab5d91f3ff1d541ee41fd546fee9763534571c8b99ed3b1e96f9580fecd4017632810b65cc4380e712eeb73009e829b6596b7176b11c4d327b55
 DIST php-5.5.22.tar.bz2 13305486 BLAKE2B 4e105f868e6242eb2be52bd2fc64315b13837ca2fd3f60e11ad545e80f9ed9da903f57b8cefefcd076c0a05a612b26df87b181aa4710197ab4f3a645fad2d9a7 SHA512 3eabd6fa2cd10e83fc3c00fb43313feefbb8c2772778dc6f176612fcb449761e22b55053e5b0b7f6954c0c141ab6c799f08bdca1851078511b7ef9376dadefac
@@ -103,7 +105,7 @@ EBUILD php-5.6.31.ebuild 22798 BLAKE2B 8c1f23ed73753bea44ed11c600ac537be12280b78
 EBUILD php-5.6.32.ebuild 22792 BLAKE2B df4f92101f10c7b6434771e189866c0f7f74f6e2130e0fbcdab4e2977dc3e72635b8080ee75670bf4a5336ec0adf727a62d5d9249693734737579172cb20e9e7 SHA512 0afe8fd5124002cfad4191f7666eb7ca53cdb45d04431327aa02030fb93da5d2eadf70a8214382ab710069662ff94f6bcc5414a5e0f91ddffea3eb390f9c2474
 EBUILD php-5.6.33.ebuild 22825 BLAKE2B fa6178ae878a80909fbf3779578d0f7312a26f8310f4adb9b3722d67d6154b1b743e042269ff06f625b3e8f8e888048ddacbed07d3acd4dad1c992036bb4adf7 SHA512 a7380a12cff6bfaf29dadf5a702d9408193a7cd1140fd1673fbde45778a796bb4702e662e84cc602c2b67ed38b0758084d759fc27f4b2fd0031ba81ac03f2fbb
 EBUILD php-5.6.34.ebuild 22946 BLAKE2B fe0484abdd17ae2e548c516fcad48fb35d723f9e4545dbf68a3f15d8f335a7418417d333348858c217b96f79646578353532aa09e0f1fadbb8300061f2a8a3da SHA512 70fc526b7fb68504b720ad8a16b77257da9bdab32b2cea649761a7251d03343d7ced353501fb41eba033b8a09eb167a828fd9135fb1e4beb5fee00adb01acfb9
-EBUILD php-5.6.35-r1.ebuild 22955 BLAKE2B fcad3ac09881b67ed4088ae1b401e7ca61c49fc24470de16633f615ce274a61b8b4f1ccdd080aaa28de8126d7d53796638acc117cd9d1066fa639b9fad5c7b5c SHA512 ac38200d399a2c41ed8ece84969f80483b9b26dd31cfbcfbe4eb8cf9536e5d0d4e329e55677be38d650ada0d9d757183d8b0e94ffe97f6756fb03ce9ba8a9680
+EBUILD php-5.6.35-r1.ebuild 23002 BLAKE2B 3aeb99645f08a8aacbb712f092690b2fe5f61d4e0e15fb5567a1893080c22190a0c162459f81ac1e40eda0e523dd6c77dad813b15f6f516f37dd5ab9b285d46f SHA512 8e814bdc21f0d88c5fdaf37d310de6accb0e312e4eed1ac24d9e9d817dd33e5e4014b39f1e832e8fe48db6864d67d34d40547105151b70f4f9dabf00e5a20921
 EBUILD php-5.6.7.ebuild 22710 BLAKE2B e06ca279bc2929a98e3378d823dea8a07416d14b4389d998600faee488b32a572b0efb9bf4b7a67461e1ccb1e5bdda85e323eb081cf4368c65aa30eae5732d79 SHA512 bd2d6cfec081fab72076f748a380878d3e6a68bb2b01b7906efa5452641379fde461ca1c20e89c7fbce7c6917396959904000a876b381c33da432946ec47391c
 EBUILD php-5.6.8.ebuild 22709 BLAKE2B 5d07ed940d54fecc7f2ba00de5c7aab9cf21c0449438f8a663058f7a0f38f574a600df8de63175afaf9aa1da73ea801b3b719c1bee2186ff211597fe75ee544a SHA512 62c1bd79a1e9f79c82fd9c23daffaea38083396f87d9cfe328c2f102eff97d2bc1f1815fad6f3bd63db9c821c20cffa3d82b596de5fdca536b52c23ae580ceaa
 EBUILD php-5.6.9.ebuild 22644 BLAKE2B c51739a0d61dcfe21e431f2d372e5574591cf533f1988c5f15946eb995f6ca06b1ce0ffb46efa24397717d7d64c31bdbfefebf164e4cac25ec948f07441f150c SHA512 22f9c25000b972f93626479a5e1161eb10e005fb817149bd2ce7f811d5dfbc5c012e64bf5ab1b9259fb2f39038065dfd27134d9435e4c08b56a5da8ce635f2be
@@ -113,7 +115,7 @@ EBUILD php-7.0.19.ebuild 21938 BLAKE2B fc554a548fc9f00c85cf3951f7d45681091e53a42
 EBUILD php-7.0.23.ebuild 21960 BLAKE2B 2680b883cc745b2f24d47ddcea8309dabb6a17869c5ce543858776c29758d8dbf815e33a8033a3318349d55efe3f881ffa1105de8b88daebe52aa6e418fd859c SHA512 2a43525e4fd2648d3aed5fe0791839ef780af9707a8ad91880ad12fd1eb74180d8bddaaac55638a33178862cca70dae1a08e54a10f8f28a965a47b7892a49617
 EBUILD php-7.0.25.ebuild 21960 BLAKE2B 2680b883cc745b2f24d47ddcea8309dabb6a17869c5ce543858776c29758d8dbf815e33a8033a3318349d55efe3f881ffa1105de8b88daebe52aa6e418fd859c SHA512 2a43525e4fd2648d3aed5fe0791839ef780af9707a8ad91880ad12fd1eb74180d8bddaaac55638a33178862cca70dae1a08e54a10f8f28a965a47b7892a49617
 EBUILD php-7.0.27.ebuild 21997 BLAKE2B ae65f01c61cdf46a138781dce1c5bf2a8381509aab551cb3d99f60647602cb480e2fd00459c9415b94228111f00d824fb8f2f9e1846d59161cfcb4099a251c11 SHA512 6d87e73ac41d93ad7ec4256debfd48530617b154f5ead1087c9aab1b1528ec020b777198a2fd3920377da462a80081da70179b3c5c0995a857b34e125eb2dff7
-EBUILD php-7.0.29.ebuild 22175 BLAKE2B aaf5dc158ae4fb25cec62874fca43f76883bd7e004f4c8d1b5c9abc47670c05b257d52f0e57056a0b6fdea42edf18f074b4366b58e7a0c6c90ae96e21b0d0916 SHA512 aa4024bb12826c3cb4c546beefdcf4846c9deda654be18653c0c20ee3237fd950504b7eba16d4f0fec29fe41f07884df645569c8079808212551e6355a0ec4a0
+EBUILD php-7.0.29.ebuild 22369 BLAKE2B 4e5525aa86fb5d8ffad356efae41d855a62c8895d87b8310bb711fabef2ad90733447c278dadf5323b6c07dd4672b8fe705277d3f80aadd7586dc85a7ab5b45a SHA512 234c295d628092403da4782a6948221f0197bf501b5a30f3d7201a6b9b08cec90a84cb3beeb6284f40c0a19209db6444c6bded3de78dd8baa2d790ee743b33e0
 EBUILD php-7.0.3.ebuild 23121 BLAKE2B c8915b44cc8c7ff4c1a581716d32c730ce2a4a12db71b9156fcedfa43e8f1d94ba3c118144d8a1f4cd38bf1944a6b2142f0eff08894e2494d900e976abe53f61 SHA512 26a2976d34fc568806447dabc31e754d6f0ee4746fa670756a3b068ea6c112e6b33469cb1a240b5157f7087e81e608d6a9e297b60cfe500ee35cc062b5177712
 EBUILD php-7.0.4.ebuild 23134 BLAKE2B 362415a1b014dc28fa94658011a02748440f23b5783e771eeb6efa101effef3f1b02011d890d7f786ab2746854f6e4fbc763c939fdf9a1c344da0fc3d4b0e9cb SHA512 5852297c2578fd36e57892099a6187eb07d9baf2ac44e20d905bf7e5e0860b24886f781886809e202b8ba23f2cf60129d862e8631892428b045a32f0bc690906
 EBUILD php-7.0.8.ebuild 23219 BLAKE2B fedbdada226cecb2a8747051bf43fca3bc6730177b432b21153c9316cc5f1b82babd994c05bad397f028b7212362dab014624c269c316d8d355420f3d0815b2b SHA512 d2fb8bea2f363c561683599c72deac6c7c3958952ca45f8359df1bba3d04ade6d01179affc1317524533aad71b2625c61e719032d7ab96d3da7df0586d0ea6a0
@@ -123,5 +125,5 @@ EBUILD php-7.0.9.ebuild 23535 BLAKE2B 2bfa87554d3000851b2a079400f12137b2b20d0265
 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 21903 BLAKE2B 3dc987de9106e5b58b254a0c91eaf6c246e2d35cc8cad8e68eccad3a623f1f1ef10f2c9dd768fe2843ecb052dc709d51b4489679a00bbc9caf0974342a997d40 SHA512 fc23c645b3feff64a71bb4908ec806cd77b1d8b327d495692e04d17e847b1811d6d6d7a1118c6f760d1b817fc0fe634b807cf987a21394808475f4955625f4cd
-EBUILD php-7.1.16.ebuild 21904 BLAKE2B 4e1f544d3e57695984fa480663ee83dbe64382fea1b46947072932e7e172b7410f909802d7eda0e4144cc7cbf82c0a6248788b0a7f4bcd3f72cee19bb5098919 SHA512 aab4826de8dcd1f32f3a8017815821b2bafb8057b5da338a9386196e3521f506a8450e7b130965f7e5cd9a182a827b8cda9ff4814a6e533739062041fd111706
+EBUILD php-7.1.16.ebuild 22098 BLAKE2B 118ccf7f8ce6f7b16cae5624c54c73cb296be77a88e8361ace60a95ffaeaac5004be649fcf52d848019c5346ccf6f7bbedc918d3317b0a98a0ea54b035cff0b9 SHA512 e8a9d180ef2087307ba48993f5e644bce5c8d284e098775d522dea061f9ac98af044be7ae961f47d31741122cab2f82dd08bc7870432fb1d569b725a5e8962c4
 EBUILD php-7.1.6.ebuild 21935 BLAKE2B 444a28c5678bbc0b50f86e46695a766834ca0393702e23029bcf8cc70bffdec13647013022c59710506771368c16d89ade3d6c79df27c49d6d131aa71160258c SHA512 79ebd165d5cf5b955c0fd1967d183859d6917d985acd52c8a59bec157ef0192302b5f3806be28c3db0a553c98fb599a2c5f4fc3c327bf1c4eaa616a0e2d2f702
diff --git a/dev-lang/php/files/libressl-compatibility.patch b/dev-lang/php/files/libressl-compatibility.patch
new file mode 100644
index 00000000..3b9c39dc
--- /dev/null
+++ b/dev-lang/php/files/libressl-compatibility.patch
@@ -0,0 +1,65 @@
+--- a/ext/openssl/openssl.c	2018-04-04 14:26:34.583000000 +0000
++++ b/ext/openssl/openssl.c	2018-04-04 14:20:16.907000000 +0000
+@@ -73,7 +73,7 @@
+ #ifdef HAVE_OPENSSL_MD2_H
+ #define OPENSSL_ALGO_MD2	4
+ #endif
+-#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined (LIBRESSL_VERSION_NUMBER)
++#if OPENSSL_VERSION_NUMBER < 0x10100000L || (defined (LIBRESSL_VERSION_NUMBER) && LIBRESSL_VERSION_NUMBER < 0x20700000L)
+ #define OPENSSL_ALGO_DSS1	5
+ #endif
+ #define OPENSSL_ALGO_SHA224 6
+@@ -560,7 +560,7 @@
+ #endif
+ 
+ /* {{{ OpenSSL compatibility functions and macros */
+-#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined (LIBRESSL_VERSION_NUMBER)
++#if OPENSSL_VERSION_NUMBER < 0x10100000L || (defined (LIBRESSL_VERSION_NUMBER) && LIBRESSL_VERSION_NUMBER < 0x20700000L)
+ #define EVP_PKEY_get0_RSA(_pkey) _pkey->pkey.rsa
+ #define EVP_PKEY_get0_DH(_pkey) _pkey->pkey.dh
+ #define EVP_PKEY_get0_DSA(_pkey) _pkey->pkey.dsa
+@@ -677,7 +677,7 @@
+ 	return M_ASN1_STRING_data(asn1);
+ }
+ 
+-#if OPENSSL_VERSION_NUMBER < 0x10002000L || defined (LIBRESSL_VERSION_NUMBER)
++#if OPENSSL_VERSION_NUMBER < 0x10002000L || (defined (LIBRESSL_VERSION_NUMBER) && LIBRESSL_VERSION_NUMBER < 0x20700000L)
+ 
+ static int X509_get_signature_nid(const X509 *x)
+ {
+@@ -1324,7 +1324,7 @@
+ 			mdtype = (EVP_MD *) EVP_md2();
+ 			break;
+ #endif
+-#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined (LIBRESSL_VERSION_NUMBER)
++#if OPENSSL_VERSION_NUMBER < 0x10100000L || (defined (LIBRESSL_VERSION_NUMBER) && LIBRESSL_VERSION_NUMBER < 0x20700000L)
+ 		case OPENSSL_ALGO_DSS1:
+ 			mdtype = (EVP_MD *) EVP_dss1();
+ 			break;
+@@ -1450,7 +1450,7 @@
+ #ifdef HAVE_OPENSSL_MD2_H
+ 	REGISTER_LONG_CONSTANT("OPENSSL_ALGO_MD2", OPENSSL_ALGO_MD2, CONST_CS|CONST_PERSISTENT);
+ #endif
+-#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined (LIBRESSL_VERSION_NUMBER)
++#if OPENSSL_VERSION_NUMBER < 0x10100000L || (defined (LIBRESSL_VERSION_NUMBER) && LIBRESSL_VERSION_NUMBER < 0x20700000L)
+ 	REGISTER_LONG_CONSTANT("OPENSSL_ALGO_DSS1", OPENSSL_ALGO_DSS1, CONST_CS|CONST_PERSISTENT);
+ #endif
+ 	REGISTER_LONG_CONSTANT("OPENSSL_ALGO_SHA224", OPENSSL_ALGO_SHA224, CONST_CS|CONST_PERSISTENT);
+@@ -3620,7 +3620,7 @@
+ 		RETURN_FALSE;
+ 	}
+ 
+-#if OPENSSL_VERSION_NUMBER >= 0x10100000L && !defined(LIBRESSL_VERSION_NUMBER)
++#if OPENSSL_VERSION_NUMBER >= 0x10100000L && !(defined (LIBRESSL_VERSION_NUMBER) && LIBRESSL_VERSION_NUMBER < 0x20700000L)
+ 	/* Due to changes in OpenSSL 1.1 related to locking when decoding CSR,
+ 	 * the pub key is not changed after assigning. It means if we pass
+ 	 * a private key, it will be returned including the private part.
+@@ -3631,7 +3631,7 @@
+ 	/* Retrieve the public key from the CSR */
+ 	tpubkey = X509_REQ_get_pubkey(csr);
+ 
+-#if OPENSSL_VERSION_NUMBER >= 0x10100000L && !defined(LIBRESSL_VERSION_NUMBER)
++#if OPENSSL_VERSION_NUMBER >= 0x10100000L && !(defined (LIBRESSL_VERSION_NUMBER) && LIBRESSL_VERSION_NUMBER < 0x20700000L)
+ 	/* We need to free the CSR as it was duplicated */
+ 	X509_REQ_free(csr);
+ #endif
diff --git a/dev-lang/php/files/php-freetype-2.9.1.patch b/dev-lang/php/files/php-freetype-2.9.1.patch
new file mode 100644
index 00000000..3ddf8d11
--- /dev/null
+++ b/dev-lang/php/files/php-freetype-2.9.1.patch
@@ -0,0 +1,231 @@
+--- a/ext/gd/config.m4	2018-04-24 11:09:54.000000000 -0400
++++ b/ext/gd/config.m4	2018-05-04 15:18:49.867283889 -0400
+@@ -186,21 +186,35 @@
+ AC_DEFUN([PHP_GD_FREETYPE2],[
+   if test "$PHP_FREETYPE_DIR" != "no"; then
+ 
+-    for i in $PHP_FREETYPE_DIR /usr/local /usr; do
+-      if test -f "$i/bin/freetype-config"; then
+-        FREETYPE2_DIR=$i
+-        FREETYPE2_CONFIG="$i/bin/freetype-config"
+-        break
++    AC_PATH_PROG(PKG_CONFIG, pkg-config, no)
++    AC_MSG_CHECKING(for freetype2)
++
++    if test -x "$PKG_CONFIG" && $PKG_CONFIG --exists freetype2 ; then
++
++      FREETYPE2_CFLAGS=`$PKG_CONFIG --cflags freetype2`
++      FREETYPE2_LIBS=`$PKG_CONFIG --libs freetype2`
++      FREETYPE2_VERSION=`$PKG_CONFIG --modversion freetype2`
++
++      AC_MSG_RESULT(from pkgconfig: version $FREETYPE2_VERSION found)
++    else
++
++      for i in $PHP_FREETYPE_DIR /usr/local /usr; do
++        if test -f "$i/bin/freetype-config"; then
++          FREETYPE2_DIR=$i
++          FREETYPE2_CONFIG="$i/bin/freetype-config"
++          break
++        fi
++      done
++
++      if test -z "$FREETYPE2_DIR"; then
++        AC_MSG_ERROR([freetype-config not found.])
+       fi
+-    done
+ 
+-    if test -z "$FREETYPE2_DIR"; then
+-      AC_MSG_ERROR([freetype-config not found.])
++      FREETYPE2_CFLAGS=`$FREETYPE2_CONFIG --cflags`
++      FREETYPE2_LIBS=`$FREETYPE2_CONFIG --libs`
++      AC_MSG_RESULT(found via freetype-config)
+     fi
+ 
+-    FREETYPE2_CFLAGS=`$FREETYPE2_CONFIG --cflags`
+-    FREETYPE2_LIBS=`$FREETYPE2_CONFIG --libs`
+-
+     PHP_EVAL_INCLINE($FREETYPE2_CFLAGS)
+     PHP_EVAL_LIBLINE($FREETYPE2_LIBS, GD_SHARED_LIBADD)
+     AC_DEFINE(HAVE_LIBFREETYPE,1,[ ])
+--- a/configure	2018-04-24 11:10:05.000000000 -0400
++++ b/configure	2018-05-04 15:18:45.626367913 -0400
+@@ -34348,21 +34348,78 @@
+ 
+   if test "$PHP_FREETYPE_DIR" != "no"; then
+ 
+-    for i in $PHP_FREETYPE_DIR /usr/local /usr; do
+-      if test -f "$i/bin/freetype-config"; then
+-        FREETYPE2_DIR=$i
+-        FREETYPE2_CONFIG="$i/bin/freetype-config"
+-        break
++    # Extract the first word of "pkg-config", so it can be a program name with args.
++set dummy pkg-config; ac_word=$2
++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
++$as_echo_n "checking for $ac_word... " >&6; }
++if ${ac_cv_path_PKG_CONFIG+:} false; then :
++  $as_echo_n "(cached) " >&6
++else
++  case $PKG_CONFIG in
++  [\\/]* | ?:[\\/]*)
++  ac_cv_path_PKG_CONFIG="$PKG_CONFIG" # Let the user override the test with a path.
++  ;;
++  *)
++  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
++for as_dir in $PATH
++do
++  IFS=$as_save_IFS
++  test -z "$as_dir" && as_dir=.
++    for ac_exec_ext in '' $ac_executable_extensions; do
++  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
++    ac_cv_path_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext"
++    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
++    break 2
++  fi
++done
++  done
++IFS=$as_save_IFS
++
++  test -z "$ac_cv_path_PKG_CONFIG" && ac_cv_path_PKG_CONFIG="no"
++  ;;
++esac
++fi
++PKG_CONFIG=$ac_cv_path_PKG_CONFIG
++if test -n "$PKG_CONFIG"; then
++  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $PKG_CONFIG" >&5
++$as_echo "$PKG_CONFIG" >&6; }
++else
++  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
++$as_echo "no" >&6; }
++fi
++
++    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for freetype2" >&5
++$as_echo_n "checking for freetype2... " >&6; }
++
++
++    if test -x "$PKG_CONFIG" && $PKG_CONFIG --exists freetype2 ; then
++
++      FREETYPE2_CFLAGS=`$PKG_CONFIG --cflags freetype2`
++      FREETYPE2_LIBS=`$PKG_CONFIG --libs freetype2`
++      FREETYPE2_VERSION=`$PKG_CONFIG --modversion freetype2`
++
++      { $as_echo "$as_me:${as_lineno-$LINENO}: result: from pkgconfig: version $FREETYPE2_VERSION found" >&5
++$as_echo "from pkgconfig: version $FREETYPE2_VERSION found" >&6; }
++    else
++
++      for i in $PHP_FREETYPE_DIR /usr/local /usr; do
++        if test -f "$i/bin/freetype-config"; then
++          FREETYPE2_DIR=$i
++          FREETYPE2_CONFIG="$i/bin/freetype-config"
++          break
++        fi
++      done
++
++      if test -z "$FREETYPE2_DIR"; then
++        as_fn_error $? "freetype-config not found." "$LINENO" 5
+       fi
+-    done
+ 
+-    if test -z "$FREETYPE2_DIR"; then
+-      as_fn_error $? "freetype-config not found." "$LINENO" 5
++      FREETYPE2_CFLAGS=`$FREETYPE2_CONFIG --cflags`
++      FREETYPE2_LIBS=`$FREETYPE2_CONFIG --libs`
++      { $as_echo "$as_me:${as_lineno-$LINENO}: result: found via freetype-config" >&5
++$as_echo "found via freetype-config" >&6; }
+     fi
+ 
+-    FREETYPE2_CFLAGS=`$FREETYPE2_CONFIG --cflags`
+-    FREETYPE2_LIBS=`$FREETYPE2_CONFIG --libs`
+-
+ 
+   for ac_i in $FREETYPE2_CFLAGS; do
+     case $ac_i in
+@@ -36019,21 +36076,78 @@
+ 
+   if test "$PHP_FREETYPE_DIR" != "no"; then
+ 
+-    for i in $PHP_FREETYPE_DIR /usr/local /usr; do
+-      if test -f "$i/bin/freetype-config"; then
+-        FREETYPE2_DIR=$i
+-        FREETYPE2_CONFIG="$i/bin/freetype-config"
+-        break
++    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for freetype2" >&5
++$as_echo_n "checking for freetype2... " >&6; }
++    # Extract the first word of "pkg-config", so it can be a program name with args.
++set dummy pkg-config; ac_word=$2
++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
++$as_echo_n "checking for $ac_word... " >&6; }
++if ${ac_cv_path_PKG_CONFIG+:} false; then :
++  $as_echo_n "(cached) " >&6
++else
++  case $PKG_CONFIG in
++  [\\/]* | ?:[\\/]*)
++  ac_cv_path_PKG_CONFIG="$PKG_CONFIG" # Let the user override the test with a path.
++  ;;
++  *)
++  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
++for as_dir in $PATH
++do
++  IFS=$as_save_IFS
++  test -z "$as_dir" && as_dir=.
++    for ac_exec_ext in '' $ac_executable_extensions; do
++  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
++    ac_cv_path_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext"
++    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
++    break 2
++  fi
++done
++  done
++IFS=$as_save_IFS
++
++  test -z "$ac_cv_path_PKG_CONFIG" && ac_cv_path_PKG_CONFIG="no"
++  ;;
++esac
++fi
++PKG_CONFIG=$ac_cv_path_PKG_CONFIG
++if test -n "$PKG_CONFIG"; then
++  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $PKG_CONFIG" >&5
++$as_echo "$PKG_CONFIG" >&6; }
++else
++  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
++$as_echo "no" >&6; }
++fi
++
++
++
++    if test -x "$PKG_CONFIG" && $PKG_CONFIG --exists freetype2 ; then
++
++      FREETYPE2_CFLAGS=`$PKG_CONFIG --cflags freetype2`
++      FREETYPE2_LIBS=`$PKG_CONFIG --libs freetype2`
++      FREETYPE2_VERSION=`$PKG_CONFIG --modversion freetype2`
++
++      { $as_echo "$as_me:${as_lineno-$LINENO}: result: from pkgconfig: version $FREETYPE_VERSON found" >&5
++$as_echo "from pkgconfig: version $FREETYPE_VERSON found" >&6; }
++    else
++
++      for i in $PHP_FREETYPE_DIR /usr/local /usr; do
++        if test -f "$i/bin/freetype-config"; then
++          FREETYPE2_DIR=$i
++          FREETYPE2_CONFIG="$i/bin/freetype-config"
++          break
++        fi
++      done
++
++      if test -z "$FREETYPE2_DIR"; then
++        as_fn_error $? "freetype-config not found." "$LINENO" 5
+       fi
+-    done
+ 
+-    if test -z "$FREETYPE2_DIR"; then
+-      as_fn_error $? "freetype-config not found." "$LINENO" 5
++      FREETYPE2_CFLAGS=`$FREETYPE2_CONFIG --cflags`
++      FREETYPE2_LIBS=`$FREETYPE2_CONFIG --libs`
++      { $as_echo "$as_me:${as_lineno-$LINENO}: result: found via freetype-config" >&5
++$as_echo "found via freetype-config" >&6; }
+     fi
+ 
+-    FREETYPE2_CFLAGS=`$FREETYPE2_CONFIG --cflags`
+-    FREETYPE2_LIBS=`$FREETYPE2_CONFIG --libs`
+-
+ 
+   for ac_i in $FREETYPE2_CFLAGS; do
+     case $ac_i in
diff --git a/dev-lang/php/php-5.6.35-r1.ebuild b/dev-lang/php/php-5.6.35-r1.ebuild
index 48942851..ef5893a3 100644
--- a/dev-lang/php/php-5.6.35-r1.ebuild
+++ b/dev-lang/php/php-5.6.35-r1.ebuild
@@ -232,6 +232,7 @@ php_set_ini_dir() {
 
 src_prepare() {
 	eapply "${FILESDIR}/php-${SLOT}-no-bison-warnings.patch"
+	eapply "${FILESDIR}/php-freetype-2.9.1.patch"
 
 	# Change PHP branding
 	# Get the alpha/beta/rc version
diff --git a/dev-lang/php/php-7.0.29.ebuild b/dev-lang/php/php-7.0.29.ebuild
index cb84bc76..c689e7b9 100644
--- a/dev-lang/php/php-7.0.29.ebuild
+++ b/dev-lang/php/php-7.0.29.ebuild
@@ -163,7 +163,13 @@ REQUIRED_USE="
 	mysql? ( || ( mysqli pdo ) )
 "
 
-PATCHES=( "${FILESDIR}/mbstring-oniguruma-6.8.patch" )
+PATCHES=(
+	"${FILESDIR}/mbstring-oniguruma-6.8.patch"
+	# hopefully upstream will include the same version check fixes in upcoming releases
+	# patch added 20180429
+	"${FILESDIR}/libressl-compatibility.patch"
+	"${FILESDIR}/php-freetype-2.9.1.patch"
+)
 
 PHP_MV="$(get_major_version)"
 
diff --git a/dev-lang/php/php-7.1.16.ebuild b/dev-lang/php/php-7.1.16.ebuild
index b2b182ff..dcd1650c 100644
--- a/dev-lang/php/php-7.1.16.ebuild
+++ b/dev-lang/php/php-7.1.16.ebuild
@@ -145,7 +145,13 @@ REQUIRED_USE="
 	mysql? ( || ( mysqli pdo ) )
 "
 
-PATCHES=( "${FILESDIR}/mbstring-oniguruma-6.8.patch" )
+PATCHES=(
+	"${FILESDIR}/mbstring-oniguruma-6.8.patch"
+	# hopefully upstream will include the same version check fixes in upcoming releases
+	# patch added 20180429
+	"${FILESDIR}/libressl-compatibility.patch"
+	"${FILESDIR}/php-freetype-2.9.1.patch"
+)
 
 PHP_MV="$(get_major_version)"