]> gitweb.michael.orlitzky.com - mjo-overlay.git/commitdiff
Bump other php stuff unrelated to the patch series.
authorMichael Orlitzky <michael@orlitzky.com>
Tue, 9 Jun 2015 00:41:14 +0000 (20:41 -0400)
committerMichael Orlitzky <michael@orlitzky.com>
Tue, 9 Jun 2015 00:41:14 +0000 (20:41 -0400)
dev-lang/php/Manifest
dev-lang/php/metadata.xml
dev-lang/php/php-5.6.4-r1.ebuild [deleted file]

index 6701140d3013343e88f924c7a9851182d64044f0..eab0a3deb745334e5e7fee856da015124d7facf6 100644 (file)
@@ -16,6 +16,6 @@ AUX php-fpm_at-simple.service 316 SHA256 c11d3bb213993ad27642abf2fb13ab8d9bd3fd8
 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-r1.ebuild 22799 SHA256 1a0ff754dfaf467f8fb97a6a64a321ff4361c74cd33947fae5ca94405db235bc SHA512 1bb22caa8eb7cb5d7c9fbd26d5bff915aa5ee2f2c6dd275c3293e68ac49b9ee0ab79a892322e2ff3e3a0efa4da4312d51f8186740edf856c0105c032c4873a8a WHIRLPOOL 047c9f37cda55524747356cb2e60372ed8ca515e77c6fb87d77278682d248ca085cb87eece3a49041188f161891ae398cd065e75c7eea27765d69e2653587c7a
-MISC metadata.xml 1973 SHA256 4a44090059ca302edf381da8ec9c01ae5e9ceae8d802b20a567ec76b6734ae2e SHA512 b508bebd869f171c866be6f241ee971fb15fd29f296aa7c4f5977eb8f9edcc4db067cfe05b336a554d0cf1cd95d87406247209090bcee996230e35ec0ec12d73 WHIRLPOOL a3833cf5ab8daa5af068b03af1878a264de8f13e4b769da6eb3752fe34b15c563321159ab746ac8f41ba8325605af72e0c62b946d113c4d9ec9a5f357174a0f3
+DIST php-5.6.9.tar.bz2 14037070 SHA256 19d3b87b7b8bba3be24cf6d757d16b723a98881c3af8d15469fd25501e9abcb9 SHA512 c00e0fdfc60a84e0a9ebe4702907b86b86a65efc72c26fa86abc1ed79afa21fb1eb10052c1fc2326f5cb9858878f62e1a39c1cd02ea2a96fb8f14c515b26389e WHIRLPOOL e561f0c183314e05ffb34f633eac0f638d1f81d6d0a1445390ffde7baad9ce8798605bdd9a51b1227177e6b0849f752cb342d7168cc94a465406149bfad45947
+EBUILD php-5.6.9.ebuild 22432 SHA256 5838196454599d0f78c2b7d4a2c9492aacb6d36e6bfab133e0365503e146f767 SHA512 c7eb554cecf9239612129d55430383199ccdaa6e4d2733856f50cc3fabbbefb228faa9ee6cbb82017b86588d3e0222c6ec6eb0a36fb79ed26b1bc4317148aedb WHIRLPOOL 6a68666f1d2d909ae69a821fc508173fdc17f476121c1f54caaf0f6cbe41bcc7faa1e77c5a8cd99dcd835aa01da83d090a590e455abb3a326554f97df0528baf
+MISC metadata.xml 1534 SHA256 56fa77301bf5ba18f2e07777f72f8a7db9db3a2f5ff1924edd31e8f0ba74b624 SHA512 9289b417f07dbd4e4c74fea12c86fc1fb193be2e6b8947a9163071de1e6f135882c29c98c84a1775f827e70448d78ad187cf610ad85a1f55b0e8ab237b094951 WHIRLPOOL 19b621c06c66eec29dd35ceee5858d6cbb9c71ad0978b2a5ed8f51939d757fb69e72ae9804255326c8651e2aa01724b7bb7c457541811b8b20f079e007b6e9b5
index 4bc8839cd7002f8b258b95e95b0ddcbdd3be0214..1acc97162f203a3bcba7406244ce8de9c479f509 100644 (file)
                <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='pdo-dblib'>Enable the DBLIB (MSSQL) PDO driver</flag>
