]> gitweb.michael.orlitzky.com - mjo-overlay.git/commitdiff
Add dev-lang/php::gentoo.
authorMichael Orlitzky <michael@orlitzky.com>
Mon, 12 Jan 2015 18:38:27 +0000 (13:38 -0500)
committerMichael Orlitzky <michael@orlitzky.com>
Fri, 23 Jan 2015 20:04:54 +0000 (15:04 -0500)
21 files changed:
dev-lang/php/Manifest [new file with mode: 0644]
dev-lang/php/files/20php5-envd [new file with mode: 0644]
dev-lang/php/files/70_mod_php5.conf-apache2 [new file with mode: 0644]
dev-lang/php/files/all_mysql_socket_location-gentoo.patch [new file with mode: 0644]
dev-lang/php/files/all_strict_aliasing.patch [new file with mode: 0644]
dev-lang/php/files/bison_any_version.patch [new file with mode: 0644]
dev-lang/php/files/bison_build_2.patch [new file with mode: 0644]
dev-lang/php/files/bison_build_2a.patch [new file with mode: 0644]
dev-lang/php/files/fix-libstdc++-underlinking.patch [new file with mode: 0644]
dev-lang/php/files/freetype-2.5.1-linking-fix.patch [new file with mode: 0644]
dev-lang/php/files/iodbc-pkgconfig-r1.patch [new file with mode: 0644]
dev-lang/php/files/iodbc-pkgconfig.patch [new file with mode: 0644]
dev-lang/php/files/missing-openssl-include.patch [new file with mode: 0644]
dev-lang/php/files/php-fpm-r1.conf [new file with mode: 0644]
dev-lang/php/files/php-fpm-r4.init [new file with mode: 0755]
dev-lang/php/files/php-fpm_at-simple.service [new file with mode: 0644]
dev-lang/php/files/php-fpm_at.service [new file with mode: 0644]
dev-lang/php/files/php5-ldvs [new file with mode: 0644]
dev-lang/php/files/stricter-libc-client-symlink-check.patch [new file with mode: 0644]
dev-lang/php/metadata.xml [new file with mode: 0644]
dev-lang/php/php-5.6.4.ebuild [new file with mode: 0644]

