Major cleanup of the ./files. Hopefully I did not break anything
authorOle Markus With <olemarkus@gentoo.org>
Tue, 8 Nov 2011 18:14:09 +0000 (18:14 +0000)
committerOle Markus With <olemarkus@gentoo.org>
Tue, 8 Nov 2011 18:14:09 +0000 (18:14 +0000)
Package-Manager: portage-2.2.0_alpha71/cvs/Linux x86_64

16 files changed:
dev-lang/php/ChangeLog
dev-lang/php/files/70_mod_php5.conf-apache2-r1 [deleted file]
dev-lang/php/files/eblits/pkg_postinst-v1.eblit [deleted file]
dev-lang/php/files/eblits/pkg_setup-v1.eblit [deleted file]
dev-lang/php/files/eblits/src_configure-snapshots.eblit [deleted file]
dev-lang/php/files/eblits/src_configure-v1.eblit [deleted file]
dev-lang/php/files/eblits/src_install-v1.eblit [deleted file]
dev-lang/php/files/eblits/src_install-v3.eblit
dev-lang/php/files/eblits/src_prepare-snapshots.eblit [deleted file]
dev-lang/php/files/php-fpm-gentooified-5.3.4.patch [deleted file]
dev-lang/php/files/php-fpm-gentooified.patch [deleted file]
dev-lang/php/files/php-fpm-r0.conf [deleted file]
dev-lang/php/files/php-fpm-r3.init [deleted file]
dev-lang/php/files/php-fpm.conf [deleted file]
dev-lang/php/php-5.4.0_beta1.ebuild [deleted file]
dev-lang/php/php-5.4.0_beta2.ebuild

index 2a5bc5647137a4e9a040f7e70f5cd89872419532..7701fba580a5da411805e49d47dc6bb3f9c9d44e 100644 (file)
@@ -1,6 +1,17 @@
 # ChangeLog for dev-lang/php
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/php/ChangeLog,v 1.518 2011/11/04 10:21:20 olemarkus Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/php/ChangeLog,v 1.519 2011/11/08 18:14:08 olemarkus Exp $
+
+  08 Nov 2011; Ole Markus With <olemarkus@gentoo.org>
+  -files/70_mod_php5.conf-apache2-r1, -files/eblits/src_install-v1.eblit,
+  php-5.4.0_beta2.ebuild, -files/eblits/pkg_postinst-v1.eblit,
+  -files/eblits/pkg_setup-v1.eblit, -files/php-fpm-gentooified-5.3.4.patch,
+  -php-5.4.0_beta1.ebuild, -files/eblits/src_configure-snapshots.eblit,
+  -files/eblits/src_configure-v1.eblit,
+  -files/eblits/src_prepare-snapshots.eblit, -files/php-fpm.conf,
+  -files/php-fpm-gentooified.patch, -files/php-fpm-r0.conf,
+  -files/php-fpm-r3.init, files/eblits/src_install-v3.eblit:
+  Major cleanup of the ./files. Hopefully I did not break anything
 
 *php-5.3.9_rc1 (04 Nov 2011)
 