-               <flag name='pdo-oci'>Enable the Oracle PDO driver</flag>
-               <flag name='pdo-odbc'>Enable the ODBC PDO driver</flag>
-               <flag name='pdo-mysql'>Enable the MySQL PDO driver</flag>
-               <flag name='pdo-pgsql'>Enable the PostgreSQL PDO driver</flag>
-               <flag name='pdo-sqlite'>Enable the SQLite PDO driver</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>
diff --git a/dev-lang/php/php-5.6.4-r1.ebuild b/dev-lang/php/php-5.6.4-r1.ebuild
deleted file mode 100644 (file)
index f7a181a..0000000
+++ /dev/null
@@ -1,768 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-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 pdo-dblib pdo-mysql pdo-oci
-       pdo-odbc pdo-pgsql pdo-sqlite +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"
-
-# See REQUIRED_USE for an explanation of why we duplicate dependencies
-# for USE=pdo-foo.
-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 )
-       )
-       nls? ( sys-devel/gettext )
-       oci8-instant-client? ( dev-db/oracle-instantclient-basic )
-       odbc? ( >=dev-db/unixODBC-1.8.13 )
-       pdo-dblib? ( dev-db/freetds[mssql] )
-       pdo-oci? ( dev-db/oracle-instantclient-basic )
-       pdo-odbc? ( >=dev-db/unixODBC-1.8.13 )
-       pdo-mysql? ( virtual/mysql )
-       pdo-pgsql? ( dev-db/postgresql )
-       pdo-sqlite? ( >=dev-db/sqlite-3.7.6.3 )
-       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}"
-
-# All of the pdo-foo USE flags could require USE=foo, but this has an
-# unwanted side effect. USE=mysql, for example, also enables the old
-# deprecated mysql database driver. We would like it to be possible to
-# install pdo-mysql without the deprecated mysql driver, so we don't
-# require USE=mysql with USE=pdo-mysql. This means that we have to
-# reproduce the mysql? (...) dependencies for pdo-mysql in (R)DEPEND
-# above.
-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-mysql
-       ) )
-
-       pdo-dblib? ( pdo )
-       pdo-oci? ( pdo )
-       pdo-odbc? ( pdo )
-       pdo-mysql? ( pdo )
-       pdo-pgsql? ( pdo )
-       pdo-sqlite? ( 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_with   crypt mcrypt "${EPREFIX}"/usr)
-       $(use_enable ctype ctype )
-       $(use_with   curl curl "${EPREFIX}"/usr)
-       $(use_enable debug debug )
-       $(use_with   enchant enchant "${EPREFIX}"/usr)
-       $(use_enable exif exif )
-       $(use_enable fileinfo fileinfo )
-       $(use_enable filter filter )
-       $(use_with   firebird interbase "${EPREFIX}"/usr)
-       $(use_enable ftp ftp )
-       $(use_with   gmp gmp "${EPREFIX}"/usr)
-       $(use_enable hash hash )
-       $(use_with   iconv iconv $(use elibc_glibc || echo "${EPREFIX}"/usr))
-       $(use_with   imap imap "${EPREFIX}"/usr)
-       $(use_enable intl intl )
-       $(use_with   iodbc iodbc "${EPREFIX}"/usr)
-       $(use_enable ipv6 ipv6 )
-       $(use_enable json json )
-       $(use_with   kerberos kerberos "${EPREFIX}"/usr)
-       $(use_with   ldap ldap "${EPREFIX}"/usr)
-       $(use_with   ldap-sasl ldap-sasl "${EPREFIX}"/usr)
-       $(use_with   libedit libedit "${EPREFIX}"/usr)
-       $(use_with   mhash mhash "${EPREFIX}"/usr)
-       $(use_with   mssql mssql "${EPREFIX}"/usr)
-       $(use_with   nls gettext "${EPREFIX}"/usr)
-       $(use_with   oci8-instant-client oci8)
-       $(use_with   odbc unixODBC "${EPREFIX}"/usr)
-       $(use_enable opcache opcache )
-       $(use_enable pcntl pcntl )
-       $(use_enable pdo pdo )
-       $(use_with   pdo-dblib pdo-dblib )
-       $(use_with   pdo-oci pdo-oci )
-       $(use_with   pdo-odbc pdo-odbc unixODBC,"${EPREFIX}"/usr)
-       $(use_with   pdo-pgsql pdo-pgsql )
-       $(use_with   pdo-sqlite pdo-sqlite "${EPREFIX}"/usr)
-       $(use_enable phar phar )
-       $(use_enable posix posix )
-       $(use_with   postgres pgsql "${EPREFIX}"/usr)
-       $(use_with   spell pspell "${EPREFIX}"/usr)
-       $(use_with   readline readline "${EPREFIX}"/usr)
-       $(use_with   recode recode "${EPREFIX}"/usr)
-       $(use_enable sharedmem shmop )
-       $(use_enable simplexml simplexml )
-       $(use_with   snmp snmp "${EPREFIX}"/usr)
-       $(use_enable soap soap )
-       $(use_enable sockets sockets )
-       $(use_with   sqlite sqlite3 "${EPREFIX}"/usr)
-       $(use_with   ssl openssl "${EPREFIX}"/usr)
-       $(use_with   ssl openssl-dir "${EPREFIX}"/usr)
-       $(use_with   sybase-ct sybase-ct "${EPREFIX}"/usr)
-       $(use_with   systemd fpm-systemd)
-       $(use_enable sysvipc sysvmsg )
-       $(use_enable sysvipc sysvsem )
-       $(use_enable sysvipc sysvshm )
-       $(use_with   tidy tidy "${EPREFIX}"/usr)
-       $(use_enable tokenizer tokenizer )
-       $(use_enable unicode mbstring )
-       $(use_with   unicode onig "${EPREFIX}"/usr)
-       $(use_enable wddx wddx )
-       $(use_enable xml dom )
-       $(use_enable xml libxml )
-       $(use_with   xml libxml-dir "${EPREFIX}"/usr)
-       $(use_enable xml xml )
-       $(use_enable xmlreader xmlreader )
-       $(use_with   xmlrpc xmlrpc)
-       $(use_enable xmlwriter xmlwriter )
-       $(use_with   xslt xsl "${EPREFIX}"/usr)
-       $(use_enable zip zip )
-       $(use_with   zlib zlib "${EPREFIX}"/usr)"
-
-       # DBA support
-       if use cdb || use berkdb || use flatfile || use gdbm || use inifile \
-               || use qdbm ; then
-               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 SSL support
-       if use imap ; then
-               my_conf+=" $(use_with ssl imap-ssl ${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)"
-
-       # MySQL PDO support
-       my_conf+=" $(use_with pdo-mysql pdo-mysql ${mysqllib})"
-
-       # If MySQL is enabled in any way, pass --with-mysql-sock to ./configure.
-       if use mysql || use mysqli || use pdo-mysql ; then
-               my_conf+=" --with-mysql-sock=${EPREFIX}/var/run/mysqld/mysqld.sock"
-       fi
-
-       # 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+=" --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+=" --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+=" ${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
-}