diff --git a/dev-lang/php/Manifest b/dev-lang/php/Manifest
new file mode 100644 (file)
index 0000000..af42ae6
--- /dev/null
@@ -0,0 +1,21 @@
+AUX 20php5-envd 145 SHA256 efaae9e6ae5f7010e073c2ab6d8a9dda009f0707c7d7b0c027e142c94f7041a4 SHA512 581aa86479e3cd584ee1bc6dc6d4a135fe8ec343fe5519566d728d81f7018cfb23658bd0c0368951d380982c75adbb4f45acf3c146868aaf4e4ec8e9f2fad1ce WHIRLPOOL b9cfe0e80ba437bbc6008223c268bdafcde306ba8083dce96815804f3e1ec0937706e0db091149785a0076a6c6eaab8f7dff28578b706e84b4bb4e67850a4ecd
+AUX 70_mod_php5.conf-apache2 348 SHA256 5bb8a45570582b4389a7d3feea0398e1c13ed4ced96e559b9406ed8c965dea8c SHA512 c74ec09c3c4124a15e14ece4bb769bb889466160cc0878ca3d55d5afc30fd4c05673c40428b75be669f72e82ba29f60ed19767caca77bba8adc12aae1c83f6f3 WHIRLPOOL fd503ec904a3853b90f8f4cc2042cf9014fdb1383a508d22e680559009b5b1e0beb5a09909a393e53868a64712c63e35642915787fa4176af07cb594adedb441
+AUX all_mysql_socket_location-gentoo.patch 633 SHA256 d1c0fcea4509cdb7504701e5b1996661483c3b5eea194c07fdaef91a1ce18a27 SHA512 cc55b3c1cd2e9fe4d4aa887146de9306afbbc44a3bd652225982cc04b9aefa8ca094448a765f52bc36e49726034cc702d9ef41e6da518946813103920f5ccf4e WHIRLPOOL e06c83a8852fcb1387a38774e91377464086a4908aee379d7196bc9ce2a76c6850399266aa0390e8f9885f6812c1ea717c8d98a4eb9949c3d86db357f95c18ac
+AUX all_strict_aliasing.patch 463 SHA256 9be7ef7f2727b48b0416ccc613430da95a92b59158bc7dd77f16bb8fa879efdd SHA512 6c9aacb2175a4ca3169360fd33bc9c3cb6a3631e316f7d834e8a0711248e38a90e3eb7b482e0ec79ba1971384f352ac1b88ec4caf2a6e412caf144d767cc7bed WHIRLPOOL 6e24b92eee6463f7f58e136c66bf5c0f3b2b3cfcffdecb0fe42e81fe3ee3a23b3451d933cc4ba5d9e04f819776d3d00b1eb496e5efa7786f399b88fec25ecf88
+AUX bison_any_version.patch 569 SHA256 251065c4e721180942fa89bb039c3eae74153bac8c7685f270715fc9822be590 SHA512 de8a39d84f67f3787dfa52fbdb17e2d32ef23be2a6f910c046640be3208a58cba9352bc0235f7c67a103e1bb5012806341b914fe8a456c90ec4b7c6608a9068d WHIRLPOOL fb2501e1c7a8fe7228f9f7abc86935544af6661b4d8a39ed0b29652551da627803038d459af2190664b19cc938fefd55d8f2a388b4e3ee1032f1dc3ee3c69ef3
+AUX bison_build_2.patch 652 SHA256 6821e773183d12c5e9f94df929f50561fbb885192fbff071bd931fc643c5bd44 SHA512 01ebb99e7ea922a56e925ea9cd7b9edfa31b34d63069e7f418c1bcae86c9f927f835646855537af37519d1b0d2558d43e3eee5a4a1622605349ab1e2314d2142 WHIRLPOOL 45efdda59efb1eaf1a7c8a3b955e8a0401390e48e1941c0eacf55b725680a037e8057495341cb22f00c8eae55d13f1bb4db7a3a2507bd6dceb52764c0ad82604
+AUX bison_build_2a.patch 584 SHA256 a4abbb9ae4a7e29b3c5d099929fd4041c810d061dd2bb6c6c94cb9542d727bd2 SHA512 fb3c1a7ce77b8f0241dd519fc5de97a193c195e0a04f82f56444d6822298bf049f9232eceff678816f480d184e2a02d0161bdc2cf42f42c1b88c462833b3ce28 WHIRLPOOL 8585552b0a4eda2c45003e8ce148ce8dfe8bb78a1f81eb517260db91b84e61d337a50ba089b5b8e4248081af6ad33dca3fe097d19999663792353954e9b40815
+AUX fix-libstdc++-underlinking.patch 264 SHA256 c174fbe838373d3fad9536c621685426c71ccfea73371889f60d7bed07efc230 SHA512 3b91b6917c8d452cbeaf98c445b989f1e0d2c86a02598b5e6647625289868eaf51eee253db8909fb5faada3b588f22b3bfee44b679d6257bcc00c067a80938d6 WHIRLPOOL b7024c2f478e79967e81f938d36689c2cd968b3db2a05f9ce3a57721cd3727046b300d1b436e73cd0ae31393d3e572164743ffe139d36798f41a3e88e86c4239
+AUX freetype-2.5.1-linking-fix.patch 2513 SHA256 feb2957ddebe50e4ea06d9a5686a0502246f87809678ad2271c9a128718c5cd8 SHA512 b1f94d5bbc42c6b321bfb5160820ec6e71a04e6ed38f482edf446d5d0988f2154a4f43e11443b5123960b49d9a00e29a3d62e3558cd2ebe271a7520f303e677d WHIRLPOOL dcdbd97def1f026970f7b594b99452ac409c5d4f77dfdba09a459b9a3ad14de820c1e56de54c2c84766166d091e3ef3c9b27292fe1a142a845c8e73605827e37
+AUX iodbc-pkgconfig-r1.patch 1824 SHA256 c832037a42bf0b3e8e0e478a91e103520d10e65769382f8261987cb5a1cdcc4e SHA512 4030b7a06e6dc8f6e18dd53853e503b46428935bdb1e5b49c0471d942daf41ba7b563d2a88012497eae4392cbf74d659ff321e481aad8d17d622485e46b4bc40 WHIRLPOOL cbf678c30c55c1a076400dc32b7551cdc3cddb77aae401c93f6395ee9fe0a4f6c6bc4acf98b394e1993d16bcb1f94978149ce3a16cb9e64b6cd8b899b5223180
+AUX iodbc-pkgconfig.patch 1820 SHA256 11c4e2f1d0c34bd5a7264fed11bb1786af0341e9756649d842ef90eadc815be8 SHA512 283c06aaa01aac76b71cd30bc5a1e882f14c02c63696c4a349a3338163a216e1adcc1149c9c5be8fbcb40554717406c8a9d6c5f8f8aa5c01a155b9993f280966 WHIRLPOOL 2057400bfeac10b115b5705eefb824e945305594ade2536c3d88c29b988a841bda29a4f0b41895df10e4696204c08327d4d2da33c6596a43ab798f83eabdcc95
+AUX missing-openssl-include.patch 456 SHA256 40d7a7de8dfde9844c12a03f96c2b4c78b08b776505f94abdddb6f5c7617454c SHA512 e6c663e508772e403e540fc900f752f18d12eef35526154716728da0ba89a8eb48f12bbb7611c0672f22a1d0b6814365e90ecabb8b8e78411816b8b8889f03ea WHIRLPOOL 258448576333077c14ba5181ab4e6de2ecc75d4811aeac5fc2e71ba22e8f4644db43998c50db6423cda55c82039c1f6cf5ee16ef79b84bd4c3161b33776b9936
+AUX php-fpm-r1.conf 12966 SHA256 c4308a92ade93812c6579b74a72cd1f3e1a35f7e63289722f461771d5702448c SHA512 3d421c1e8b8f6ecffbf8284a7f79a1e5cc3f0893b1a47f5ccd980d554b058c363c1e236aa3157c2b66791b3291c6e98981cc527d501328ccc3ccb34eee2950ef WHIRLPOOL 1f591597698e28fc47197e02ba680728363c50781d146cf2598403f4678781eabc4f4d2abe2c0bfe9a25065491d3cb514cc5a9dcee4edd9d9438f51181f43b2a
+AUX php-fpm-r4.init 1157 SHA256 37e34461babfb5881169f9729fbdde7d4aba533f123e2c480fe25ac3b863d3e7 SHA512 3555a2210104185b93b3805400995ed987076429c47b0950f58396c535d7ea99a5d2e7eedde071e2de06f4e248e0cb9bd27ccbf01b5606152a2f559fe874afbe WHIRLPOOL 6f5f0e45004275c7c984e68c293282db23461a64965b7d7c4a0ded682140177989ed50217aea6253178cc18fa9f9d202a69383400dc1a53271f00e85884849a1
+AUX php-fpm_at-simple.service 316 SHA256 c11d3bb213993ad27642abf2fb13ab8d9bd3fd8ffb6c863ca0baa057555a2fa6 SHA512 7367a3f8d3874f8e0c76f331ba613a0250db02f60ad9f87affaf448dcb5bc34bcecb91d88f415764a12b24b46ae3d1b738a002af9f77a4b707e916e83a0021fd WHIRLPOOL bf78a0e1bc22525de1bfa6896ceeb39932f4a1507820667f5216af10f8de205436a82abefe55d4776d911de99070e6f6ed3dacc1708288323d8ad789dab57fb9
+AUX php-fpm_at.service 317 SHA256 6bbbbd7b6501305c17b7290bb2a83b0ebe492d421adaac8f394e387ed52e0d25 SHA512 27982f9e2d958bfa75c89c7d3531e48d17fc388b1cdcbc8e09051b236b1184ee2baabdfcc567c19d9fcd067d4b3b86f171015616d8da42fccdabd89432d865e8 WHIRLPOOL c101ad8eb7446a6fcb3dba6ec6caae12bd6c0a9d251e222c392abb37314fbc252321bdc7db1696480050ce543a154b7257e503d3065d9e238d1c5c76a74d65ff
+AUX php5-ldvs 22 SHA256 b79d0e52b1b3b4543b31ad45525ae1c2814a27ea8e676772ab10bf6fb12dfe79 SHA512 689a0a12b3527741d2e47870c125e93be73a127e5e798c4b685ccb11653be5a8615faf3178c71a6346fe264d3c4ec76601bc05878fef67b9dbd2e45be59a344d WHIRLPOOL b24f193a1067f699c8efb199ba4e3f1fdd22c13dff98655206b30072ce8c8035fb4ed9288f694856f9978bd9935d3a5589cd968316920e712779c45b44897634
+AUX stricter-libc-client-symlink-check.patch 786 SHA256 bc80d286ce3b2805ce41e46580f24c5ba8f613b670757f81e6b2b638aecbf0df SHA512 db94207a3fd883f78b20fd9261720c39ad097566ae4dd913fe33a12adcedaab943ca0975a4f6a4917d40f6fde61e9b5928378ad91f3afe62d84aba3c9351db03 WHIRLPOOL 1ee44c69658d844614b31d09b8ce945075c9491703c04cb57aceec2469a97db65bf80871e4cf2ba6c9d9fe19a4305906e09d0cc474a635c9a1a6001a4d8c982a
+DIST php-5.6.4.tar.bz2 13498882 SHA256 576f9001b612f5ddc22f447311bbec321e2c959b6a52259d664c4ba04ef044f1 SHA512 855f885c2d8ad6393a8fb1bfacdb83f8eef910966e6ab50cb3fc4bcbd5800d4f69a6c866623b517a0163ab1984402206f7a32c54acddcd5f9bcdcf77eb04abdf WHIRLPOOL b93d618f54e32ce838ecede0cd1c7afd7bf00a50dfac0ac79827f4364142d2ad0433f6cc7325ee870961afb32ad827ddc4f5190301c20c038e720bdb7ee5d0cb
+EBUILD php-5.6.4.ebuild 22318 SHA256 27aa7ce3432dca3ab4f7f78081109858f370de55380c273c8418355bce899bd9 SHA512 393d7aa225d3e0579994c963a668f71d54030f603d867c1e9a54a9cb1ed175b9dee5ce3052e01e2513efaf6ad5b20111a84aaee7217186b2467224e8c1f434d4 WHIRLPOOL 95522df7cfa84cd58976e27f2a06087360a68125b10e17b6e1d79051af2a59fde34807d3eafe4f6675595f24d4070c983d27075139805d7e83ad436237eb202b
+MISC metadata.xml 1601 SHA256 0f0d69832d7bf8ca13c940247d67e184d866ae48f4f77167b3b6a508f4c0ebfe SHA512 744b80efb645e7c6e632101c98cb7bcaf2a6530d948e5cb320050cfe4ca3733e29b995e2b1e4677b648c7a9e051a8056c6f38ae03ae18656a9583b24c32b6056 WHIRLPOOL 8ba9c5edf403759541ea1aad65138f48ddc4e4bef73c3a43744e1d0513031ab431fe1e742a39125257c3545ae0a091118d1b36d04a28bdf96e9989185764ae50
diff --git a/dev-lang/php/files/20php5-envd b/dev-lang/php/files/20php5-envd
new file mode 100644 (file)
index 0000000..f6033ae
--- /dev/null
@@ -0,0 +1,2 @@
+MANPATH="/usr/lib/php5/man/"
+CONFIG_PROTECT_MASK="/etc/php/cli-php5/ext-active/ /etc/php/cgi-php5/ext-active/ /etc/php/apache2-php5/ext-active/"
diff --git a/dev-lang/php/files/70_mod_php5.conf-apache2 b/dev-lang/php/files/70_mod_php5.conf-apache2
new file mode 100644 (file)
index 0000000..7ec8739
--- /dev/null
@@ -0,0 +1,14 @@
+<IfDefine PHP5>
+       # Load the module first
+       <IfModule !mod_php5.c>
+               LoadModule php5_module    modules/libphp5.so
+       </IfModule>
+
+       # Set it to handle the files
+       <IfModule mod_mime.c>
+               AddHandler application/x-httpd-php .php .php5 .phtml
+               AddHandler application/x-httpd-php-source .phps
+       </IfModule>
+
+       DirectoryIndex index.php index.phtml
+</IfDefine>
diff --git a/dev-lang/php/files/all_mysql_socket_location-gentoo.patch b/dev-lang/php/files/all_mysql_socket_location-gentoo.patch
new file mode 100644 (file)
index 0000000..bd17998
--- /dev/null
@@ -0,0 +1,13 @@
+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
new file mode 100644 (file)
index 0000000..cfa6090
--- /dev/null
@@ -0,0 +1,14 @@
+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
new file mode 100644 (file)
index 0000000..94271e5
--- /dev/null
@@ -0,0 +1,16 @@
+--- ./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
new file mode 100644 (file)
index 0000000..dd2481d
--- /dev/null
@@ -0,0 +1,29 @@
+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
new file mode 100644 (file)
index 0000000..7dedd03
--- /dev/null
@@ -0,0 +1,30 @@
+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
new file mode 100644 (file)
index 0000000..a35305a
--- /dev/null
@@ -0,0 +1,10 @@
+--- 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
new file mode 100644 (file)
index 0000000..3b78f9b
--- /dev/null
@@ -0,0 +1,64 @@
+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
new file mode 100644 (file)
index 0000000..b215984
--- /dev/null
@@ -0,0 +1,52 @@
+--- 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
new file mode 100644 (file)
index 0000000..f32f8eb
--- /dev/null
@@ -0,0 +1,52 @@
+--- 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
new file mode 100644 (file)
index 0000000..28cc7dd
--- /dev/null
@@ -0,0 +1,14 @@
+--- 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-r1.conf b/dev-lang/php/files/php-fpm-r1.conf
new file mode 100644 (file)
index 0000000..0b0a7f8
--- /dev/null
@@ -0,0 +1,311 @@
+;;;;;;;;;;;;;;;;;;;;;
+; FPM Configuration ;
+;;;;;;;;;;;;;;;;;;;;;
+
+; All relative paths in this configuration file are relative to PHP's install
+; prefix (/usr/lib/php5.3). This prefix can be dynamicaly changed by using the
+; '-p' argument from the command line.
+
+; Include one or more files. If glob(3) exists, it is used to include a bunch of
+; files from a glob(3) pattern. This directive can be used everywhere in the
+; file.
+; Relative path can also be used. They will be prefixed by:
+;  - the global prefix if it's been set (-p arguement)
+;  - /usr/lib/php5.3 otherwise
+;include=/etc/php/fpm-php5.3/fpm.d/*.conf
+
+;;;;;;;;;;;;;;;;;;
+; Global Options ;
+;;;;;;;;;;;;;;;;;;
+
+[global]
+; Pid file
+; Note: the default prefix is /var/lib
+; Default Value: none
+; Warning: pid file is overriden by the Gentoo init script.
+; FPM will refuse to start if you uncomment this settingi and make use of the
+; init script. 
+; pid = /var/run/php-fpm.pid
+
+; Error log file
+; Note: the default prefix is /var/lib
+; Default Value: log/php-fpm.log
+error_log = /var/log/php-fpm.log
+
+; Log level
+; Possible Values: alert, error, warning, notice, debug
+; Default Value: notice
+;log_level = notice
+
+; If this number of child processes exit with SIGSEGV or SIGBUS within the time
+; interval set by emergency_restart_interval then FPM will restart. A value
+; of '0' means 'Off'.
+; Default Value: 0
+;emergency_restart_threshold = 0
+
+; Interval of time used by emergency_restart_interval to determine when 
+; a graceful restart will be initiated.  This can be useful to work around
+; accidental corruptions in an accelerator's shared memory.
+; Available Units: s(econds), m(inutes), h(ours), or d(ays)
+; Default Unit: seconds
+; Default Value: 0
+;emergency_restart_interval = 0
+
+; Time limit for child processes to wait for a reaction on signals from master.
+; Available units: s(econds), m(inutes), h(ours), or d(ays)
+; Default Unit: seconds
+; Default Value: 0
+;process_control_timeout = 0
+
+; Send FPM to background. Set to 'no' to keep FPM in foreground for debugging.
+; Default Value: yes
+;daemonize = yes
+
+;;;;;;;;;;;;;;;;;;;;
+; Pool Definitions ; 
+;;;;;;;;;;;;;;;;;;;;
+
+; Multiple pools of child processes may be started with different listening
+; ports and different management options.  The name of the pool will be
+; used in logs and stats. There is no limitation on the number of pools which
+; FPM can handle. Your system will tell you anyway :)
+
+; Start a new pool named 'www'.
+; the variable $pool can we used in any directive and will be replaced by the
+; pool name ('www' here)
+[www]
+
+; Per pool prefix
+; It only applies on the following directives:
+; - 'slowlog'
+; - 'listen' (unixsocket)
+; - 'chroot'
+; - 'chdir'
+; - 'php_values'
+; - 'php_admin_values'
+; When not set, the global prefix (or /usr/lib/php5.3) applies instead.
+; Note: This directive can also be relative to the global prefix.
+; Default Value: none
+;prefix = /path/to/pools/$pool
+
+; The address on which to accept FastCGI requests.
+; Valid syntaxes are:
+;   'ip.add.re.ss:port'    - to listen on a TCP socket to a specific address on
+;                            a specific port;
+;   'port'                 - to listen on a TCP socket to all addresses on a
+;                            specific port;
+;   '/path/to/unix/socket' - to listen on a unix socket.
+; Note: This value is mandatory.
+listen = 127.0.0.1:9000
+
+; Set listen(2) backlog. A value of '-1' means unlimited.
+; Default Value: 128 (-1 on FreeBSD and OpenBSD)
+;listen.backlog = -1
+; List of ipv4 addresses of FastCGI clients which are allowed to connect.
+; Equivalent to the FCGI_WEB_SERVER_ADDRS environment variable in the original
+; PHP FCGI (5.2.2+). Makes sense only with a tcp listening socket. Each address
+; must be separated by a comma. If this value is left blank, connections will be
+; accepted from any ip address.
+; Default Value: any
+;listen.allowed_clients = 127.0.0.1
+
+; Set permissions for unix socket, if one is used. In Linux, read/write
+; permissions must be set in order to allow connections from a web server. Many
+; BSD-derived systems allow connections regardless of permissions. 
+; Default Values: user and group are set as the running user
+;                 mode is set to 0666
+;listen.owner = nobody
+;listen.group = nobody
+;listen.mode = 0666
+
+; Unix user/group of processes
+; Note: The user is mandatory. If the group is not set, the default user's group
+;       will be used.
+user = nobody
+group = nobody
+
+; Choose how the process manager will control the number of child processes.
+; Possible Values:
+;   static  - a fixed number (pm.max_children) of child processes;
+;   dynamic - the number of child processes are set dynamically based on the
+;             following directives:
+;             pm.max_children      - the maximum number of children that can
+;                                    be alive at the same time.
+;             pm.start_servers     - the number of children created on startup.
+;             pm.min_spare_servers - the minimum number of children in 'idle'
+;                                    state (waiting to process). If the number
+;                                    of 'idle' processes is less than this
+;                                    number then some children will be created.
+;             pm.max_spare_servers - the maximum number of children in 'idle'
+;                                    state (waiting to process). If the number
+;                                    of 'idle' processes is greater than this
+;                                    number then some children will be killed.
+; Note: This value is mandatory.
+pm = dynamic
+
+; The number of child processes to be created when pm is set to 'static' and the
+; maximum number of child processes to be created when pm is set to 'dynamic'.
+; This value sets the limit on the number of simultaneous requests that will be
+; served. Equivalent to the ApacheMaxClients directive with mpm_prefork.
+; Equivalent to the PHP_FCGI_CHILDREN environment variable in the original PHP
+; CGI.
+; Note: Used when pm is set to either 'static' or 'dynamic'
+; Note: This value is mandatory.
+pm.max_children = 50
+
+; The number of child processes created on startup.
+; Note: Used only when pm is set to 'dynamic'
+; Default Value: min_spare_servers + (max_spare_servers - min_spare_servers) / 2
+;pm.start_servers = 20
+
+; The desired minimum number of idle server processes.
+; Note: Used only when pm is set to 'dynamic'
+; Note: Mandatory when pm is set to 'dynamic'
+pm.min_spare_servers = 5
+
+; The desired maximum number of idle server processes.
+; Note: Used only when pm is set to 'dynamic'
+; Note: Mandatory when pm is set to 'dynamic'
+pm.max_spare_servers = 35
+; The number of requests each child process should execute before respawning.
+; This can be useful to work around memory leaks in 3rd party libraries. For
+; endless request processing specify '0'. Equivalent to PHP_FCGI_MAX_REQUESTS.
+; Default Value: 0
+;pm.max_requests = 500
+
+; The URI to view the FPM status page. If this value is not set, no URI will be
+; recognized as a status page. By default, the status page shows the following
+; information:
+;   accepted conn        - the number of request accepted by the pool;
+;   pool                 - the name of the pool;
+;   process manager      - static or dynamic;
+;   idle processes       - the number of idle processes;
+;   active processes     - the number of active processes;
+;   total processes      - the number of idle + active processes.
+;   max children reached - number of times, the process limit has been reached,
+;                          when pm tries to start more children (works only for
+;                          pm 'dynamic')
+; The values of 'idle processes', 'active processes' and 'total processes' are
+; updated each second. The value of 'accepted conn' is updated in real time.
+; Example output:
+;   accepted conn:        12073
+;   pool:                 www
+;   process manager:      static
+;   idle processes:       35
+;   active processes:     65
+;   total processes:      100
+;   max children reached: 1
+; By default the status page output is formatted as text/plain. Passing either
+; 'html' or 'json' as a query string will return the corresponding output
+; syntax. Example:
+;   http://www.foo.bar/status
+;   http://www.foo.bar/status?json
+;   http://www.foo.bar/status?html
+; Note: The value must start with a leading slash (/). The value can be
+;       anything, but it may not be a good idea to use the .php extension or it
+;       may conflict with a real PHP file.
+; Default Value: not set 
+;pm.status_path = /status
+; The ping URI to call the monitoring page of FPM. If this value is not set, no
+; URI will be recognized as a ping page. This could be used to test from outside
+; that FPM is alive and responding, or to
+; - create a graph of FPM availability (rrd or such);
+; - remove a server from a group if it is not responding (load balancing);
+; - trigger alerts for the operating team (24/7).
+; Note: The value must start with a leading slash (/). The value can be
+;       anything, but it may not be a good idea to use the .php extension or it
+;       may conflict with a real PHP file.
+; Default Value: not set
+;ping.path = /ping
+
+; This directive may be used to customize the response of a ping request. The
+; response is formatted as text/plain with a 200 response code.
+; Default Value: pong
+;ping.response = pong
+; The timeout for serving a single request after which the worker process will
+; be killed. This option should be used when the 'max_execution_time' ini option
+; does not stop script execution for some reason. A value of '0' means 'off'.
+; Available units: s(econds)(default), m(inutes), h(ours), or d(ays)
+; Default Value: 0
+;request_terminate_timeout = 0
+; The timeout for serving a single request after which a PHP backtrace will be
+; dumped to the 'slowlog' file. A value of '0s' means 'off'.
+; Available units: s(econds)(default), m(inutes), h(ours), or d(ays)
+; Default Value: 0
+;request_slowlog_timeout = 0
+; The log file for slow requests
+; Default Value: not set
+; Note: slowlog is mandatory if request_slowlog_timeout is set
+;slowlog = /var/log/php-fpm-$pool.log.slow
+; Set open file descriptor rlimit.
+; Default Value: system defined value
+;rlimit_files = 1024
+; Set max core size rlimit.
+; Possible Values: 'unlimited' or an integer greater or equal to 0
+; Default Value: system defined value
+;rlimit_core = 0
+; Chroot to this directory at the start. This value must be defined as an
+; absolute path. When this value is not set, chroot is not used.
+; Note: you can prefix with '$prefix' to chroot to the pool prefix or one
+; of its subdirectories. If the pool prefix is not set, the global prefix
+; will be used instead.
+; Note: chrooting is a great security feature and should be used whenever 
+;       possible. However, all PHP paths will be relative to the chroot
+;       (error_log, sessions.save_path, ...).
+; Default Value: not set
+;chroot = 
+; Chdir to this directory at the start.
+; Note: relative path can be used.
+; Default Value: current directory or / when chroot
+;chdir = /var/www
+; Redirect worker stdout and stderr into main error log. If not set, stdout and
+; stderr will be redirected to /dev/null according to FastCGI specs.
+; Note: on highloaded environement, this can cause some delay in the page
+; process time (several ms).
+; Default Value: no
+;catch_workers_output = yes
+; Pass environment variables like LD_LIBRARY_PATH. All $VARIABLEs are taken from
+; the current environment.
+; Default Value: clean env
+;env[HOSTNAME] = $HOSTNAME
+;env[PATH] = /usr/local/bin:/usr/bin:/bin
+;env[TMP] = /tmp
+;env[TMPDIR] = /tmp
+;env[TEMP] = /tmp
+
+; Additional php.ini defines, specific to this pool of workers. These settings
+; overwrite the values previously defined in the php.ini. The directives are the
+; same as the PHP SAPI:
+;   php_value/php_flag             - you can set classic ini defines which can
+;                                    be overwritten from PHP call 'ini_set'. 
+;   php_admin_value/php_admin_flag - these directives won't be overwritten by
+;                                     PHP call 'ini_set'
+; For php_*flag, valid values are on, off, 1, 0, true, false, yes or no.
+
+; Defining 'extension' will load the corresponding shared extension from
+; extension_dir. Defining 'disable_functions' or 'disable_classes' will not
+; overwrite previously defined php.ini values, but will append the new value
+; instead.
+
+; Note: path INI options can be relative and will be expanded with the prefix
+; (pool, global or /usr/lib/php5.3)
+
+; Default Value: nothing is defined by default except the values in php.ini and
+;                specified at startup with the -d argument
+;php_admin_value[sendmail_path] = /usr/sbin/sendmail -t -i -f www@my.domain.com
+;php_flag[display_errors] = off
+;php_admin_value[error_log] = /var/log/fpm-php.www.log
+;php_admin_flag[log_errors] = on
+;php_admin_value[memory_limit] = 32M
diff --git a/dev-lang/php/files/php-fpm-r4.init b/dev-lang/php/files/php-fpm-r4.init
new file mode 100755 (executable)
index 0000000..a186d83
--- /dev/null
@@ -0,0 +1,47 @@
+#!/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-fpm_at-simple.service b/dev-lang/php/files/php-fpm_at-simple.service
new file mode 100644 (file)
index 0000000..5f0482e
--- /dev/null
@@ -0,0 +1,13 @@
+[Unit]
+Description=The PHP FastCGI Process Manager
+After=network.target
+
+[Service]
+Type=simple
+PIDFile=/run/php-fpm/php-fpm-%I.pid
+ExecStart=/usr/libexec/php-fpm-launcher php%I -y /etc/php/fpm-php%I/php-fpm.conf --nodaemonize
+ExecReload=/bin/kill -USR2 $MAINPID
+PrivateTmp=true
+
+[Install]
+WantedBy=multi-user.target
diff --git a/dev-lang/php/files/php-fpm_at.service b/dev-lang/php/files/php-fpm_at.service
new file mode 100644 (file)
index 0000000..152c1ab
--- /dev/null
@@ -0,0 +1,14 @@
+[Unit]
+Description=The PHP FastCGI Process Manager
+After=network.target
+
+[Service]
+Type=notify
+PIDFile=/run/php-fpm/php-fpm-%I.pid
+ExecStart=/usr/libexec/php-fpm-launcher php%I -y /etc/php/fpm-php%I/php-fpm.conf --nodaemonize
+ExecReload=/bin/kill -USR2 $MAINPID
+PrivateTmp=true
+
+[Install]
+WantedBy=multi-user.target
+
diff --git a/dev-lang/php/files/php5-ldvs b/dev-lang/php/files/php5-ldvs
new file mode 100644 (file)
index 0000000..783b0f6
--- /dev/null
@@ -0,0 +1 @@
+PHP_5 { global: *; };
diff --git a/dev-lang/php/files/stricter-libc-client-symlink-check.patch b/dev-lang/php/files/stricter-libc-client-symlink-check.patch
new file mode 100644 (file)
index 0000000..7cf3664
--- /dev/null
@@ -0,0 +1,15 @@
+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
diff --git a/dev-lang/php/metadata.xml b/dev-lang/php/metadata.xml
new file mode 100644 (file)
index 0000000..75bdf54
--- /dev/null
@@ -0,0 +1,29 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+       <herd>php</herd>
+       <use>
+               <flag name='cli'>Enable CLI SAPI</flag>
+               <flag name='embed'>Enable embed SAPI</flag>
+               <flag name='enchant'>Add supports Enchant spelling library.</flag>
+               <flag name='fileinfo'>Add fileinfo extension support</flag>
+               <flag name='filter'>Add filter extension support</flag>
+               <flag name='fpm'>Enable the FastCGI Process Manager SAPI</flag>
+               <flag name='gd'>Adds support for gd (bundled with PHP)</flag>
+               <flag name='hash'>Enable the hash extension</flag>
+               <flag name='json'>Enable JSON support</flag>
+               <flag name='ldap-sasl'>Add SASL support for the PHP LDAP extension</flag>
+               <flag name='mysqlnd'>Use native driver for mysql, mysqli, PDO_Mysql</flag>
+               <flag name='libmysqlclient'>Use libmyslclient driver for mysql, mysqli, PDO_Mysql (not recommended)</flag>
+               <flag name='intl'>Enables the intl extension for extended internalization support</flag>
+               <flag name='opcache'>Enables built-in opcode cache, replacing pecl-apc et.al</flag>
+               <flag name='pdo'>Enable the bundled PDO extensions</flag>
+               <flag name='phar'>Enables the phar extension to provide phar archive support</flag>
+               <flag name='sqlite2'>Add sqlite2 support. Will be removed</flag>
+               <flag name='xmlreader'>Enable XMLReader support</flag>
+               <flag name='xmlwriter'>Enable XMLWriter support</flag>
+               <flag name='xslt'>Enable the XSL extension</flag>
+               <flag name='vpx'>Enable webp suppoprt for GD</flag>
+               <flag name='zip'>Enable ZIP file support</flag>
+       </use>
+</pkgmetadata>
diff --git a/dev-lang/php/php-5.6.4.ebuild b/dev-lang/php/php-5.6.4.ebuild
new file mode 100644 (file)
index 0000000..5b3b76b
--- /dev/null
@@ -0,0 +1,784 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/php/php-5.6.4.ebuild,v 1.2 2014/12/28 15:27:17 titanofold Exp $
+
+EAPI=5
+
+inherit eutils autotools flag-o-matic versionator depend.apache apache-module db-use libtool systemd
+
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+
+function php_get_uri ()
+{
+       case "${1}" in
+               "php-pre")
+                       echo "http://downloads.php.net/dsp/${2}"
+               ;;
+               "php")
+                       echo "http://www.php.net/distributions/${2}"
+               ;;
+               "olemarkus")
+                       echo "http://dev.gentoo.org/~olemarkus/php/${2}"
+               ;;
+               "gentoo")
+                       echo "mirror://gentoo/${2}"
+               ;;
+               *)
+                       die "unhandled case in php_get_uri"
+               ;;
+       esac
+}
+
+PHP_MV="$(get_major_version)"
+SLOT="$(get_version_component_range 1-2)"
+
+# alias, so we can handle different types of releases (finals, rcs, alphas,
+# betas, ...) w/o changing the whole ebuild
+PHP_PV="${PV/_rc/RC}"
+PHP_PV="${PHP_PV/_alpha/alpha}"
+PHP_PV="${PHP_PV/_beta/beta}"
+PHP_RELEASE="php"
+[[ ${PV} == ${PV/_alpha/} ]] || PHP_RELEASE="php-pre"
+[[ ${PV} == ${PV/_beta/} ]] || PHP_RELEASE="php-pre"
+[[ ${PV} == ${PV/_rc/} ]] || PHP_RELEASE="php-pre"
+PHP_P="${PN}-${PHP_PV}"
+
+PHP_SRC_URI="$(php_get_uri "${PHP_RELEASE}" "${PHP_P}.tar.bz2")"
+
+PHP_FPM_CONF_VER="1"
+
+SRC_URI="${PHP_SRC_URI}"
+
+DESCRIPTION="The PHP language runtime engine: CLI, CGI, FPM/FastCGI, Apache2 and embed SAPIs"
+HOMEPAGE="http://php.net/"
+LICENSE="PHP-3"
+
+S="${WORKDIR}/${PHP_P}"
+
+# We can build the following SAPIs in the given order
+SAPIS="embed cli cgi fpm apache2"
+
+# SAPIs and SAPI-specific USE flags (cli SAPI is default on):
+IUSE="${IUSE}
+       ${SAPIS/cli/+cli}
+       threads"
+
+IUSE="${IUSE} bcmath berkdb bzip2 calendar cdb cjk
+       crypt +ctype curl debug
+       enchant exif frontbase +fileinfo +filter firebird
+       flatfile ftp gd gdbm gmp +hash +iconv imap inifile
+       intl iodbc ipv6 +json kerberos ldap ldap-sasl libedit mhash
+       mssql mysql libmysqlclient mysqli nls
+       oci8-instant-client odbc +opcache pcntl pdo +phar +posix postgres qdbm
+       readline recode selinux +session sharedmem
+       +simplexml snmp soap sockets spell sqlite ssl
+       sybase-ct sysvipc systemd tidy +tokenizer truetype unicode vpx wddx
+       +xml xmlreader xmlwriter xmlrpc xpm xslt zip zlib"
+
+DEPEND="
+       >=app-admin/eselect-php-0.7.1-r3[apache2?,fpm?]
+       >=dev-libs/libpcre-8.32[unicode]
+       apache2? ( || ( >=www-servers/apache-2.4[apache2_modules_unixd,threads=]
+               <www-servers/apache-2.4[threads=] ) )
+       berkdb? ( =sys-libs/db-4* )
+       bzip2? ( app-arch/bzip2 )
+       cdb? ( || ( dev-db/cdb dev-db/tinycdb ) )
+       cjk? ( !gd? (
+               virtual/jpeg:0
+               media-libs/libpng:0=
+               sys-libs/zlib
+       ) )
+       crypt? ( >=dev-libs/libmcrypt-2.4 )
+       curl? ( >=net-misc/curl-7.10.5 )
+       enchant? ( app-text/enchant )
+       exif? ( !gd? (
+               virtual/jpeg:0
+               media-libs/libpng:0=
+               sys-libs/zlib
+       ) )
+       firebird? ( dev-db/firebird )
+       gd? ( virtual/jpeg:0 media-libs/libpng:0= sys-libs/zlib )
+       gdbm? ( >=sys-libs/gdbm-1.8.0 )
+       gmp? ( >=dev-libs/gmp-4.1.2 )
+       iconv? ( virtual/libiconv )
+       imap? ( virtual/imap-c-client[ssl=] )
+       intl? ( dev-libs/icu:= )
+       iodbc? ( dev-db/libiodbc )
+       kerberos? ( virtual/krb5 )
+       ldap? ( >=net-nds/openldap-1.2.11 )
+       ldap-sasl? ( dev-libs/cyrus-sasl >=net-nds/openldap-1.2.11 )
+       libedit? ( || ( sys-freebsd/freebsd-lib dev-libs/libedit ) )
+       mssql? ( dev-db/freetds[mssql] )
+       libmysqlclient? (
+               mysql? ( virtual/mysql )
+               mysqli? ( >=virtual/mysql-4.1 )
+       )
+       nls? ( sys-devel/gettext )
+       oci8-instant-client? ( dev-db/oracle-instantclient-basic )
+       odbc? ( >=dev-db/unixODBC-1.8.13 )
+       postgres? ( dev-db/postgresql )
+       qdbm? ( dev-db/qdbm )
+       readline? ( sys-libs/readline )
+       recode? ( app-text/recode )
+       sharedmem? ( dev-libs/mm )
+       simplexml? ( >=dev-libs/libxml2-2.6.8 )
+       snmp? ( >=net-analyzer/net-snmp-5.2 )
+       soap? ( >=dev-libs/libxml2-2.6.8 )
+       spell? ( >=app-text/aspell-0.50 )
+       sqlite? ( >=dev-db/sqlite-3.7.6.3 )
+       ssl? ( >=dev-libs/openssl-0.9.7 )
+       sybase-ct? ( dev-db/freetds )
+       tidy? ( app-text/htmltidy )
+       truetype? (
+               =media-libs/freetype-2*
+               >=media-libs/t1lib-5.0.0
+               !gd? (
+                       virtual/jpeg:0 media-libs/libpng:0= sys-libs/zlib )
+       )
+       unicode? ( dev-libs/oniguruma )
+       vpx? ( media-libs/libvpx )
+       wddx? ( >=dev-libs/libxml2-2.6.8 )
+       xml? ( >=dev-libs/libxml2-2.6.8 )
+       xmlrpc? ( >=dev-libs/libxml2-2.6.8 virtual/libiconv )
+       xmlreader? ( >=dev-libs/libxml2-2.6.8 )
+       xmlwriter? ( >=dev-libs/libxml2-2.6.8 )
+       xpm? (
+               x11-libs/libXpm
+               virtual/jpeg:0
+               media-libs/libpng:0= sys-libs/zlib
+       )
+       xslt? ( dev-libs/libxslt >=dev-libs/libxml2-2.6.8 )
+       zip? ( sys-libs/zlib )
+       zlib? ( sys-libs/zlib )
+       virtual/mta
+"
+
+php="=${CATEGORY}/${PF}"
+
+REQUIRED_USE="
+       truetype? ( gd )
+       vpx? ( gd )
+       cjk? ( gd )
+       exif? ( gd )
+
+       xpm? ( gd )
+       gd? ( zlib )
+       simplexml? ( xml )
+       soap? ( xml )
+       wddx? ( xml )
+       xmlrpc? ( || ( xml iconv ) )
+       xmlreader? ( xml )
+       xslt? ( xml )
+       ldap-sasl? ( ldap )
+       mhash? ( hash )
+       phar? ( hash )
+       libmysqlclient? ( || (
+               mysql
+               mysqli
+               pdo
+       ) )
+
+       qdbm? ( !gdbm )
+       readline? ( !libedit )
+       recode? ( !imap !mysql !mysqli )
+       sharedmem? ( !threads )
+
+       !cli? ( !cgi? ( !fpm? ( !apache2? ( !embed? ( cli ) ) ) ) )"
+
+RDEPEND="${DEPEND}"
+
+RDEPEND="${RDEPEND}
+       fpm? (
+               selinux? ( sec-policy/selinux-phpfpm )
+               systemd? ( sys-apps/systemd ) )"
+
+DEPEND="${DEPEND}
+       sys-devel/flex
+       >=sys-devel/m4-1.4.3
+       >=sys-devel/libtool-1.5.18"
+
+# Allow users to install production version if they want to
+
+case "${PHP_INI_VERSION}" in
+       production|development)
+               ;;
+       *)
+               PHP_INI_VERSION="development"
+               ;;
+esac
+
+PHP_INI_UPSTREAM="php.ini-${PHP_INI_VERSION}"
+PHP_INI_FILE="php.ini"
+
+want_apache
+
+pkg_setup() {
+       depend.apache_pkg_setup
+}
+
+php_install_ini() {
+       local phpsapi="${1}"
+
+       # work out where we are installing the ini file
+       php_set_ini_dir "${phpsapi}"
+
+       local phpinisrc="${PHP_INI_UPSTREAM}-${phpsapi}"
+       cp "${PHP_INI_UPSTREAM}" "${phpinisrc}"
+
+       # default to /tmp for save_path, bug #282768
+       sed -e 's|^;session.save_path .*$|session.save_path = "'"${EPREFIX}"'/tmp"|g' -i "${phpinisrc}"
+
+       # Set the extension dir
+       sed -e "s|^extension_dir .*$|extension_dir = ${extension_dir}|g" -i "${phpinisrc}"
+
+       # Set the include path to point to where we want to find PEAR packages
+       sed -e 's|^;include_path = ".:/php/includes".*|include_path = ".:'"${EPREFIX}"'/usr/share/php'${PHP_MV}':'"${EPREFIX}"'/usr/share/php"|' -i "${phpinisrc}"
+
+       dodir "${PHP_INI_DIR#${EPREFIX}}"
+       insinto "${PHP_INI_DIR#${EPREFIX}}"
+       newins "${phpinisrc}" "${PHP_INI_FILE}"
+
+       elog "Installing php.ini for ${phpsapi} into ${PHP_INI_DIR#${EPREFIX}}"
+       elog
+
+       dodir "${PHP_EXT_INI_DIR#${EPREFIX}}"
+       dodir "${PHP_EXT_INI_DIR_ACTIVE#${EPREFIX}}"
+
+       if use_if_iuse opcache; then
+               elog "Adding opcache to $PHP_EXT_INI_DIR"
+               echo "zend_extension=${PHP_DESTDIR}/$(get_libdir)/opcache.so" >> "${D}/${PHP_EXT_INI_DIR}"/opcache.ini
+               dosym "${PHP_EXT_INI_DIR#${EPREFIX}}/opcache.ini" "${PHP_EXT_INI_DIR_ACTIVE#${EPREFIX}}/opcache.ini"
+       fi
+
+       # SAPI-specific handling
+
+       if [[ "${sapi}" == "fpm" ]] ; then
+               [[ -z ${PHP_FPM_CONF_VER} ]] && PHP_FPM_CONF_VER=0
+               einfo "Installing FPM CGI config file php-fpm.conf"
+               insinto "${PHP_INI_DIR#${EPREFIX}}"
+               newins "${FILESDIR}/php-fpm-r${PHP_FPM_CONF_VER}.conf" php-fpm.conf
+
+               # Remove bogus /etc/php-fpm.conf.default (bug 359906)
+               [[ -f "${ED}/etc/php-fpm.conf.default" ]] && rm "${ED}/etc/php-fpm.conf.default"
+       fi
+
+       # Install PHP ini files into /usr/share/php
+
+       dodoc php.ini-development
+       dodoc php.ini-production
+
+}
+
+php_set_ini_dir() {
+       PHP_INI_DIR="${EPREFIX}/etc/php/${1}-php${SLOT}"
+       PHP_EXT_INI_DIR="${PHP_INI_DIR}/ext"
+       PHP_EXT_INI_DIR_ACTIVE="${PHP_INI_DIR}/ext-active"
+}
+
+src_prepare() {
+       # USE=sharedmem (session/mod_mm to be exact) tries to mmap() this path
+       # ([empty session.save_path]/session_mm_[sapi][gid].sem)
+       # there is no easy way to circumvent that, all php calls during
+       # install use -n, so no php.ini file will be used.
+       # As such, this is the easiest way to get around
+       addpredict /session_mm_cli250.sem
+       addpredict /session_mm_cli0.sem
+
+       # Change PHP branding
+       # Get the alpha/beta/rc version
+       sed -re "s|^(PHP_EXTRA_VERSION=\").*(\")|\1-pl${PR/r/}-gentoo\2|g" \
+               -i configure.in || die "Unable to change PHP branding"
+
+       # Patch PHP to show Gentoo as the server platform
+       sed -e 's/PHP_UNAME=`uname -a | xargs`/PHP_UNAME=`uname -s -n -r -v | xargs`/g' \
+               -i configure.in || die "Failed to fix server platform name"
+
+       # Prevent PHP from activating the Apache config,
+       # as we will do that ourselves
+       sed -i \
+               -e "s,-i -a -n php${PHP_MV},-i -n php${PHP_MV},g" \
+               -e "s,-i -A -n php${PHP_MV},-i -n php${PHP_MV},g" \
+               configure sapi/apache2filter/config.m4 sapi/apache2handler/config.m4
+
+       # Patch PHP to support heimdal instead of mit-krb5
+       if has_version "app-crypt/heimdal" ; then
+               sed -e 's|gssapi_krb5|gssapi|g' -i acinclude.m4 \
+                       || die "Failed to fix heimdal libname"
+               sed -e 's|PHP_ADD_LIBRARY(k5crypto, 1, $1)||g' -i acinclude.m4 \
+                       || die "Failed to fix heimdal crypt library reference"
+       fi
+
+       #Add user patches #357637
+       epatch_user
+
+       #force rebuilding aclocal.m4
+       rm aclocal.m4
+       eautoreconf
+
+       if [[ ${CHOST} == *-darwin* ]] ; then
+               # http://bugs.php.net/bug.php?id=48795, bug #343481
+               sed -i -e '/BUILD_CGI="\\$(CC)/s/CC/CXX/' configure || die
+       fi
+}
+
+src_configure() {
+       addpredict /usr/share/snmp/mibs/.index
+       addpredict /var/lib/net-snmp/mib_indexes
+
+       PHP_DESTDIR="${EPREFIX}/usr/$(get_libdir)/php${SLOT}"
+
+       # This is a global variable and should be in caps. It isn't because the
+       # phpconfutils eclass relies on exactly this name...
+       # for --with-libdir see bug #327025
+       my_conf="
+               --prefix="${PHP_DESTDIR}"
+               --mandir="${PHP_DESTDIR}"/man
+               --infodir="${PHP_DESTDIR}"/info
+               --libdir="${PHP_DESTDIR}"/lib
+               --with-libdir=$(get_libdir)
+               --without-pear
+               $(use_enable threads maintainer-zts)"
+
+       #                             extension           USE flag        shared
+       my_conf+="
+       $(use_enable bcmath bcmath )
+       $(use_with bzip2 bz2 "${EPREFIX}"/usr)
+       $(use_enable calendar calendar )
+       $(use_enable ctype ctype )
+       $(use_with curl curl "${EPREFIX}"/usr)
+       $(use_enable xml dom )
+       $(use_with enchant enchant "${EPREFIX}"/usr)
+       $(use_enable exif exif )
+       $(use_enable fileinfo fileinfo )
+       $(use_enable filter filter )
+       $(use_enable ftp ftp )
+       $(use_with nls gettext "${EPREFIX}"/usr)
+       $(use_with gmp gmp "${EPREFIX}"/usr)
+       $(use_enable hash hash )
+       $(use_with mhash mhash "${EPREFIX}"/usr)
+       $(use_with iconv iconv $(use elibc_glibc || echo "${EPREFIX}"/usr))
+       $(use_enable intl intl )
+       $(use_enable ipv6 ipv6 )
+       $(use_enable json json )
+       $(use_with kerberos kerberos "${EPREFIX}"/usr)
+       $(use_enable xml libxml )
+       $(use_with xml libxml-dir "${EPREFIX}"/usr)
+       $(use_enable unicode mbstring )
+       $(use_with crypt mcrypt "${EPREFIX}"/usr)
+       $(use_with mssql mssql "${EPREFIX}"/usr)
+       $(use_with unicode onig "${EPREFIX}"/usr)
+       $(use_with ssl openssl "${EPREFIX}"/usr)
+       $(use_with ssl openssl-dir "${EPREFIX}"/usr)
+       $(use_enable pcntl pcntl )
+       $(use_enable phar phar )
+       $(use_enable pdo pdo )
+       $(use_enable opcache opcache )
+       $(use_with postgres pgsql "${EPREFIX}"/usr)
+       $(use_enable posix posix )
+       $(use_with spell pspell "${EPREFIX}"/usr)
+       $(use_with recode recode "${EPREFIX}"/usr)
+       $(use_enable simplexml simplexml )
+       $(use_enable sharedmem shmop )
+       $(use_with snmp snmp "${EPREFIX}"/usr)
+       $(use_enable soap soap )
+       $(use_enable sockets sockets )
+       $(use_with sqlite sqlite3 "${EPREFIX}"/usr)
+       $(use_with sybase-ct sybase-ct "${EPREFIX}"/usr)
+       $(use_enable sysvipc sysvmsg )
+       $(use_enable sysvipc sysvsem )
+       $(use_enable sysvipc sysvshm )
+       $(use_with systemd fpm-systemd)
+       $(use_with tidy tidy "${EPREFIX}"/usr)
+       $(use_enable tokenizer tokenizer )
+       $(use_enable wddx wddx )
+       $(use_enable xml xml )
+       $(use_enable xmlreader xmlreader )
+       $(use_enable xmlwriter xmlwriter )
+       $(use_with xmlrpc xmlrpc)
+       $(use_with xslt xsl "${EPREFIX}"/usr)
+       $(use_enable zip zip )
+       $(use_with zlib zlib "${EPREFIX}"/usr)
+       $(use_enable debug debug )"
+
+       # DBA support
+       if use cdb || use berkdb || use flatfile || use gdbm || use inifile \
+               || use qdbm ; then
+               my_conf="${my_conf} --enable-dba${shared}"
+       fi
+
+       # DBA drivers support
+       my_conf+="
+       $(use_with cdb cdb)
+       $(use_with berkdb db4 ${EPREFIX}/usr)
+       $(use_enable flatfile flatfile )
+       $(use_with gdbm gdbm ${EPREFIX}/usr)
+       $(use_enable inifile inifile )
+       $(use_with qdbm qdbm ${EPREFIX}/usr)"
+
+       # Support for the GD graphics library
+       my_conf+="
+       $(use_with truetype freetype-dir ${EPREFIX}/usr)
+       $(use_with truetype t1lib ${EPREFIX}/usr)
+       $(use_enable cjk gd-jis-conv )
+       $(use_with gd jpeg-dir ${EPREFIX}/usr)
+       $(use_with gd png-dir ${EPREFIX}/usr)
+       $(use_with xpm xpm-dir ${EPREFIX}/usr)
+       $(use_with vpx vpx-dir ${EPREFIX}/usr)"
+       # enable gd last, so configure can pick up the previous settings
+       my_conf+="
+       $(use_with gd gd)"
+
+       # IMAP support
+       if use imap ; then
+               my_conf+="
+               $(use_with imap imap ${EPREFIX}/usr)
+               $(use_with ssl imap-ssl ${EPREFIX}/usr)"
+       fi
+
+       # Interbase/firebird support
+
+       if use firebird ; then
+               my_conf+="
+               $(use_with firebird interbase ${EPREFIX}/usr)"
+       fi
+
+       # LDAP support
+       if use ldap ; then
+               my_conf+="
+               $(use_with ldap ldap ${EPREFIX}/usr)
+               $(use_with ldap-sasl ldap-sasl ${EPREFIX}/usr)"
+       fi
+
+       # MySQL support
+       local mysqllib="mysqlnd"
+       local mysqlilib="mysqlnd"
+       use libmysqlclient && mysqllib="${EPREFIX}/usr"
+       use libmysqlclient && mysqlilib="${EPREFIX}/usr/bin/mysql_config"
+
+       my_conf+=" $(use_with mysql mysql $mysqllib)"
+       my_conf+=" $(use_with mysqli mysqli $mysqlilib)"
+
+       local mysqlsock=" $(use_with mysql mysql-sock ${EPREFIX}/var/run/mysqld/mysqld.sock)"
+       if use mysql ; then
+               my_conf+="${mysqlsock}"
+       elif use mysqli ; then
+               my_conf+="${mysqlsock}"
+       fi
+
+       # ODBC support
+       if use odbc ; then
+               my_conf+="
+               $(use_with odbc unixODBC ${EPREFIX}/usr)"
+       fi
+
+       if use iodbc ; then
+               my_conf+="
+               $(use_with iodbc iodbc ${EPREFIX}/usr)"
+       fi
+
+       # Oracle support
+       if use oci8-instant-client ; then
+               my_conf+="
+               $(use_with oci8-instant-client oci8)"
+       fi
+
+       # PDO support
+       if use pdo ; then
+               my_conf+="
+               $(use_with mssql pdo-dblib )
+               $(use_with mysql pdo-mysql ${mysqllib})
+               $(use_with postgres pdo-pgsql )
+               $(use_with sqlite pdo-sqlite ${EPREFIX}/usr)
+               $(use_with odbc pdo-odbc unixODBC,${EPREFIX}/usr)"
+               if use oci8-instant-client ; then
+                       my_conf+="
+                       $(use_with oci8-instant-client pdo-oci)"
+               fi
+       fi
+
+       # readline/libedit support
+       my_conf+="
+       $(use_with readline readline ${EPREFIX}/usr)
+       $(use_with libedit libedit ${EPREFIX}/usr)"
+
+       # Session support
+       if use session ; then
+               my_conf+="
+               $(use_with sharedmem mm ${EPREFIX}/usr)"
+       else
+               my_conf+="
+               $(use_enable session session )"
+       fi
+
+       # Use pic for shared modules such as apache2's mod_php
+       my_conf="${my_conf} --with-pic"
+
+       # we use the system copy of pcre
+       # --with-pcre-regex affects ext/pcre
+       # --with-pcre-dir affects ext/filter and ext/zip
+       my_conf="${my_conf} --with-pcre-regex=${EPREFIX}/usr --with-pcre-dir=${EPREFIX}/usr"
+
+       # Catch CFLAGS problems
+       # Fixes bug #14067.
+       # Changed order to run it in reverse for bug #32022 and #12021.
+       replace-cpu-flags "k6*" "i586"
+
+       # Support user-passed configuration parameters
+       my_conf="${my_conf} ${EXTRA_ECONF:-}"
+
+       # Support the Apache2 extras, they must be set globally for all
+       # SAPIs to work correctly, especially for external PHP extensions
+
+       mkdir -p "${WORKDIR}/sapis-build"
+       for one_sapi in $SAPIS ; do
+               use "${one_sapi}" || continue
+               php_set_ini_dir "${one_sapi}"
+
+               cp -r "${S}" "${WORKDIR}/sapis-build/${one_sapi}"
+               cd "${WORKDIR}/sapis-build/${one_sapi}"
+
+               sapi_conf="${my_conf} --with-config-file-path=${PHP_INI_DIR}
+                       --with-config-file-scan-dir=${PHP_EXT_INI_DIR_ACTIVE}"
+
+               for sapi in $SAPIS ; do
+                       case "$sapi" in
+                               cli|cgi|embed|fpm)
+                                       if [[ "${one_sapi}" == "${sapi}" ]] ; then
+                                               sapi_conf="${sapi_conf} --enable-${sapi}"
+                                       else
+                                               sapi_conf="${sapi_conf} --disable-${sapi}"
+                                       fi
+                                       ;;
+
+                               apache2)
+                                       if [[ "${one_sapi}" == "${sapi}" ]] ; then
+                                               sapi_conf="${sapi_conf} --with-apxs2=${EPREFIX}/usr/sbin/apxs"
+                                       else
+                                               sapi_conf="${sapi_conf} --without-apxs2"
+                                       fi
+                                       ;;
+                       esac
+               done
+
+               econf ${sapi_conf}
+       done
+}
+
+src_compile() {
+       # snmp seems to run during src_compile, too (bug #324739)
+       addpredict /usr/share/snmp/mibs/.index
+       addpredict /var/lib/net-snmp/mib_indexes
+
+       for sapi in ${SAPIS} ; do
+               if use "${sapi}"; then
+                       cd "${WORKDIR}/sapis-build/$sapi" || "Failed to change dir to ${WORKDIR}/sapis-build/$1"
+                       emake || die "emake failed"
+               fi
+       done
+}
+
+src_install() {
+       # see bug #324739 for what happens when we don't have that
+       addpredict /usr/share/snmp/mibs/.index
+
+       # grab the first SAPI that got built and install common files from there
+       local first_sapi=""
+       for sapi in $SAPIS ; do
+               if use $sapi ; then
+                       first_sapi=$sapi
+                       break
+               fi
+       done
+
+       # Makefile forgets to create this before trying to write to it...
+       dodir "${PHP_DESTDIR#${EPREFIX}}/bin"
+
+       # Install php environment (without any sapis)
+       cd "${WORKDIR}/sapis-build/$first_sapi"
+       emake INSTALL_ROOT="${D}" \
+               install-build install-headers install-programs \
+               || die "emake install failed"
+
+       local extension_dir="$("${ED}/${PHP_DESTDIR#${EPREFIX}}/bin/php-config" --extension-dir)"
+
+       # Create the directory where we'll put version-specific php scripts
+       keepdir /usr/share/php${PHP_MV}
+
+       local sapi="", file=""
+       local sapi_list=""
+
+       for sapi in ${SAPIS}; do
+               if use "${sapi}" ; then
+                       einfo "Installing SAPI: ${sapi}"
+                       cd "${WORKDIR}/sapis-build/${sapi}"
+
+                       if [[ "${sapi}" == "apache2" ]] ; then
+                               # We're specifically not using emake install-sapi as libtool
+                               # may cause unnecessary relink failures (see bug #351266)
+                               insinto "${PHP_DESTDIR#${EPREFIX}}/apache2/"
+                               newins ".libs/libphp5$(get_libname)" "libphp${PHP_MV}$(get_libname)"
+                               keepdir "/usr/$(get_libdir)/apache2/modules"
+                       else
+                               # needed each time, php_install_ini would reset it
+                               local dest="${PHP_DESTDIR#${EPREFIX}}"
+                               into "${dest}"
+                               case "$sapi" in
+                                       cli)
+                                               source="sapi/cli/php"
+                                               ;;
+                                       cgi)
+                                               source="sapi/cgi/php-cgi"
+                                               ;;
+                                       fpm)
+                                               source="sapi/fpm/php-fpm"
+                                               ;;
+                                       embed)
+                                               source="libs/libphp${PHP_MV}$(get_libname)"
+                                               ;;
+                                       *)
+                                               die "unhandled sapi in src_install"
+                                               ;;
+                               esac
+
+                               if [[ "${source}" == *"$(get_libname)" ]]; then
+                                       dolib.so "${source}" || die "Unable to install ${sapi} sapi"
+                               else
+                                       dobin "${source}" || die "Unable to install ${sapi} sapi"
+                                       local name="$(basename ${source})"
+                                       dosym "${dest}/bin/${name}" "/usr/bin/${name}${SLOT}"
+                               fi
+                       fi
+
+                       php_install_ini "${sapi}"
+
+                       # construct correct SAPI string for php-config
+                       # thanks to ferringb for the bash voodoo
+                       if [[ "${sapi}" == "apache2" ]]; then
+                               sapi_list="${sapi_list:+${sapi_list} }apache2handler"
+                       else
+                               sapi_list="${sapi_list:+${sapi_list} }${sapi}"
+                       fi
+               fi
+       done
+
+       # Installing opcache module
+       if use_if_iuse opcache ; then
+               dolib.so "modules/opcache$(get_libname)" || die "Unable to install opcache module"
+       fi
+
+       # Install env.d files
+       newenvd "${FILESDIR}/20php5-envd" \
+               "20php${SLOT}"
+       sed -e "s|/lib/|/$(get_libdir)/|g" -i \
+               "${ED}/etc/env.d/20php${SLOT}"
+       sed -e "s|php5|php${SLOT}|g" -i \
+               "${ED}/etc/env.d/20php${SLOT}"
+
+       # set php-config variable correctly (bug #278439)
+       sed -e "s:^\(php_sapis=\)\".*\"$:\1\"${sapi_list}\":" -i \
+               "${ED}/usr/$(get_libdir)/php${SLOT}/bin/php-config"
+
+       if use fpm ; then
+               if use systemd; then
+                       systemd_newunit "${FILESDIR}/php-fpm_at.service" "php-fpm@${SLOT}.service"
+               else
+                       systemd_newunit "${FILESDIR}/php-fpm_at-simple.service" "php-fpm@${SLOT}.service"
+               fi
+       fi
+}
+
+src_test() {
+       echo ">>> Test phase [test]: ${CATEGORY}/${PF}"
+       PHP_BIN="${WORKDIR}/sapis-build/cli/sapi/cli/php"
+       if [[ ! -x "${PHP_BIN}" ]] ; then
+               ewarn "Test phase requires USE=cli, skipping"
+               return
+       else
+               export TEST_PHP_EXECUTABLE="${PHP_BIN}"
+       fi
+
+       if [[ -x "${WORKDIR}/sapis/cgi/php-cgi" ]] ; then
+               export TEST_PHP_CGI_EXECUTABLE="${WORKDIR}/sapis/cgi/php-cgi"
+       fi
+
+       REPORT_EXIT_STATUS=1 "${TEST_PHP_EXECUTABLE}" -n  -d "session.save_path=${T}" \
+               "${WORKDIR}/sapis-build/cli/run-tests.php" -n -q -d "session.save_path=${T}"
+
+       for name in ${EXPECTED_TEST_FAILURES}; do
+               mv "${name}.out" "${name}.out.orig" 2>/dev/null
+       done
+
+       local failed="$(find -name '*.out')"
+       if [[ ${failed} != "" ]] ; then
+               ewarn "The following test cases failed unexpectedly:"
+               for name in ${failed}; do
+                       ewarn "  ${name/.out/}"
+               done
+       else
+               einfo "No unexpected test failures, all fine"
+       fi
+
+       if [[ ${PHP_SHOW_UNEXPECTED_TEST_PASS} == "1" ]] ; then
+               local passed=""
+               for name in ${EXPECTED_TEST_FAILURES}; do
+                       [[ -f "${name}.diff" ]] && continue
+                       passed="${passed} ${name}"
+               done
+               if [[ ${passed} != "" ]] ; then
+                       einfo "The following test cases passed unexpectedly:"
+                       for name in ${passed}; do
+                               ewarn "  ${passed}"
+                       done
+               else
+                       einfo "None of the known-to-fail tests passed, all fine"
+               fi
+       fi
+}
+
+pkg_postinst() {
+       # Output some general info to the user
+       if use apache2 ; then
+               APACHE2_MOD_DEFINE="PHP5"
+               APACHE2_MOD_CONF="70_mod_php5"
+               apache-module_pkg_postinst
+       fi
+
+       # Create the symlinks for php
+       for m in ${SAPIS}; do
+               [[ ${m} == 'embed' ]] && continue;
+               if use $m ; then
+                       local ci=$(eselect php show $m)
+                       if [[ -z $ci ]]; then
+                               eselect php set $m php${SLOT}
+                               einfo "Switched ${m} to use php:${SLOT}"
+                               einfo
+                       elif [[ $ci != "php${SLOT}" ]] ; then
+                               elog "To switch $m to use php:${SLOT}, run"
+                               elog "    eselect php set $m php${SLOT}"
+                               elog
+                       fi
+               fi
+       done
+
+       elog "Make sure that PHP_TARGETS in ${EPREFIX}/etc/make.conf includes php${SLOT/./-} in order"
+       elog "to compile extensions for the ${SLOT} ABI"
+       elog
+       if ! use readline && use cli ; then
+               ewarn "Note that in order to use php interactivly, you need to enable"
+               ewarn "the readline USE flag or php -a will hang"
+       fi
+       elog
+       elog "This ebuild installed a version of php.ini based on php.ini-${PHP_INI_VERSION} version."
+       elog "You can chose which version of php.ini to install by default by setting PHP_INI_VERSION to either"
+       elog "'production' or 'development' in ${EPREFIX}/etc/make.conf"
+       elog "Both versions of php.ini can be found in ${EPREFIX}/usr/share/doc/${PF}"
+
+       elog
+       elog "For more details on how minor version slotting works (PHP_TARGETS) please read the upgrade guide:"
+       elog "http://www.gentoo.org/proj/en/php/php-upgrading.xml"
+       elog
+}
+
+pkg_prerm() {
+       eselect php cleanup
+}