dev-lang/php: remove old patch and init files.

Most of the patches in $FILESDIR are no longer being used. There's
also an old php-fpm-r4.init script that has been moved to
app-eselect/eselect-php. Get rid of them.

Package-Manager: portage-2.2.20.1

13 files changed, 0 insertions, 380 deletions

diff --git a/dev-lang/php/files/all_mysql_socket_location-gentoo.patch b/dev-lang/php/files/all_mysql_socket_location-gentoo.patch
deleted file mode 100644
index bd1799860145..000000000000
--- a/dev-lang/php/files/all_mysql_socket_location-gentoo.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff -u a/ext/mysqlnd/mysqlnd.c b/ext/mysqlnd/mysqlnd.c
---- a/ext/mysqlnd/mysqlnd.c	2010-10-22 17:46:26.000000000 +0200
-+++ b/ext/mysqlnd/mysqlnd.c	2010-12-08 21:54:47.000000000 +0100
-@@ -619,7 +619,8 @@
- 		if (host_len == sizeof("localhost") - 1 && !strncasecmp(host, "localhost", host_len)) {
- 			DBG_INF_FMT("socket=%s", socket_or_pipe? socket_or_pipe:"n/a");
- 			if (!socket_or_pipe) {
--				socket_or_pipe = "/tmp/mysql.sock";
-+				// gentoo mysql default socket location
-+				socket_or_pipe = "/var/run/mysqld/mysqld.sock";
- 			}
- 			transport_len = spprintf(&transport, 0, "unix://%s", socket_or_pipe);
- 			unix_socket = TRUE;
diff --git a/dev-lang/php/files/all_strict_aliasing.patch b/dev-lang/php/files/all_strict_aliasing.patch
deleted file mode 100644
index cfa609085e5e..000000000000
--- a/dev-lang/php/files/all_strict_aliasing.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-upstream bug: http://bugs.php.net/bug.php?id=46311
-The current patch follows a suggestion from Siarhei Siamashka
-Adapted for php 5.5
---- Zend/zend_execute.h.old	2013-01-01 13:49:04.587825704 +0100
-+++ Zend/zend_execute.h	2013-01-01 13:53:28.762958578 +0100
-@@ -293,7 +293,7 @@
-  	void **end = p - (int)(zend_uintptr_t)*p;
- 
- 	while (p != end) {
--		zval *q = *(zval **)(--p);
-+		zval *q = (zval *)*(--p);
- 		*p = NULL;
- 		i_zval_ptr_dtor(q ZEND_FILE_LINE_CC);
- 	}
diff --git a/dev-lang/php/files/bison_any_version.patch b/dev-lang/php/files/bison_any_version.patch
deleted file mode 100644
index 94271e51468b..000000000000
--- a/dev-lang/php/files/bison_any_version.patch
+++ /dev/null
@@ -1,16 +0,0 @@
---- ./Zend/acinclude.m4	2013-03-20 15:09:27.000000000 +0100
-+++ ./Zend/acinclude.m4.new	2013-03-25 21:35:27.654016588 +0100
-@@ -17,12 +17,7 @@
-       if test -n "$bison_version_vars"; then
-         set $bison_version_vars
-         bison_version="${1}.${2}"
--        for bison_check_version in $bison_version_list; do
--          if test "$bison_version" = "$bison_check_version"; then
--            php_cv_bison_version="$bison_check_version (ok)"
--            break
--          fi
--        done
-+        php_cv_bison_version="$bison_version (ok)"
-       fi
-     ])
-   fi
diff --git a/dev-lang/php/files/bison_build_2.patch b/dev-lang/php/files/bison_build_2.patch
deleted file mode 100644
index dd2481df8843..000000000000
--- a/dev-lang/php/files/bison_build_2.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-diff --git a/Zend/zend_language_parser.y b/Zend/zend_language_parser.y
-index ccbc9b1..6a9a24a 100644
---- a/Zend/zend_language_parser.y
-+++ b/Zend/zend_language_parser.y
-@@ -41,17 +41,19 @@ static YYSIZE_T zend_yytnamerr(char*, const char*);
- 
- #define YYERROR_VERBOSE
- #define YYSTYPE znode
--#ifdef ZTS
--# define YYPARSE_PARAM tsrm_ls
--# define YYLEX_PARAM tsrm_ls
--#endif
--
- 
- %}
- 
- %pure_parser
- %expect 3
- 
-+%code requires {
-+#ifdef ZTS
-+# define YYPARSE_PARAM tsrm_ls
-+# define YYLEX_PARAM tsrm_ls
-+#endif
-+}
-+
- %token END 0 "end of file"
- %left T_INCLUDE T_INCLUDE_ONCE T_EVAL T_REQUIRE T_REQUIRE_ONCE
- %token T_INCLUDE      "include (T_INCLUDE)"
diff --git a/dev-lang/php/files/bison_build_2a.patch b/dev-lang/php/files/bison_build_2a.patch
deleted file mode 100644
index 7dedd036bcaa..000000000000
--- a/dev-lang/php/files/bison_build_2a.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-Gentoo bug: #494240
-Upstream: #64503
-
---- Zend/zend_language_parser.y.orig	2013-12-14 12:25:43.528989017 +0100
-+++ Zend/zend_language_parser.y	2013-12-14 12:26:30.088988957 +0100
-@@ -38,10 +38,6 @@
- 
- #define YYERROR_VERBOSE
- #define YYSTYPE znode
--#ifdef ZTS
--# define YYPARSE_PARAM tsrm_ls
--# define YYLEX_PARAM tsrm_ls
--#endif
- 
- 
- %}
-@@ -49,6 +45,13 @@
- %pure_parser
- %expect 2
- 
-+%code requires {
-+#ifdef ZTS
-+# define YYPARSE_PARAM tsrm_ls
-+# define YYLEX_PARAM tsrm_ls
-+#endif
-+}
-+
- %left T_INCLUDE T_INCLUDE_ONCE T_EVAL T_REQUIRE T_REQUIRE_ONCE
- %left ','
- %left T_LOGICAL_OR
diff --git a/dev-lang/php/files/fix-libstdc++-underlinking.patch b/dev-lang/php/files/fix-libstdc++-underlinking.patch
deleted file mode 100644
index a35305a865b8..000000000000
--- a/dev-lang/php/files/fix-libstdc++-underlinking.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- acinclude.m4	2013-04-02 09:58:33.069274096 +0200
-+++ acinclude.m4.new	2013-04-02 09:58:25.221240142 +0200
-@@ -762,6 +762,7 @@
-   if test -z "$php_cxx_done"; then
-     AC_PROG_CXX
-     AC_PROG_CXXCPP
-+    PHP_ADD_LIBRARY(stdc++)
-     php_cxx_done=yes
-   fi
- ])
diff --git a/dev-lang/php/files/freetype-2.5.1-linking-fix.patch b/dev-lang/php/files/freetype-2.5.1-linking-fix.patch
deleted file mode 100644
index 3b78f9b309bb..000000000000
--- a/dev-lang/php/files/freetype-2.5.1-linking-fix.patch
+++ /dev/null
@@ -1,64 +0,0 @@
-From a0955f351c7eb1022da7ae36970ffef3b00c8aff Mon Sep 17 00:00:00 2001
-From: Adam Harvey <aharvey@php.net>
-Date: Sat, 7 Dec 2013 19:39:40 -0800
-Subject: [PATCH] Switch to using freetype-config for freetype detection.
-
-This fixes GD compilation against libfreetype 2.5.1 and later after they made
-the rather interesting decision to change their include directory layout in a
-point release.
-
-The original suggestion in the bug was to use pkg-config, but my inclination is
-to use freetype-config instead: we should be able to get the same configuration
-information without actually needing pkg-config installed, since pkg-config is
-by no means guaranteed to exist on many Unices and distros, whereas
-freetype-config should always be present if a libfreetype build environment is
-installed. Let's try it out and see what happens.
-
-Fixes bug #64405 (Use freetype-config for determining freetype2 dir(s)).
-
-diff --git a/ext/gd/config.m4 b/ext/gd/config.m4
-index 0e35ece..732e14c 100644
---- a/ext/gd/config.m4
-+++ b/ext/gd/config.m4
-@@ -193,30 +193,25 @@ 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/include/freetype2/freetype/freetype.h"; then
-+      if test -f "$i/bin/freetype-config"; then
-         FREETYPE2_DIR=$i
--        FREETYPE2_INC_DIR=$i/include/freetype2
-+        FREETYPE2_CONFIG="$i/bin/freetype-config"
-         break
-       fi
-     done
- 
-     if test -z "$FREETYPE2_DIR"; then
--      AC_MSG_ERROR([freetype.h not found.])
-+      AC_MSG_ERROR([freetype-config not found.])
-     fi
- 
--    PHP_CHECK_LIBRARY(freetype, FT_New_Face,
--    [
--      PHP_ADD_LIBRARY_WITH_PATH(freetype, $FREETYPE2_DIR/$PHP_LIBDIR, GD_SHARED_LIBADD)
--      PHP_ADD_INCLUDE($FREETYPE2_DIR/include)
--      PHP_ADD_INCLUDE($FREETYPE2_INC_DIR)
--      AC_DEFINE(USE_GD_IMGSTRTTF, 1, [ ])
--      AC_DEFINE(HAVE_LIBFREETYPE,1,[ ])
--      AC_DEFINE(ENABLE_GD_TTF,1,[ ])
--    ],[
--      AC_MSG_ERROR([Problem with freetype.(a|so). Please check config.log for more information.])
--    ],[
--      -L$FREETYPE2_DIR/$PHP_LIBDIR
--    ])
-+    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(USE_GD_IMGSTRTTF, 1, [ ])
-+    AC_DEFINE(HAVE_LIBFREETYPE,1,[ ])
-+    AC_DEFINE(ENABLE_GD_TTF,1,[ ])
-   else
-     AC_MSG_RESULT([If configure fails try --with-freetype-dir=<DIR>])
-   fi
diff --git a/dev-lang/php/files/iodbc-pkgconfig-r1.patch b/dev-lang/php/files/iodbc-pkgconfig-r1.patch
deleted file mode 100644
index b2159845008f..000000000000
--- a/dev-lang/php/files/iodbc-pkgconfig-r1.patch
+++ /dev/null
@@ -1,52 +0,0 @@
---- ext/odbc/config.m4.old	2013-04-06 11:26:04.047017826 +0200
-+++ ext/odbc/config.m4	2013-04-06 12:29:47.180617161 +0200
-@@ -366,22 +366,37 @@
- 
- if test -z "$ODBC_TYPE"; then
- PHP_ARG_WITH(iodbc,,
--[  --with-iodbc[=DIR]        Include iODBC support [/usr/local]])
-+[  --with-iodbc[=DIR]        Include iODBC support])
- 
-   if test "$PHP_IODBC" != "no"; then
-     AC_MSG_CHECKING(for iODBC support)
--    if test "$PHP_IODBC" = "yes"; then
--      PHP_IODBC=/usr/local
-+    if test -z "$PKG_CONFIG"; then
-+      AC_PATH_PROG(PKG_CONFIG, pkg-config, no)
-+    fi 
-+    if test -x "$PKG_CONFIG" && $PKG_CONFIG --exists libiodbc ; then
-+      PHP_ADD_LIBRARY_WITH_PATH(iodbc, $PHP_IODBC/$PHP_LIBDIR)
-+      ODBC_TYPE=iodbc
-+      ODBC_INCLUDE=`$PKG_CONFIG --cflags-only-I libiodbc`
-+      ODBC_LFLAGS=`$PKG_CONFIG --libs-only-L libiodbc`
-+      ODBC_LIBS=`$PKG_CONFIG --libs-only-l libiodbc`
-+      PHP_EVAL_INCLINE($ODBC_INCLUDE)
-+      AC_DEFINE(HAVE_IODBC,1,[ ])
-+      AC_DEFINE(HAVE_ODBC2,1,[ ])
-+      AC_MSG_RESULT([$ext_output])
-+    else
-+      if test "$PHP_IODBC" = "yes"; then
-+        PHP_IODBC=/usr/local
-+      fi
-+      PHP_ADD_LIBRARY_WITH_PATH(iodbc, $PHP_IODBC/$PHP_LIBDIR)
-+      PHP_ADD_INCLUDE($PHP_IODBC/include, 1)
-+      ODBC_TYPE=iodbc
-+      ODBC_INCLUDE=-I$PHP_IODBC/include
-+      ODBC_LFLAGS=-L$PHP_IODBC/$PHP_LIBDIR
-+      ODBC_LIBS=-liodbc
-+      AC_DEFINE(HAVE_IODBC,1,[ ])
-+      AC_DEFINE(HAVE_ODBC2,1,[ ])
-+      AC_MSG_RESULT([$ext_output])
-     fi
--    PHP_ADD_LIBRARY_WITH_PATH(iodbc, $PHP_IODBC/$PHP_LIBDIR)
--    PHP_ADD_INCLUDE($PHP_IODBC/include, 1)
--    ODBC_TYPE=iodbc
--    ODBC_INCLUDE=-I$PHP_IODBC/include
--    ODBC_LFLAGS=-L$PHP_IODBC/$PHP_LIBDIR
--    ODBC_LIBS=-liodbc
--    AC_DEFINE(HAVE_IODBC,1,[ ])
--    AC_DEFINE(HAVE_ODBC2,1,[ ])
--    AC_MSG_RESULT([$ext_output])
-   fi
- fi
- 
diff --git a/dev-lang/php/files/iodbc-pkgconfig.patch b/dev-lang/php/files/iodbc-pkgconfig.patch
deleted file mode 100644
index f32f8eb7ef14..000000000000
--- a/dev-lang/php/files/iodbc-pkgconfig.patch
+++ /dev/null
@@ -1,52 +0,0 @@
---- ext/odbc/config.m4.old	2013-04-06 11:26:04.047017826 +0200
-+++ ext/odbc/config.m4	2013-04-06 12:29:47.180617161 +0200
-@@ -366,22 +366,37 @@
- 
- if test -z "$ODBC_TYPE"; then
- PHP_ARG_WITH(iodbc,,
--[  --with-iodbc[=DIR]      Include iODBC support [/usr/local]])
-+[  --with-iodbc[=DIR]      Include iODBC support])
- 
-   if test "$PHP_IODBC" != "no"; then
-     AC_MSG_CHECKING(for iODBC support)
--    if test "$PHP_IODBC" = "yes"; then
--      PHP_IODBC=/usr/local
-+    if test -z "$PKG_CONFIG"; then
-+      AC_PATH_PROG(PKG_CONFIG, pkg-config, no)
-+    fi 
-+    if test -x "$PKG_CONFIG" && $PKG_CONFIG --exists libiodbc ; then
-+      PHP_ADD_LIBRARY_WITH_PATH(iodbc, $PHP_IODBC/$PHP_LIBDIR)
-+      ODBC_TYPE=iodbc
-+      ODBC_INCLUDE=`$PKG_CONFIG --cflags-only-I libiodbc`
-+      ODBC_LFLAGS=`$PKG_CONFIG --libs-only-L libiodbc`
-+      ODBC_LIBS=`$PKG_CONFIG --libs-only-l libiodbc`
-+      PHP_EVAL_INCLINE($ODBC_INCLUDE)
-+      AC_DEFINE(HAVE_IODBC,1,[ ])
-+      AC_DEFINE(HAVE_ODBC2,1,[ ])
-+      AC_MSG_RESULT([$ext_output])
-+    else
-+      if test "$PHP_IODBC" = "yes"; then
-+        PHP_IODBC=/usr/local
-+      fi
-+      PHP_ADD_LIBRARY_WITH_PATH(iodbc, $PHP_IODBC/$PHP_LIBDIR)
-+      PHP_ADD_INCLUDE($PHP_IODBC/include, 1)
-+      ODBC_TYPE=iodbc
-+      ODBC_INCLUDE=-I$PHP_IODBC/include
-+      ODBC_LFLAGS=-L$PHP_IODBC/$PHP_LIBDIR
-+      ODBC_LIBS=-liodbc
-+      AC_DEFINE(HAVE_IODBC,1,[ ])
-+      AC_DEFINE(HAVE_ODBC2,1,[ ])
-+      AC_MSG_RESULT([$ext_output])
-     fi
--    PHP_ADD_LIBRARY_WITH_PATH(iodbc, $PHP_IODBC/$PHP_LIBDIR)
--    PHP_ADD_INCLUDE($PHP_IODBC/include, 1)
--    ODBC_TYPE=iodbc
--    ODBC_INCLUDE=-I$PHP_IODBC/include
--    ODBC_LFLAGS=-L$PHP_IODBC/$PHP_LIBDIR
--    ODBC_LIBS=-liodbc
--    AC_DEFINE(HAVE_IODBC,1,[ ])
--    AC_DEFINE(HAVE_ODBC2,1,[ ])
--    AC_MSG_RESULT([$ext_output])
-   fi
- fi
- 
diff --git a/dev-lang/php/files/missing-openssl-include.patch b/dev-lang/php/files/missing-openssl-include.patch
deleted file mode 100644
index 28cc7dd64719..000000000000
--- a/dev-lang/php/files/missing-openssl-include.patch
+++ /dev/null
@@ -1,14 +0,0 @@
---- acinclude.m4	2012-11-17 21:53:06.346408695 +0100
-+++ acinclude.m4.new	2013-03-18 11:37:09.253432820 +0100
-@@ -2331,8 +2331,10 @@
-       AC_MSG_ERROR([OpenSSL version 0.9.6 or greater required.])
-     fi
- 
--    if test -n "$OPENSSL_LIBS" && test -n "$OPENSSL_INCS"; then
-+    if test -n "$OPENSSL_LIBS" ; then
-       PHP_EVAL_LIBLINE($OPENSSL_LIBS, $1)
-+    fi
-+    if test -n "$OPENSSL_INCS" ; then
-       PHP_EVAL_INCLINE($OPENSSL_INCS)
-     fi
-   fi
diff --git a/dev-lang/php/files/php-fpm-r4.init b/dev-lang/php/files/php-fpm-r4.init
deleted file mode 100644
index a186d83478c5..000000000000
--- a/dev-lang/php/files/php-fpm-r4.init
+++ /dev/null
@@ -1,47 +0,0 @@
-#!/sbin/runscript
-
-set_phpvars() {
-	PHPSLOT=${SVCNAME#php-fpm-}
-	[ ${PHPSLOT} = 'php-fpm' ] && PHPSLOT="$(eselect php show fpm)"
-
-	PHP_FPM_CONF="/etc/php/fpm-${PHPSLOT}/php-fpm.conf"
-	PHP_FPM_PID="/var/run/php-fpm-${PHPSLOT}.pid"
-}
-
-extra_commands="depend"
-extra_started_commands="reload"
-
-depend() {
-	need net
-	use apache2 lighttpd nginx
-}
-
-start() {
-        ebegin "Starting PHP FastCGI Process Manager"
-	set_phpvars
-        start-stop-daemon --start --pidfile ${PHP_FPM_PID} --exec \
-            /usr/lib/${PHPSLOT}/bin/php-fpm -- -y "${PHP_FPM_CONF}" -g "${PHP_FPM_PID}"
-        local i=0
-        local timeout=5
-        while [ ! -f ${PHP_FPM_PID} ] && [ $i -le $timeout ]; do
-            sleep 1
-            i=$(($i + 1))
-        done
-        
-        [ $timeout -gt $i ]
-        eend $?
-}
-
-stop() {
-        ebegin "Stopping PHP FastCGI Process Manager"
-	set_phpvars
-        start-stop-daemon --signal QUIT --stop --exec /usr/lib/${PHPSLOT}/bin/php-fpm --pidfile ${PHP_FPM_PID}
-        eend $?
-}
-
-reload() {
-    ebegin "Reloading PHP FastCGI Process Manager"
-    set_phpvars
-    [ -f ${PHP_FPM_PID} ] && kill -USR2 $(cat ${PHP_FPM_PID})
-    eend $?
-}
diff --git a/dev-lang/php/files/php-libvpx.patch b/dev-lang/php/files/php-libvpx.patch
deleted file mode 100644
index e23ae0efa534..000000000000
--- a/dev-lang/php/files/php-libvpx.patch
+++ /dev/null
@@ -1,24 +0,0 @@
---- ext/gd/libgd/webpimg.c.orig	2015-04-10 17:33:03.864937281 +0300
-+++ ext/gd/libgd/webpimg.c	2015-04-10 17:33:32.089873980 +0300
-@@ -706,14 +706,14 @@
-     codec_ctl(&enc, VP8E_SET_STATIC_THRESHOLD, 0);
-     codec_ctl(&enc, VP8E_SET_TOKEN_PARTITIONS, 2);
- 
--    vpx_img_wrap(&img, IMG_FMT_I420,
-+    vpx_img_wrap(&img, VPX_IMG_FMT_I420,
-                  y_width, y_height, 16, (uint8*)(Y));
--    img.planes[PLANE_Y] = (uint8*)(Y);
--    img.planes[PLANE_U] = (uint8*)(U);
--    img.planes[PLANE_V] = (uint8*)(V);
--    img.stride[PLANE_Y] = y_stride;
--    img.stride[PLANE_U] = uv_stride;
--    img.stride[PLANE_V] = uv_stride;
-+    img.planes[VPX_PLANE_Y] = (uint8*)(Y);
-+    img.planes[VPX_PLANE_U] = (uint8*)(U);
-+    img.planes[VPX_PLANE_V] = (uint8*)(V);
-+    img.stride[VPX_PLANE_Y] = y_stride;
-+    img.stride[VPX_PLANE_U] = uv_stride;
-+    img.stride[VPX_PLANE_V] = uv_stride;
- 
-     res = vpx_codec_encode(&enc, &img, 0, 1, 0, VPX_DL_BEST_QUALITY);
- 
diff --git a/dev-lang/php/files/stricter-libc-client-symlink-check.patch b/dev-lang/php/files/stricter-libc-client-symlink-check.patch
deleted file mode 100644
index 7cf36643c50b..000000000000
--- a/dev-lang/php/files/stricter-libc-client-symlink-check.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-Gentoo bugs: 88944 463800
---- ext/imap/config.m4	2013-03-27 19:31:13.000000000 +0100
-+++ ext/imap/config.m4.new	2013-03-30 18:34:17.581557062 +0100
-@@ -198,9 +198,9 @@
-       AC_MSG_ERROR(Cannot find rfc822.h. Please check your c-client installation.)
-     fi
- 
--    if test -r "$IMAP_DIR/c-client/c-client.a"; then
-+    if test ! -r "$IMAP_DIR/c-client/libc-client.a" && -r "$IMAP_DIR/c-client/c-client.a" ; then
-       ln -s "$IMAP_DIR/c-client/c-client.a" "$IMAP_DIR/c-client/libc-client.a" >/dev/null 2>&1
--    elif test -r "$IMAP_DIR/$PHP_LIBDIR/c-client.a"; then
-+    elif test ! -r "$IMAP_DIR/$PHP_LIBDIR/libc-client.a" && -r "$IMAP_DIR/$PHP_LIBDIR/c-client.a"; then
-       ln -s "$IMAP_DIR/$PHP_LIBDIR/c-client.a" "$IMAP_DIR/$PHP_LIBDIR/libc-client.a" >/dev/null 2>&1
-     fi
-