diff --git a/dev-lang/php/files/70_mod_php5.conf-apache2-r1 b/dev-lang/php/files/70_mod_php5.conf-apache2-r1
deleted file mode 100644 (file)
index 50911ad..0000000
+++ /dev/null
@@ -1,17 +0,0 @@
-<IfDefine PHP5>
-       # Load the module first
-       <IfModule !mod_php5.c>
-               LoadModule php5_module    modules/libphp5.so
-       </IfModule>
-
-       # Set it to handle the files
-       <FilesMatch "\.ph(p5?|tml)$">
-               SetHandler application/x-httpd-php
-       </FilesMatch>
-
-       <FilesMatch "\.phps$">
-               SetHandler application/x-httpd-php-source
-       </FilesMatch>
-
-       DirectoryIndex index.php index.phtml
-</IfDefine>
diff --git a/dev-lang/php/files/eblits/pkg_postinst-v1.eblit b/dev-lang/php/files/eblits/pkg_postinst-v1.eblit
deleted file mode 100644 (file)
index 6a4bf86..0000000
+++ /dev/null
@@ -1,83 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/php/files/eblits/pkg_postinst-v1.eblit,v 1.5 2011/08/22 13:42:39 olemarkus Exp $
-
-eblit-php-pkg_postinst() {
-       # Output some general info to the user
-       if use apache2 ; then
-               APACHE2_MOD_DEFINE="PHP${PHP_MV}"
-               if use concurrentmodphp ; then
-                       APACHE2_MOD_CONF="70_mod_php${PHP_MV}_concurr"
-               else
-                       APACHE2_MOD_CONF="70_mod_php${PHP_MV}"
-               fi
-               apache-module_pkg_postinst
-       fi
-
-       # Update Apache2 to use mod_php
-       if use apache2 ; then
-               "${ROOT}/usr/sbin/php-select" -t apache2 php${PHP_MV} > /dev/null 2>&1
-               exitStatus=$?
-               if [[ ${exitStatus} == 2 ]] ; then
-                       php-select apache2 php${PHP_MV}
-               elif [[ ${exitStatus} == 4 ]] ; then
-                       ewarn "To make Apache2 use php-${PHP_MV}, use"
-                       ewarn "    php-select apache2 php${PHP_MV}"
-                       ewarn
-               fi
-       fi
-
-       # Create the symlinks for php-cli
-       if use cli ; then
-               "${ROOT}/usr/sbin/php-select" -t php php${PHP_MV} > /dev/null 2>&1
-               exitStatus=$?
-               if [[ ${exitStatus} == 5 ]] ; then
-                       php-select php php${PHP_MV}
-               elif [[ ${exitStatus} == 4 ]] ; then
-                       ewarn "To make usr/bin/php point to php-${PHP_MV}, use"
-                       ewarn "    php-select php php${PHP_MV}"
-                       ewarn
-               fi
-       fi
-
-       # Create the symlinks for php-cgi
-       if use cgi ; then
-               "${ROOT}/usr/sbin/php-select" -t php-cgi php${PHP_MV} > /dev/null 2>&1
-               exitStatus=$?
-               if [[ ${exitStatus} == 5 ]] ; then
-                       php-select php-cgi php${PHP_MV}
-               elif [[ ${exitStatus} == 4 ]] ; then
-                       ewarn "To make usr/bin/php-cgi point to php-${PHP_MV}, use"
-                       ewarn "    php-select php-cgi php${PHP_MV}"
-                       ewarn
-               fi
-       fi
-
-       # Create the symlinks for php-devel
-       "${ROOT}/usr/sbin/php-select" -t php-devel php${PHP_MV} > /dev/null 2>&1
-       exitStatus=$?
-       if [[ $exitStatus == 5 ]] ; then
-               php-select php-devel php${PHP_MV}
-       elif [[ $exitStatus == 4 ]] ; then
-               ewarn "To make usr/bin/php-config and usr/bin/phpize point to php-${PHP_MV}, use"
-               ewarn "    php-select php-devel php${PHP_MV}"
-               ewarn
-       fi
-
-       ewarn "You may have to recompile third-party extensions now"
-       ewarn "(includes every dev-php5/pecl-* package and probably others in that category)"
-       ewarn "Also make sure that you merge in the correct extension_dir ini setting for all your"
-       ewarn "php.ini files."
-       ewarn 
-       ewarn "Please read the upgrade guide: http://www.gentoo.org/proj/en/php/php-upgrading.xml"
-       ewarn
-
-       if ( [[ -z SUHOSIN_VERSION ]] && use suhosin ) ; then
-               ewarn "The suhosin USE flag now only installs the suhosin patch!"
-               ewarn "If you want the suhosin extension, make sure you install"
-               ewarn " dev-php5/suhosin"
-               ewarn
-       fi
-}
-
-
diff --git a/dev-lang/php/files/eblits/pkg_setup-v1.eblit b/dev-lang/php/files/eblits/pkg_setup-v1.eblit
deleted file mode 100644 (file)
index 8134d4b..0000000
+++ /dev/null
@@ -1,23 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/php/files/eblits/pkg_setup-v1.eblit,v 1.3 2011/03/17 16:34:47 olemarkus Exp $
-
-eblit-php-pkg_setup() {
-       if use concurrentmodphp || use kolab ; then
-               ewarn "concurrentmodphp and kolab are Gentoo-specific experimental"
-               ewarn "patches. Before reporting any bugs to bugs.php.net, make sure to"
-               ewarn "rebuild PHP with those USE flags disabled"
-               ewarn
-       fi
-
-       # Mail support
-       php_check_mta
-
-       # Oracle support
-       php_check_oracle_8
-
-       phpconfutils_warn_about_external_deps
-       depend.apache_pkg_setup
-}
-
-
diff --git a/dev-lang/php/files/eblits/src_configure-snapshots.eblit b/dev-lang/php/files/eblits/src_configure-snapshots.eblit
deleted file mode 100644 (file)
index d8682e8..0000000
+++ /dev/null
@@ -1,268 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/php/files/eblits/src_configure-snapshots.eblit,v 1.1 2011/05/15 19:17:23 olemarkus Exp $
-
-eblit-php-src_configure() {
-       PHP_DESTDIR="/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)"
-
-       phpconfutils_init
-
-       #                             extension       USE flag        shared
-       phpconfutils_extension_enable  "bcmath"       "bcmath"           1
-       phpconfutils_extension_with    "bz2"          "bzip2"            1
-       phpconfutils_extension_enable  "calendar"     "calendar"         1
-       phpconfutils_extension_disable "ctype"        "ctype"            0
-       phpconfutils_extension_with    "curl"         "curl"             1
-       phpconfutils_extension_with    "curlwrappers" "curlwrappers"     0
-       phpconfutils_extension_disable "dom"          "xml"              0
-       phpconfutils_extension_with    "enchant"      "enchant"          1 "/usr"
-       phpconfutils_extension_enable  "exif"         "exif"             1
-       phpconfutils_extension_disable "fileinfo"     "fileinfo"         1
-       phpconfutils_extension_disable "filter"       "filter"           0
-       phpconfutils_extension_enable  "ftp"          "ftp"              1
-       phpconfutils_extension_with    "gettext"      "nls"              1
-       phpconfutils_extension_with    "gmp"          "gmp"              1
-       phpconfutils_extension_disable "hash"         "hash"             0
-       phpconfutils_extension_with    "mhash"        "mhash"            0
-       phpconfutils_extension_without "iconv"        "iconv"            0
-       phpconfutils_extension_enable  "intl"         "intl"             1
-       phpconfutils_extension_disable "ipv6"         "ipv6"             0
-       phpconfutils_extension_disable "json"         "json"             0
-       phpconfutils_extension_with    "kerberos"     "kerberos"         0 "/usr"
-       phpconfutils_extension_disable "libxml"       "xml"              0
-       phpconfutils_extension_enable  "mbstring"     "unicode"          1
-       phpconfutils_extension_with    "mcrypt"       "crypt"            1
-       phpconfutils_extension_with    "mssql"        "mssql"            1
-       phpconfutils_extension_with    "onig"         "unicode"          0 "/usr"
-       phpconfutils_extension_with    "openssl"      "ssl"              0
-       phpconfutils_extension_with    "openssl-dir"  "ssl"              0 "/usr"
-       phpconfutils_extension_enable  "pcntl"        "pcntl"            1
-       phpconfutils_extension_disable "phar"         "phar"             1
-       phpconfutils_extension_disable "pdo"          "pdo"              0
-       phpconfutils_extension_with    "pgsql"        "postgres"         1
-       phpconfutils_extension_disable "posix"        "posix"            0
-       phpconfutils_extension_with    "pspell"       "spell"            1
-       phpconfutils_extension_with    "recode"       "recode"           1
-       phpconfutils_extension_disable "simplexml"    "simplexml"        0
-       phpconfutils_extension_enable  "shmop"        "sharedmem"        0
-       phpconfutils_extension_with    "snmp"         "snmp"             1
-       phpconfutils_extension_enable  "soap"         "soap"             1
-       phpconfutils_extension_enable  "sockets"      "sockets"          1
-       phpconfutils_extension_without "sqlite3"      "sqlite"           1 "/usr"
-       phpconfutils_extension_with    "sybase-ct"    "sybase-ct"        1 "/usr"
-       phpconfutils_extension_enable  "sysvmsg"      "sysvipc"          1
-       phpconfutils_extension_enable  "sysvsem"      "sysvipc"          1
-       phpconfutils_extension_enable  "sysvshm"      "sysvipc"          1
-       phpconfutils_extension_with    "tidy"         "tidy"             1
-       phpconfutils_extension_disable "tokenizer"    "tokenizer"        0
-       phpconfutils_extension_enable  "wddx"         "wddx"             1
-       phpconfutils_extension_disable "xml"          "xml"              0
-       phpconfutils_extension_disable "xmlreader"    "xmlreader"        0
-       phpconfutils_extension_disable "xmlwriter"    "xmlwriter"        0
-       phpconfutils_extension_with    "xmlrpc"       "xmlrpc"           1
-       phpconfutils_extension_with    "xsl"          "xsl"              1
-       phpconfutils_extension_enable  "zip"          "zip"              1
-       phpconfutils_extension_with    "zlib"         "zlib"             1
-       phpconfutils_extension_enable  "debug"        "debug"            0
-
-       # 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
-       phpconfutils_extension_with   "cdb"        "cdb"      0
-       phpconfutils_extension_with   "db4"        "berkdb"   0
-       phpconfutils_extension_enable "flatfile"   "flatfile" 0
-       phpconfutils_extension_with   "gdbm"       "gdbm"     0
-       phpconfutils_extension_enable "inifile"    "inifile"  0
-       phpconfutils_extension_with   "qdbm"       "qdbm"     0
-
-       # Support for the GD graphics library
-       if use gd-external ; then
-               phpconfutils_extension_with   "freetype-dir" "truetype"    0 "/usr"
-               phpconfutils_extension_with   "t1lib"        "truetype"    0 "/usr"
-               phpconfutils_extension_enable "gd-jis-conv"  "cjk"         0
-               phpconfutils_extension_with   "gd"           "gd-external" 1 "/usr"
-       else
-               phpconfutils_extension_with   "freetype-dir" "truetype"    0 "/usr"
-               phpconfutils_extension_with   "t1lib"        "truetype"    0 "/usr"
-               phpconfutils_extension_enable "gd-jis-conv"  "cjk"         0
-               phpconfutils_extension_with   "jpeg-dir"     "gd"          0 "/usr"
-               phpconfutils_extension_with   "png-dir"      "gd"          0 "/usr"
-               phpconfutils_extension_with   "xpm-dir"      "xpm"         0 "/usr"
-               # enable gd last, so configure can pick up the previous settings
-               phpconfutils_extension_with   "gd"           "gd"          0
-       fi
-
-       # IMAP support
-       if use imap ; then
-               phpconfutils_extension_with "imap"     "imap" 1
-               phpconfutils_extension_with "imap-ssl" "ssl"  0
-       fi
-
-       # Interbase/firebird support
-       if use interbase ; then
-               phpconfutils_extension_with "interbase" "interbase"     0 "/opt"
-       fi
-
-       if use firebird ; then
-               phpconfutils_extension_with     "interbase"     "firebird"      0 "/usr"
-       fi
-
-       # LDAP support
-       if use ldap ; then
-               if use oci8 ; then
-                       phpconfutils_extension_with "ldap" "ldap" 1 "${ORACLE_HOME}"
-               else
-                       phpconfutils_extension_with "ldap"      "ldap"      1
-                       phpconfutils_extension_with "ldap-sasl" "ldap-sasl" 0
-               fi
-       fi
-
-       # MySQL support
-       if use mysql ; then
-               if use mysqlnd ; then
-                       phpconfutils_extension_with "mysql"      "mysql" 1 "mysqlnd"
-               else
-                       phpconfutils_extension_with "mysql"      "mysql" 1 "/usr"
-               fi
-               phpconfutils_extension_with "mysql-sock" "mysql" 0 "/var/run/mysqld/mysqld.sock"
-       fi
-
-       # MySQLi support
-       if use mysqlnd ; then
-               phpconfutils_extension_with "mysqli" "mysqli" 1 "mysqlnd"
-       else
-               phpconfutils_extension_with "mysqli" "mysqli" 1 "/usr/bin/mysql_config"
-       fi
-
-       # ODBC support
-       if use odbc ; then
-               phpconfutils_extension_with "unixODBC" "odbc"     1 "/usr"
-               phpconfutils_extension_with "adabas"   "adabas"   1
-               phpconfutils_extension_with "birdstep" "birdstep" 1
-               phpconfutils_extension_with "dbmaker"  "dbmaker"  1
-               phpconfutils_extension_with "empress"  "empress"  1
-               if use empress ; then
-                       phpconfutils_extension_with "empress-bcs" "empress-bcs" 0
-               fi
-               phpconfutils_extension_with "esoob"   "esoob" 1
-               # Needed to run conftest for IBM DB2
-               [[ -n ${DB2_HOME} ]] && export LD_LIBRARY_PATH="${DB2_HOME}/`get_libdir`"
-               phpconfutils_extension_with "ibm-db2" "db2"   1 "${DB2_HOME}"
-               phpconfutils_extension_with "sapdb"   "sapdb" 1
-               phpconfutils_extension_with "solid"   "solid" 1
-       fi
-
-       if use iodbc ; then
-               phpconfutils_extension_with "iodbc"   "iodbc" 1 "/usr"
-       fi
-
-       # Oracle support
-       phpconfutils_extension_with "oci8" "oci8" 1
-       if use oci8-instant-client ; then
-               OCI8IC_PKG="$(best_version dev-db/oracle-instantclient-basic | \
-                       sed -e 's|dev-db/oracle-instantclient-basic-||g' | \
-                       sed -e 's|-r.*||g')"
-
-               phpconfutils_extension_with "oci8" "oci8-instant-client" 1 \
-                       "instantclient,/usr/lib/oracle/${OCI8IC_PKG}/client/lib"
-       fi
-
-       # PDO support
-       if use pdo ; then
-               phpconfutils_extension_with "pdo-dblib"  "mssql"    1
-               if use mysqlnd ; then
-                       phpconfutils_extension_with "pdo-mysql"  "mysql"    1 "mysqlnd"
-               else
-                       phpconfutils_extension_with "pdo-mysql"  "mysql"    1 "/usr"
-               fi
-               phpconfutils_extension_with "pdo-pgsql"  "postgres"     1
-               phpconfutils_extension_with "pdo-sqlite" "sqlite"   1 "/usr"
-               phpconfutils_extension_with "pdo-odbc"   "odbc"     1 "unixODBC,/usr"
-               if use oci8 ; then
-                       phpconfutils_extension_with "pdo-oci" "oci8" 1
-               fi
-               if use oci8-instant-client ; then
-                       phpconfutils_extension_with "pdo-oci" "oci8-instant-client" 1 \
-                               "instantclient,/usr,${OCI8IC_PKG}"
-               fi
-       fi
-
-       # readline/libedit support
-       phpconfutils_extension_with "readline" "readline" 0
-       phpconfutils_extension_with "libedit"  "libedit"  0
-
-       # Session support
-       if use session ; then
-               phpconfutils_extension_with "mm" "sharedmem" 0
-       else
-               phpconfutils_extension_disable "session" "session" 0
-       fi
-
-       if use pic ; then
-               my_conf="${my_conf} --with-pic"
-       fi
-
-       # 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=/usr --with-pcre-dir=/usr"
-
-       # Catch CFLAGS problems
-       php_check_cflags
-
-       # 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=/usr/sbin/apxs"
-                                       else
-                                               sapi_conf="${sapi_conf} --without-apxs2"
-                                       fi
-                                       ;;
-                       esac
-               done
-
-               econf ${sapi_conf}
-       done
-}
diff --git a/dev-lang/php/files/eblits/src_configure-v1.eblit b/dev-lang/php/files/eblits/src_configure-v1.eblit
deleted file mode 100644 (file)
index 09838bd..0000000
+++ /dev/null
@@ -1,280 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/php/files/eblits/src_configure-v1.eblit,v 1.8 2010/10/24 11:48:42 mabi Exp $
-
-eblit-php-src_configure() {
-       PHP_DESTDIR="/usr/$(get_libdir)/php${PHP_MV}"
-
-       # 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)"
-
-       phpconfutils_init
-
-       #                             extension       USE flag        shared
-       phpconfutils_extension_enable  "bcmath"       "bcmath"           1
-       phpconfutils_extension_with    "bz2"          "bzip2"            1
-       phpconfutils_extension_enable  "calendar"     "calendar"         1
-       phpconfutils_extension_disable "ctype"        "ctype"            0
-       phpconfutils_extension_with    "curl"         "curl"             1
-       phpconfutils_extension_with    "curlwrappers" "curlwrappers"     0
-       phpconfutils_extension_disable "dom"          "xml"              0
-       phpconfutils_extension_with    "enchant"      "enchant"          1 "/usr"
-       phpconfutils_extension_enable  "exif"         "exif"             1
-       phpconfutils_extension_disable "fileinfo"     "fileinfo"         1
-       phpconfutils_extension_disable "filter"       "filter"           0
-       phpconfutils_extension_enable  "ftp"          "ftp"              1
-       phpconfutils_extension_with    "gettext"      "nls"              1
-       phpconfutils_extension_with    "gmp"          "gmp"              1
-       phpconfutils_extension_disable "hash"         "hash"             0
-       phpconfutils_extension_without "iconv"        "iconv"            0
-       phpconfutils_extension_enable  "intl"         "intl"             1
-       phpconfutils_extension_disable "ipv6"         "ipv6"             0
-       phpconfutils_extension_disable "json"         "json"             0
-       phpconfutils_extension_with    "kerberos"     "kerberos"         0 "/usr"
-       phpconfutils_extension_disable "libxml"       "xml"              0
-       phpconfutils_extension_enable  "mbstring"     "unicode"          1
-       phpconfutils_extension_with    "mcrypt"       "crypt"            1
-       phpconfutils_extension_with    "mssql"        "mssql"            1
-       phpconfutils_extension_with    "onig"         "unicode"          0 "/usr"
-       phpconfutils_extension_with    "openssl"      "ssl"              0
-       phpconfutils_extension_with    "openssl-dir"  "ssl"              0 "/usr"
-       phpconfutils_extension_enable  "pcntl"        "pcntl"            1
-       phpconfutils_extension_disable "phar"         "phar"             1
-       phpconfutils_extension_disable "pdo"          "pdo"              0
-       phpconfutils_extension_with    "pgsql"        "postgres"         1
-       phpconfutils_extension_disable "posix"        "posix"            0
-       phpconfutils_extension_with    "pspell"       "spell"            1
-       phpconfutils_extension_with    "recode"       "recode"           1
-       phpconfutils_extension_disable "simplexml"    "simplexml"        0
-       phpconfutils_extension_enable  "shmop"        "sharedmem"        0
-       phpconfutils_extension_with    "snmp"         "snmp"             1
-       phpconfutils_extension_enable  "soap"         "soap"             1
-       phpconfutils_extension_enable  "sockets"      "sockets"          1
-       phpconfutils_extension_without "sqlite3"      "sqlite3"          1 "/usr"
-       phpconfutils_extension_with    "sybase-ct"    "sybase-ct"        1
-       phpconfutils_extension_enable  "sysvmsg"      "sysvipc"          1
-       phpconfutils_extension_enable  "sysvsem"      "sysvipc"          1
-       phpconfutils_extension_enable  "sysvshm"      "sysvipc"          1
-       phpconfutils_extension_with    "tidy"         "tidy"             1
-       phpconfutils_extension_disable "tokenizer"    "tokenizer"        0
-       phpconfutils_extension_enable  "wddx"         "wddx"             1
-       phpconfutils_extension_disable "xml"          "xml"              0
-       phpconfutils_extension_disable "xmlreader"    "xmlreader"        0
-       phpconfutils_extension_disable "xmlwriter"    "xmlwriter"        0
-       phpconfutils_extension_with    "xmlrpc"       "xmlrpc"           1
-       phpconfutils_extension_with    "xsl"          "xsl"              1
-       phpconfutils_extension_enable  "zip"          "zip"              1
-       phpconfutils_extension_with    "zlib"         "zlib"             1
-       phpconfutils_extension_enable  "debug"        "debug"            0
-
-       # 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
-       phpconfutils_extension_with   "cdb"        "cdb"      0
-       phpconfutils_extension_with   "db4"        "berkdb"   0
-       phpconfutils_extension_enable "flatfile"   "flatfile" 0
-       phpconfutils_extension_with   "gdbm"       "gdbm"     0
-       phpconfutils_extension_enable "inifile"    "inifile"  0
-       phpconfutils_extension_with   "qdbm"       "qdbm"     0
-
-       # Support for the GD graphics library
-       if use gd-external ; then
-               phpconfutils_extension_with   "freetype-dir" "truetype"    0 "/usr"
-               phpconfutils_extension_with   "t1lib"        "truetype"    0 "/usr"
-               phpconfutils_extension_enable "gd-jis-conv"  "cjk"         0
-               phpconfutils_extension_with   "gd"           "gd-external" 1 "/usr"
-       else
-               phpconfutils_extension_with   "freetype-dir" "truetype"    0 "/usr"
-               phpconfutils_extension_with   "t1lib"        "truetype"    0 "/usr"
-               phpconfutils_extension_enable "gd-jis-conv"  "cjk"         0
-               phpconfutils_extension_with   "jpeg-dir"     "gd"          0 "/usr"
-               phpconfutils_extension_with   "png-dir"      "gd"          0 "/usr"
-               phpconfutils_extension_with   "xpm-dir"      "xpm"         0 "/usr"
-               # enable gd last, so configure can pick up the previous settings
-               phpconfutils_extension_with   "gd"           "gd"          0
-       fi
-
-       # IMAP support
-       if use imap ; then
-               phpconfutils_extension_with "imap"     "imap" 1
-               phpconfutils_extension_with "imap-ssl" "ssl"  0
-       fi
-
-       phpconfutils_extension_with "interbase" "interbase"     0 "/opt"
-       phpconfutils_extension_with     "interbase"     "firebird"      0 "/usr"
-
-       # LDAP support
-       if use ldap ; then
-               if use oci8 ; then
-                       phpconfutils_extension_with "ldap" "ldap" 1 "${ORACLE_HOME}"
-               else
-                       phpconfutils_extension_with "ldap"      "ldap"      1
-                       phpconfutils_extension_with "ldap-sasl" "ldap-sasl" 0
-               fi
-       fi
-
-       # MySQL support
-       if use mysql ; then
-               if use mysqlnd ; then
-                       phpconfutils_extension_with "mysql"      "mysql" 1 "mysqlnd"
-               else
-                       phpconfutils_extension_with "mysql"      "mysql" 1 "/usr"
-               fi
-               phpconfutils_extension_with "mysql-sock" "mysql" 0 "/var/run/mysqld/mysqld.sock"
-       fi
-
-       # MySQLi support
-       if use mysqlnd ; then
-               phpconfutils_extension_with "mysqli" "mysqli" 1 "mysqlnd"
-       else
-               phpconfutils_extension_with "mysqli" "mysqli" 1 "/usr/bin/mysql_config"
-       fi
-
-       # ODBC support
-       if use odbc ; then
-               phpconfutils_extension_with "unixODBC" "odbc"     1 "/usr"
-               phpconfutils_extension_with "adabas"   "adabas"   1
-               phpconfutils_extension_with "birdstep" "birdstep" 1
-               phpconfutils_extension_with "dbmaker"  "dbmaker"  1
-               phpconfutils_extension_with "empress"  "empress"  1
-               if use empress ; then
-                       phpconfutils_extension_with "empress-bcs" "empress-bcs" 0
-               fi
-               phpconfutils_extension_with "esoob"   "esoob" 1
-               # Needed to run conftest for IBM DB2
-               [[ -n ${DB2_HOME} ]] && export LD_LIBRARY_PATH="${DB2_HOME}/`get_libdir`"
-               phpconfutils_extension_with "ibm-db2" "db2"   1 "${DB2_HOME}"
-               phpconfutils_extension_with "sapdb"   "sapdb" 1
-               phpconfutils_extension_with "solid"   "solid" 1
-       fi
-
-       if use iodbc ; then
-               phpconfutils_extension_with "iodbc"   "iodbc" 1 "/usr"
-       fi
-
-       # Oracle support
-       phpconfutils_extension_with "oci8" "oci8" 1
-       if use oci8-instant-client ; then
-               OCI8IC_PKG="$(best_version dev-db/oracle-instantclient-basic | \
-                       sed -e 's|dev-db/oracle-instantclient-basic-||g' | \
-                       sed -e 's|-r.*||g')"
-
-               phpconfutils_extension_with "oci8" "oci8-instant-client" 1 \
-                       "instantclient,/usr/lib/oracle/${OCI8IC_PKG}/client/lib"
-       fi
-
-       # PDO support
-       if use pdo ; then
-               phpconfutils_extension_with "pdo-dblib"  "mssql"    1
-               if use mysqlnd ; then
-                       phpconfutils_extension_with "pdo-mysql"  "mysql"    1 "mysqlnd"
-               else
-                       phpconfutils_extension_with "pdo-mysql"  "mysql"    1 "/usr"
-               fi
-               phpconfutils_extension_with "pdo-pgsql"  "postgres"     1
-               phpconfutils_extension_with "pdo-sqlite" "sqlite3"   1 "/usr"
-               phpconfutils_extension_with "pdo-odbc"   "odbc"     1 "unixODBC,/usr"
-               if use oci8 ; then
-                       phpconfutils_extension_with "pdo-oci" "oci8" 1
-               fi
-               if use oci8-instant-client ; then
-                       phpconfutils_extension_with "pdo-oci" "oci8-instant-client" 1 \
-                               "instantclient,/usr,${OCI8IC_PKG}"
-               fi
-       fi
-
-       # readline/libedit support
-       phpconfutils_extension_with "readline" "readline" 0
-       phpconfutils_extension_with "libedit"  "libedit"  0
-
-       # Session support
-       if use session ; then
-               phpconfutils_extension_with "mm" "sharedmem" 0
-       else
-               phpconfutils_extension_disable "session" "session" 0
-       fi
-
-       # SQLite support
-       if use sqlite ; then
-               phpconfutils_extension_with   "sqlite"      "sqlite"  0 "/usr"
-               phpconfutils_extension_enable "sqlite-utf8" "unicode" 0
-       else
-               phpconfutils_extension_without "sqlite" "sqlite" 0
-       fi
-
-       if use pic ; then
-               my_conf="${my_conf} --with-pic"
-       fi
-
-       if has fpm ${IUSE//+} && use fpm ; then
-               my_conf="${my_conf} --with-libevent-dir=/usr/`get_libdir`"
-       fi
-
-
-       # 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=/usr --with-pcre-dir=/usr"
-
-       # Catch CFLAGS problems
-       php_check_cflags
-
-       # 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
-       if use apache2 ; then
-               # Concurrent PHP Apache2 modules support
-               if use concurrentmodphp ; then
-                       append-ldflags "-Wl,--version-script=${FILESDIR}/php${PHP_MV}-ldvs"
-               fi
-       fi
-
-       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=/usr/sbin/apxs"
-                                       else
-                                               sapi_conf="${sapi_conf} --without-apxs2"
-                                       fi
-                                       ;;
-                       esac
-               done
-
-               econf ${sapi_conf}
-       done
-}
diff --git a/dev-lang/php/files/eblits/src_install-v1.eblit b/dev-lang/php/files/eblits/src_install-v1.eblit
deleted file mode 100644 (file)
index 225c8f4..0000000
+++ /dev/null
@@ -1,160 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/php/files/eblits/src_install-v1.eblit,v 1.12 2010/10/27 10:33:18 olemarkus Exp $
-
-eblit-php-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}/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="$("${D}/${PHP_DESTDIR}/bin/php-config" --extension-dir)"
-
-       # And install the modules to it
-       if use sharedext ; then
-               insinto "${extension_dir}"
-               doins "${WORKDIR}/sapis-build/${first_sapi}/modules/"*.so
-       fi
-
-       # Generate the USE file for PHP
-       phpconfutils_generate_usefile
-
-       # 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}"
-                       # needed each time, php_install_ini would reset it
-                       into "${PHP_DESTDIR}"
-                       file=$(find "${SAPI_DIR}/${sapi}/" -type f | head -n 1)
-
-                       if [[ "${file: -3}" == ".so" ]]; then 
-                               if [[ "${sapi}" == "apache2" ]]; then
-                                       insinto "${PHP_DESTDIR}/../apache2/modules/"
-                                       newins "${file}" "${file/*\/}"
-                               else
-                                       dolib.so "${file}" || die "Unable to install ${sapi} sapi"
-                               fi
-                       else
-                               dobin "${file}" || die "Unable to install ${sapi} sapi"
-                       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
-
-       # Install env.d files
-       newenvd "${FILESDIR}/20php${PHP_MV}-envd" \
-               "20php${PHP_MV}"
-       sed -e "s|/lib/|/$(get_libdir)/|g" -i \
-               "${D}/etc/env.d/20php${PHP_MV}"
-
-       # set php-config variable correctly (bug #278439)
-       sed -e "s:^\(php_sapis=\)\".*\"$:\1\"${sapi_list}\":" -i \
-               "${D}/usr/$(get_libdir)/php5/bin/php-config"
-}
-
-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 allow_url_open=Off, bug 332763
-       sed -e 's|^allow_url_fopen .*|allow_url_fopen = Off|g' -i "${phpinisrc}"
-
-       # default to expose_php=Off, bug 300695
-       sed -e 's|^expose_php .*|expose_php = Off|g' -i "${phpinisrc}"
-
-       # default to /tmp for save_path, bug #282768
-       sed -e 's|^;session.save_path .*$|session.save_path = "/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 = ".:/usr/share/php'${PHP_MV}':/usr/share/php"|' -i "${phpinisrc}"
-
-       dodir "${PHP_INI_DIR}"
-       insinto "${PHP_INI_DIR}"
-       newins "${phpinisrc}" "${PHP_INI_FILE}"
-
-       dodir "${PHP_EXT_INI_DIR}"
-       dodir "${PHP_EXT_INI_DIR_ACTIVE}"
-
-       # Install any extensions built as shared objects
-       if use sharedext ; then
-               insinto "${PHP_EXT_INI_DIR}"
-               for extension in "${D}/${extension_dir}/"*.so ; do
-                       extension="${extension##*/}"
-                       inifilename="${extension/.so/.ini}"
-                       echo "extension=${extension}" > "${WORKDIR}/sapis-build/${phpsapi}/modules/$inifilename"
-                       doins "${WORKDIR}/sapis-build/${phpsapi}/modules/$inifilename"
-                       dosym "${PHP_EXT_INI_DIR}/${inifilename}" "${PHP_EXT_INI_DIR_ACTIVE}/${inifilename}"
-               done
-       fi
-
-       # SAPI-specific handling
-       if [[ "${sapi}" == "apache2" ]] ; then
-               if use concurrentmodphp ; then
-                       einfo "Installing Apache2 config file 70_mod_php${PHP_MV}_concurr.conf"
-                       insinto "${APACHE_MODULES_CONFDIR}"
-                       newins "${FILESDIR}/70_mod_php${PHP_MV}_concurr.conf-apache2" \
-                               "70_mod_php${PHP_MV}_concurr.conf"
-
-                       # Put the ld version script in the right place so
-                       # it's always accessible
-                       insinto "/var/lib/php-pkg/${CATEGORY}/${PN}-${PVR}/"
-                       doins "${FILESDIR}/php${PHP_MV}-ldvs"
-               else
-                       einfo "Installing Apache2 config 70_mod_php${PHP_MV}.conf"
-                       insinto ${APACHE_MODULES_CONFDIR}
-                       newins "${FILESDIR}/70_mod_php${PHP_MV}.conf-apache2" \
-                               "70_mod_php${PHP_MV}.conf"
-               fi
-       fi
-
-       if [[ "${sapi}" == "fpm" ]] ; then
-               einfo "Installing FPM CGI config file php-fpm.conf"
-               epatch "${FILESDIR}/php-fpm-gentooified.patch"
-               insinto ${PHP_INI_DIR}
-               doins "${WORKDIR}/sapis-build/fpm/sapi/fpm/php-fpm.conf"
-               dodir "/etc/init.d"
-               insinto "/etc/init.d"
-               newins  "${FILESDIR}/php-fpm.init" "php-fpm"
-               fperms 755 "/etc/init.d/php-fpm"
-               dosym "${PHP_DESTDIR}/bin/php-fpm" "/usr/bin/php-fpm"
-       fi
-}
index 4f6eed209cc0d7ba5074f8d5823c0a30b5cabe4c..4c3ba241b9ec1b24b3f1fbb88bbdae85df2b26b5 100644 (file)
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/php/files/eblits/src_install-v3.eblit,v 1.4 2011/10/31 16:18:04 mabi Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/php/files/eblits/src_install-v3.eblit,v 1.5 2011/11/08 18:14:08 olemarkus Exp $
 
 eblit-php-src_install() {
        # see bug #324739 for what happens when we don't have that
@@ -132,12 +132,14 @@ php_install_ini() {
        fi
 
        if [[ "${sapi}" == "fpm" ]] ; then
+        [[ -z ${PHP_FPM_INIT_VER} ]] && PHP_FPM_INIT_VER=3
+        [[ -z ${PHP_FPM_CONF_VER} ]] && PHP_FPM_CONF_VER=0
                einfo "Installing FPM CGI config file php-fpm.conf"
                insinto ${PHP_INI_DIR}
-               doins "${FILESDIR}/php-fpm.conf"
+               newins "${FILESDIR}/php-fpm-r${PHP_FPM_CONF_VER}.conf" php-fpm.conf
                dodir "/etc/init.d"
                insinto "/etc/init.d"
-               newinitd "${FILESDIR}/php-fpm-r3.init" "php-fpm"
+               newinitd "${FILESDIR}/php-fpm-r${PHP_FPM_INIT_VER}.init" "php-fpm"
                #dosym "${PHP_DESTDIR}/bin/php-fpm" "/usr/bin/php-fpm"
                
                # Remove bogus /etc/php-fpm.conf.default (bug 359906)
diff --git a/dev-lang/php/files/eblits/src_prepare-snapshots.eblit b/dev-lang/php/files/eblits/src_prepare-snapshots.eblit
deleted file mode 100644 (file)
index 46d4393..0000000
+++ /dev/null
@@ -1,60 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/php/files/eblits/src_prepare-snapshots.eblit,v 1.2 2011/05/15 19:17:23 olemarkus Exp $
-
-eblit-php-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
-
-       # kolab support (support for imap annotations)
-       use kolab && epatch "${WORKDIR}/${PV}/opt/imap-kolab-annotations.patch"
-
-       # Change PHP branding
-       sed -re "s|^(PHP_EXTRA_VERSION=\").*(\")|\1${PHP_EXTRA_BRANDING}-pl${PR/r/}-gentoo\2|g" \
-               -i configure.in || die "Unable to change PHP branding"
-
-       # Apply generic PHP patches
-               EPATCH_SOURCE="${WORKDIR}/patches/generic" EPATCH_SUFFIX="patch" \
-               EPATCH_FORCE="yes" \
-               EPATCH_MULTI_MSG="Applying generic patches and fixes from upstream..." epatch
-
-       # 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
-
-       # Suhosin support
-       if [[ -n $SUHOSIN_VERSION ]] ; then
-               if use suhosin ; then
-                       epatch "${WORKDIR}/${SUHOSIN_PATCH}"
-               fi
-       else
-               ewarn "Please note that this version of PHP does not yet come with a suhosin patch"
-       fi
-
-       #Add user patches #357637
-       epatch_user
-       
-       #force rebuilding aclocal.m4
-       rm aclocal.m4
-       eautoreconf
-}
diff --git a/dev-lang/php/files/php-fpm-gentooified-5.3.4.patch b/dev-lang/php/files/php-fpm-gentooified-5.3.4.patch
deleted file mode 100644 (file)
index 1f401b3..0000000
+++ /dev/null
@@ -1,41 +0,0 @@
---- sapi/fpm/php-fpm.conf      2010-12-13 21:48:51.000000000 +0100
-+++ sapi/fpm/php-fpm.conf.new  2010-12-13 22:36:39.000000000 +0100
-@@ -12,7 +12,7 @@
- ; Relative path can also be used. They will be prefixed by:
- ;  - the global prefix if it's been set (-p arguement)
- ;  - /usr/lib64/php5.3 otherwise
--;include=etc/fpm.d/*.conf
-+;include=/etc/fpm-php5.3/fpm.d/*.conf
- 
- ;;;;;;;;;;;;;;;;;;
- ; Global Options ;
-@@ -22,12 +22,12 @@
- ; Pid file
- ; Note: the default prefix is /var/lib
- ; Default Value: none
--;pid = run/php-fpm.pid
-+pid = /var/run/php-fpm.pid
- 
- ; Error log file
- ; Note: the default prefix is /var/lib
- ; Default Value: log/php-fpm.log
--;error_log = log/php-fpm.log
-+error_log = /var/log/php-fpm.log
- 
- ; Log level
- ; Possible Values: alert, error, warning, notice, debug
-@@ -159,12 +159,12 @@
- ; 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
-+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
-+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
diff --git a/dev-lang/php/files/php-fpm-gentooified.patch b/dev-lang/php/files/php-fpm-gentooified.patch
deleted file mode 100644 (file)
index 3d7b9fe..0000000
+++ /dev/null
@@ -1,55 +0,0 @@
---- sapi/fpm/php-fpm.conf.orig 2010-06-03 21:04:30.000000000 +0200
-+++ sapi/fpm/php-fpm.conf      2010-06-03 22:40:41.000000000 +0200
-@@ -8,7 +8,7 @@
- ; 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.
--;include=/etc/fpm.d/*.conf
-+;include=/etc/php/fpm-php5/fpm.d/*.conf
- 
- ;;;;;;;;;;;;;;;;;;
- ; Global Options ;
-@@ -17,11 +17,11 @@
- [global]
- ; Pid file
- ; Default Value: none
--;pid = /var/lib/run/php-fpm.pid
-+;pid = /var/run/php-fpm.pid
- 
- ; Error log file
- ; Default Value: /var/lib/log/php-fpm.log
--;error_log = /var/lib/log/php-fpm.log
-+error_log = /var/log/php-fpm.log
- 
- ; Log level
- ; Possible Values: alert, error, warning, notice, debug
-@@ -133,17 +133,17 @@
- ; 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
-+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
-+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
-+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
-@@ -213,7 +213,7 @@
-  
- ; The log file for slow requests
- ; Default Value: /var/lib/log/php-fpm.log.slow
--;slowlog = /var/lib/log/php-fpm.log.slow
-+;slowlog = /var/log/php-fpm.log.slow
-  
- ; Set open file descriptor rlimit.
- ; Default Value: system defined value
diff --git a/dev-lang/php/files/php-fpm-r0.conf b/dev-lang/php/files/php-fpm-r0.conf
deleted file mode 100644 (file)
index ddef717..0000000
+++ /dev/null
@@ -1,310 +0,0 @@
-;;;;;;;;;;;;;;;;;;;;;
-; 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
-; Note: The Gentoo init script expects the pid path
-; to be set to /var/run/php-fpm.pid
-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-r3.init b/dev-lang/php/files/php-fpm-r3.init
deleted file mode 100755 (executable)
index 6152ac3..0000000
+++ /dev/null
@@ -1,40 +0,0 @@
-#!/sbin/runscript
-
-PHPSLOT="php5.3"
-
-PHP_FPM_CONF="/etc/php/fpm-${PHPSLOT}/php-fpm.conf"
-
-PHP_FPM_PID="/var/run/php-fpm.pid"
-
-opts="depend start stop reload"
-
-depend() {
-       need net
-       use apache2 lighttpd nginx
-}
-
-start() {
-        ebegin "Starting PHP FastCGI Process Manager"
-        start-stop-daemon --start --pidfile ${PHP_FPM_PID} --exec /usr/bin/php-fpm -- -y "${PHP_FPM_CONF}"
-        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"
-        start-stop-daemon --signal QUIT --stop --exec /usr/bin/php-fpm --pidfile ${PHP_FPM_PID}
-        eend $?
-}
-
-reload() {
-    ebegin "Reloading PHP FastCGI Process Manager"
-    [ -f ${PHP_FPM_PID} ] && kill -USR2 $(cat ${PHP_FPM_PID})
-    eend $?
-}
diff --git a/dev-lang/php/files/php-fpm.conf b/dev-lang/php/files/php-fpm.conf
deleted file mode 100644 (file)
index ddef717..0000000
+++ /dev/null
@@ -1,310 +0,0 @@
-;;;;;;;;;;;;;;;;;;;;;
-; 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
-; Note: The Gentoo init script expects the pid path
-; to be set to /var/run/php-fpm.pid
-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/php-5.4.0_beta1.ebuild b/dev-lang/php/php-5.4.0_beta1.ebuild
deleted file mode 100644 (file)
index dfba091..0000000
+++ /dev/null
@@ -1,329 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/php/php-5.4.0_beta1.ebuild,v 1.1 2011/09/16 07:04:41 olemarkus Exp $
-
-EAPI=4
-
-inherit eutils autotools flag-o-matic versionator depend.apache apache-module db-use libtool
-
-SUHOSIN_VERSION=""
-FPM_VERSION="builtin"
-EXPECTED_TEST_FAILURES=""
-
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
-
-function php_get_uri ()
-{
-       case "${1}" in
-               "php-stas")
-                       echo "http://downloads.php.net/stas/${2}"
-               ;;
-               "php-pre")
-                       echo "http://downloads.php.net/johannes/${2}"
-               ;;
-               "php")
-                       echo "http://www.php.net/distributions/${2}"
-               ;;
-               "suhosin")
-                       echo "http://download.suhosin.org/${2}"
-               ;;
-               "olemarkus")
-                       echo "http://olemarkus.org/~olemarkus/gentoo/${2}"
-               ;;
-               "gentoo")
-                       echo "mirror://gentoo/${2}"
-               ;;
-               *)
-                       die "unhandled case in php_get_uri"
-               ;;
-       esac
-}
-
-PHP_MV="$(get_major_version)"
-
-# 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="${PV/_alpha/alpha}"
-PHP_PV="${PV/_beta/beta}"
-PHP_RELEASE="php-stas"
-PHP_P="${PN}-${PHP_PV}"
-
-PHP_PATCHSET_LOC="olemarkus"
-
-PHP_SRC_URI="$(php_get_uri "${PHP_RELEASE}" "${PHP_P}.tar.bz2")"
-
-PHP_PATCHSET="0"
-PHP_PATCHSET_URI="
-       $(php_get_uri "${PHP_PATCHSET_LOC}" "php-patchset-${PV}-r${PHP_PATCHSET}.tar.bz2")"
-
-if [[ ${SUHOSIN_VERSION} == *-gentoo ]]; then
-       # in some cases we use our own suhosin patch (very recent version,
-       # patch conflicts, etc.)
-       SUHOSIN_TYPE="gentoo"
-else
-       SUHOSIN_TYPE="suhosin"
-fi
-
-if [[ -n ${SUHOSIN_VERSION} ]]; then
-       SUHOSIN_PATCH="suhosin-patch-${SUHOSIN_VERSION}.patch";
-       SUHOSIN_URI="$(php_get_uri ${SUHOSIN_TYPE} ${SUHOSIN_PATCH}.gz )"
-fi
-
-SRC_URI="
-       ${PHP_SRC_URI}
-       ${PHP_PATCHSET_URI}"
-
-if [[ -n ${SUHOSIN_VERSION} ]]; then
-       SRC_URI="${SRC_URI}
-               suhosin? ( ${SUHOSIN_URI} )"
-fi
-
-DESCRIPTION="The PHP language runtime engine: CLI, CGI, FPM/FastCGI, Apache2 and embed SAPIs."
-HOMEPAGE="http://php.net/"
-LICENSE="PHP-3"
-
-SLOT="$(get_version_component_range 1-2)"
-S="${WORKDIR}/${PHP_P}"
-
-# We can build the following SAPIs in the given order
-SAPIS="embed cli cgi fpm apache2"
-
-# Gentoo-specific, common features
-IUSE="kolab"
-
-# 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 curlwrappers debug doc
-       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 mysqlnd mysqli nls
-       oci8-instant-client odbc pcntl pdo +phar pic +posix postgres qdbm
-       readline recode +session sharedmem
-       +simplexml snmp soap sockets spell sqlite3 ssl
-       sybase-ct sysvipc tidy +tokenizer truetype unicode wddx
-       xml xmlreader xmlwriter xmlrpc xpm xsl zip zlib"
-
-# Enable suhosin if available
-[[ -n $SUHOSIN_VERSION ]] && IUSE="${IUSE} suhosin"
-
-DEPEND="!dev-lang/php:5
-       >=app-admin/eselect-php-0.6.2
-       >=dev-libs/libpcre-8.12[unicode]
-       apache2? ( www-servers/apache[threads=] )
-       berkdb? ( =sys-libs/db-4* )
-       bzip2? ( app-arch/bzip2 )
-       cdb? ( || ( dev-db/cdb dev-db/tinycdb ) )
-       cjk? ( !gd? (
-               virtual/jpeg
-               media-libs/libpng
-               sys-libs/zlib
-       ) )
-       crypt? ( >=dev-libs/libmcrypt-2.4 )
-       curl? ( >=net-misc/curl-7.10.5 )
-       enchant? ( app-text/enchant )
-       exif? ( !gd? (
-               virtual/jpeg
-               media-libs/libpng
-               sys-libs/zlib
-       ) )
-       firebird? ( dev-db/firebird )
-       gd? ( virtual/jpeg media-libs/libpng 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 )
-       kolab? ( >=net-libs/c-client-2004g-r1 )
-       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] )
-       !mysqlnd? (
-               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-base )
-       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 )
-       sqlite3? ( >=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 media-libs/libpng sys-libs/zlib )
-       )
-       unicode? ( dev-libs/oniguruma )
-       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
-               media-libs/libpng sys-libs/zlib
-       )
-       xsl? ( 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 )
-       cjk? ( gd )
-       exif? ( gd )
-
-       xpm? ( gd )
-       gd? ( zlib )
-       simplexml? ( xml )
-       soap? ( xml )
-       wddx? ( xml )
-       xmlrpc? ( || ( xml iconv ) )
-       xmlreader? ( xml )
-       xsl? ( xml )
-       ldap-sasl? ( ldap )
-       kolab? ( imap )
-       mhash? ( hash )
-       phar? ( hash )
-       mysqlnd? ( || (
-               mysql
-               mysqli
-               pdo
-       ) )
-
-       qdbm? ( !gdbm )
-       readline? ( !libedit )
-       recode? ( !imap !mysql !mysqli )
-       sharedmem? ( !threads )
-
-       !cli? ( !cgi? ( !fpm? ( !apache2? ( !embed? ( cli ) ) ) ) )"
-
-DEPEND="${DEPEND}
-       enchant? ( !dev-php5/pecl-enchant )
-       fileinfo? ( !<dev-php5/pecl-fileinfo-1.0.4-r2 )
-       filter? ( !dev-php5/pecl-filter )
-       json? ( !dev-php5/pecl-json )
-       phar? ( !dev-php5/pecl-phar )
-       zip? ( !dev-php5/pecl-zip )"
-
-[[ -n $SUHOSIN_VERSION ]] && RDEPEND="${RDEPEND} suhosin? (
-=${CATEGORY}/${PN}-${SLOT}*[unicode] )"
-
-DEPEND="${DEPEND}
-       sys-devel/flex
-       >=sys-devel/m4-1.4.3
-       >=sys-devel/libtool-1.5.18"
-
-# They are in PDEPEND because we need PHP installed first!
-PDEPEND="doc? ( app-doc/php-docs )"
-
-# No longer depend on the extension. The suhosin USE flag only installs the
-# patch
-#[[ -n $SUHOSIN_VERSION ]] && PDEPEND="${PDEPEND} suhosin? ( dev-php${PHP_MV}/suhosin )"
-
-# 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
-
-# eblit-core
-# Usage: <function> [version] [eval]
-# Main eblit engine
-eblit-core() {
-       [[ -z $FILESDIR ]] && FILESDIR="$(dirname $EBUILD)/files"
-       local e v func=$1 ver=$2 eval_=$3
-       for v in ${ver:+-}${ver} -${PVR} -${PV} "" ; do
-               e="${FILESDIR}/eblits/${func}${v}.eblit"
-               if [[ -e ${e} ]] ; then
-                       . "${e}"
-                       [[ ${eval_} == 1 ]] && eval "${func}() { eblit-run ${func} ${ver} ; }"
-                       return 0
-               fi
-       done
-       return 1
-}
-
-# eblit-include
-# Usage: [--skip] <function> [version]
-# Includes an "eblit" -- a chunk of common code among ebuilds in a given
-# package so that its functions can be sourced and utilized within the
-# ebuild.
-eblit-include() {
-       local skipable=false r=0
-       [[ $1 == "--skip" ]] && skipable=true && shift
-       [[ $1 == pkg_* ]] && skipable=true
-
-       [[ -z $1 ]] && die "Usage: eblit-include <function> [version]"
-       eblit-core $1 $2
-       r="$?"
-       ${skipable} && return 0
-       [[ "$r" -gt "0" ]] && die "Could not locate requested eblit '$1' in ${FILESDIR}/eblits/"
-}
-
-# eblit-run-maybe
-# Usage: <function>
-# Runs a function if it is defined in an eblit
-eblit-run-maybe() {
-       [[ $(type -t "$@") == "function" ]] && "$@"
-}
-
-# eblit-run
-# Usage: <function> [version]
-# Runs a function defined in an eblit
-eblit-run() {
-       eblit-include --skip common v2
-       eblit-include "$@"
-       eblit-run-maybe eblit-$1-pre
-       eblit-${PN}-$1
-       eblit-run-maybe eblit-$1-post
-}
-
-# eblit-pkg
-# Usage: <phase> [version]
-# Includes the given functions AND evals them so they're included in the binpkgs
-eblit-pkg() {
-       [[ -z $1 ]] && die "Usage: eblit-pkg <phase> [version]"
-       eblit-core $1 $2 1
-}
-
-eblit-pkg pkg_setup v3
-
-src_prepare() { eblit-run src_prepare v4 ; }
-src_configure() { eblit-run src_configure v3 ; }
-src_compile() { eblit-run src_compile v1 ; }
-src_install() { eblit-run src_install v3 ; }
-src_test() { eblit-run src_test v1 ; }
-pkg_postinst() { eblit-run pkg_postinst v2 ; }
index 1d259abd68a4b1f0ba5de609c7dcf8b5d6e728c5..60ae61a66ccae4cd17c183cdccfa0cde8579d44f 100644 (file)
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/php/php-5.4.0_beta2.ebuild,v 1.2 2011/10/31 16:18:04 mabi Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/php/php-5.4.0_beta2.ebuild,v 1.3 2011/11/08 18:14:08 olemarkus Exp $
 
 EAPI=4
 
@@ -57,6 +57,9 @@ PHP_PATCHSET="0"
 PHP_PATCHSET_URI="
        $(php_get_uri "${PHP_PATCHSET_LOC}" "php-patchset-${PV}-r${PHP_PATCHSET}.tar.bz2")"
 
+PHP_FPM_INIT_VER="4"
+PHP_FPM_CONF_VER="1"
+
 if [[ ${SUHOSIN_VERSION} == *-gentoo ]]; then
        # in some cases we use our own suhosin patch (very recent version,
        # patch conflicts, etc.)