commit:     dc37e4baa6900d5e31ab8302352033724785540d
Author:     Brian Evans <grknight <AT> gentoo <DOT> org>
AuthorDate: Wed Oct 26 14:52:31 2016 +0000
Commit:     Brian Evans <grknight <AT> gentoo <DOT> org>
CommitDate: Wed Oct 26 14:52:31 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=dc37e4ba

dev-lang/php: Drop security vulnerable ~arch versions

Package-Manager: portage-2.3.2

 dev-lang/php/Manifest                             |   1 -
 dev-lang/php/files/fix-x86-build-bug_571658.patch |  51 --
 dev-lang/php/php-5.6.26-r2.ebuild                 | 777 ----------------------
 dev-lang/php/php-7.0.11-r2.ebuild                 | 768 ---------------------
 4 files changed, 1597 deletions(-)

diff --git a/dev-lang/php/Manifest b/dev-lang/php/Manifest
index b066746..4e8c612 100644
--- a/dev-lang/php/Manifest
+++ b/dev-lang/php/Manifest
@@ -2,5 +2,4 @@ DIST php-5.5.37.tar.bz2 13699851 SHA256 
d2380ebe46caf17f2c4cd055867d00a82e6702dc
 DIST php-5.5.38.tar.xz 11077780 SHA256 
cb527c44b48343c8557fe2446464ff1d4695155a95601083e5d1f175df95580f SHA512 
c2cdb18b2c9edaeff66591e8f58f8ff488260f537cdf9ce09820c163f20ff5209c0def89343d429932c9506ad4ef3daacf224946dac1c59622501092483f30c6
 WHIRLPOOL 
4380c1daa39f04f90d1457152e366720b295e96aba6859625c6b375a3785b4e0f30fea590c1ee1edb439c2a405446526c702a003d68ea6c817ab8684068a7581
 DIST php-5.6.26.tar.xz 12412992 SHA256 
203a854f0f243cb2810d1c832bc871ff133eccdf1ff69d32846f93bc1bef58a8 SHA512 
06ef6990c1ab6ef3c94157b72039ddbc40a8373b8f38c88ec4dfa771fcd422a0673ff5f6cbf3cf67a0fb10bedd8b9fa85aa95e08abb0d74163a90a322a1d8c24
 WHIRLPOOL 
11b183089a43bfad1ee787bd2512faf8d4611916cdfe348fb8ba3a2c2d35d560dcd38656e3a5b3ee98efb649e9f7ab219a89da7a72c163270760ad44a64bba09
 DIST php-5.6.27.tar.xz 12439168 SHA256 
16eb544498339d1d855292826e2e547ab01a31600141094959073e5e10e93ab5 SHA512 
e9fdcf0feaa94d385459124e58694d69afcfe8d34ebdd10bfce5bf5828b7c20e7eb92ca75282be8eaef2bdfad0a0f25424fbf9eb9d2f77584f8a80d43f178bf7
 WHIRLPOOL 
3a942e408ede25daa2f4cb52337a26ccfce7724f2c401ea903e2fa152eef7b25e0ed0a22f53371a7145e8b043894ce5c145b29879de93f01c64c315113b3698d
-DIST php-7.0.11.tar.xz 12258500 SHA256 
d4cccea8da1d27c11b89386f8b8e95692ad3356610d571253d00ca67d524c735 SHA512 
4d7df513a61489ecb1c3a963fbb76ad8e15b88fa134f52295a5339c900f7b2f98e547a3e479b8061dd4ff3c5f90cd62e3c39ec208d7de03b6146501e60500d5e
 WHIRLPOOL 
d9867f282df9a86efecb77c44f22a403598dc950b8ae2343000517fdb69890073bd78fbe7d1ee26be41459aefb3336a6508d6dd75b915859533e124b21b4e453
 DIST php-7.0.12.tar.xz 12520004 SHA256 
f3d6c49e1c242e5995dec15e503fde996c327eb86cd7ec45c690e93c971b83ff SHA512 
0bb29da6c70ee7e0a8e23d2027be31498d521dda834f55da59e35767b169226612d4e30fb141c7354b1597e3814ce52a476d928ccd098ab246b391b7e982630d
 WHIRLPOOL 
3b6e95532d2c128980d9e8da6a34e99491d7f3b9e12a68138362253d3e0b78dc0a85c5c563ab6c03c72425ec7a86bf92042ee4ffeb1935608b3d1816f68d1ee9

diff --git a/dev-lang/php/files/fix-x86-build-bug_571658.patch 
b/dev-lang/php/files/fix-x86-build-bug_571658.patch
deleted file mode 100644
index 46f68b6..00000000
--- a/dev-lang/php/files/fix-x86-build-bug_571658.patch
+++ /dev/null
@@ -1,51 +0,0 @@
-From 2fcc388d9bf238673ed84b8f38d7753279aea48c Mon Sep 17 00:00:00 2001
-From: Michael Orlitzky <mich...@orlitzky.com>
-Date: Thu, 4 Aug 2016 11:42:56 -0400
-Subject: [PATCH 1/1] Zend/zend_operators.h: disable x86 assembly on all newer
- GCC-4.x.
-
-In bug 69896, a fix was committed to work around a build error: 'asm'
-operand has impossible constraints, in zend_operators.h, on x86. At
-the time, the problem was only visible with gcc-4.8, and the fix was
-to disable that chunk of assembly for gcc-4.8. With gcc-4.9, the
-problem persists, so we now need to check for gcc-4.9 (at least) in
-addition to gcc-4.8.
-
-This commit modifies the earlier conditional that checks for
-gcc-4.8. The existing check was for equality on the minor component of
-the gcc version, namely 8. The == operator that performs the
-comparison has been changed to <=, so that it catches any gcc-4.x with
-x >= 8. This has been tested and fixes the build on x86 hardware with
-gcc-4.9.
-
-PHP-Bug: 69896
-Gentoo-Bug: 571658
----
- Zend/zend_operators.h | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/Zend/zend_operators.h b/Zend/zend_operators.h
-index 3705022..dd7c354 100644
---- a/Zend/zend_operators.h
-+++ b/Zend/zend_operators.h
-@@ -520,7 +520,7 @@ static zend_always_inline void 
fast_long_decrement_function(zval *op1)
- 
- static zend_always_inline void fast_long_add_function(zval *result, zval 
*op1, zval *op2)
- {
--#if defined(__GNUC__) && defined(__i386__) && !(4 == __GNUC__ && 8 == 
__GNUC_MINOR__)
-+#if defined(__GNUC__) && defined(__i386__) && !(4 == __GNUC__ && 8 <= 
__GNUC_MINOR__)
-       __asm__(
-               "movl   (%1), %%eax\n\t"
-               "addl   (%2), %%eax\n\t"
-@@ -606,7 +606,7 @@ static zend_always_inline int fast_add_function(zval 
*result, zval *op1, zval *o
- 
- static zend_always_inline void fast_long_sub_function(zval *result, zval 
*op1, zval *op2)
- {
--#if defined(__GNUC__) && defined(__i386__) && !(4 == __GNUC__ && 8 == 
__GNUC_MINOR__)
-+#if defined(__GNUC__) && defined(__i386__) && !(4 == __GNUC__ && 8 <= 
__GNUC_MINOR__)
-       __asm__(
-               "movl   (%1), %%eax\n\t"
-               "subl   (%2), %%eax\n\t"
--- 
-2.7.3
-

diff --git a/dev-lang/php/php-5.6.26-r2.ebuild 
b/dev-lang/php/php-5.6.26-r2.ebuild
deleted file mode 100644
index 40ada24..00000000
--- a/dev-lang/php/php-5.6.26-r2.ebuild
+++ /dev/null
@@ -1,777 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=6
-
-inherit autotools flag-o-matic versionator libtool systemd
-
-DESCRIPTION="The PHP language runtime engine"
-HOMEPAGE="http://php.net/";
-SRC_URI="http://php.net/distributions/${P}.tar.xz";
-
-LICENSE="PHP-3.01
-       BSD
-       Zend-2.0
-       bcmath? ( LGPL-2.1+ )
-       fpm? ( BSD-2 )
-       gd? ( gd )
-       unicode? ( BSD-2 LGPL-2.1 )"
-
-SLOT="$(get_version_component_range 1-2)"
-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"
-
-# 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 libressl
-       mhash mssql mysql libmysqlclient mysqli nls
-       oci8-instant-client odbc +opcache pcntl pdo +phar +posix postgres qdbm
-       readline recode selinux +session sharedmem
-       +simplexml snmp soap sockets spell sqlite ssl
-       sybase-ct sysvipc systemd tidy +tokenizer truetype unicode vpx wddx
-       +xml xmlreader xmlwriter xmlrpc xpm xslt zip zlib"
-
-# The supported (that is, autodetected) versions of BDB are listed in
-# the ./configure script. Other versions *work*, but we need to stick to
-# the ones that can be detected to avoid a repeat of bug #564824.
-COMMON_DEPEND="
-       >=app-eselect/eselect-php-0.9.1[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:5.3
-                                       sys-libs/db:5.1
-                                       sys-libs/db:4.8
-                                       sys-libs/db:4.7
-                                       sys-libs/db:4.6
-                                       sys-libs/db:4.5 ) )
-       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:0 )
-       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/libmysqlclient:= )
-               mysqli? ( virtual/libmysqlclient:= )
-       )
-       nls? ( sys-devel/gettext )
-       oci8-instant-client? ( dev-db/oracle-instantclient-basic )
-       odbc? ( >=dev-db/unixODBC-1.8.13 )
-       postgres? ( dev-db/postgresql:* )
-       qdbm? ( dev-db/qdbm )
-       readline? ( sys-libs/readline:0= )
-       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? (
-               !libressl? ( dev-libs/openssl:0= )
-               libressl? ( dev-libs/libressl )
-       )
-       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 )
-"
-
-RDEPEND="${COMMON_DEPEND}
-       virtual/mta
-       fpm? (
-               selinux? ( sec-policy/selinux-phpfpm )
-               systemd? ( sys-apps/systemd ) )"
-
-DEPEND="${COMMON_DEPEND}
-       app-arch/xz-utils
-       >=sys-devel/bison-3.0.1
-       sys-devel/flex
-       >=sys-devel/m4-1.4.3
-       >=sys-devel/libtool-1.5.18"
-
-# Without USE=readline or libedit, the interactive "php -a" CLI will hang.
-REQUIRED_USE="
-       cli? ( ^^ ( readline libedit ) )
-       truetype? ( gd )
-       vpx? ( gd )
-       cjk? ( gd )
-       exif? ( gd )
-
-       xpm? ( gd )
-       gd? ( zlib )
-       simplexml? ( xml )
-       soap? ( xml )
-       wddx? ( xml )
-       xmlrpc? ( || ( xml iconv ) )
-       xmlreader? ( xml )
-       xslt? ( xml )
-       ldap-sasl? ( ldap )
-       mhash? ( hash )
-       phar? ( hash )
-       libmysqlclient? ( || (
-               mysql
-               mysqli
-               pdo
-       ) )
-
-       qdbm? ( !gdbm )
-       readline? ( !libedit )
-       recode? ( !imap !mysql !mysqli )
-       sharedmem? ( !threads )
-
-       !cli? ( !cgi? ( !fpm? ( !apache2? ( !embed? ( cli ) ) ) ) )"
-
-PHP_MV="$(get_major_version)"
-
-# Allow users to install production version if they want to
-if [[ "${PHP_INI_VERSION}" == "production" ]]; then
-       PHP_INI_UPSTREAM="php.ini-production"
-else
-       PHP_INI_UPSTREAM="php.ini-development"
-fi
-
-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}" || die
-
-       # default to /tmp for save_path, bug #282768
-       sed -e 's|^;session.save_path .*$|session.save_path = 
"'"${EPREFIX}"'/tmp"|g' -i "${phpinisrc}" || die
-
-       # Set the extension dir
-       sed -e "s|^extension_dir .*$|extension_dir = ${extension_dir}|g" -i 
"${phpinisrc}" || die
-
-       # 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}" || die
-
-       dodir "${PHP_INI_DIR#${EPREFIX}}"
-       insinto "${PHP_INI_DIR#${EPREFIX}}"
-       newins "${phpinisrc}" php.ini
-
-       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 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
-               einfo "Installing FPM config file php-fpm.conf"
-               insinto "${PHP_INI_DIR#${EPREFIX}}"
-               doins sapi/fpm/php-fpm.conf
-       fi
-
-       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() {
-       eapply "${FILESDIR}/php-${SLOT}-no-bison-warnings.patch"
-
-       # 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 \
-               || die
-
-       # 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
-
-       eapply_user
-
-       # Force rebuilding aclocal.m4
-       rm -f aclocal.m4 || die "failed to remove aclocal.m4 in src_prepare"
-       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}"
-
-       # The php-fpm config file wants localstatedir to be ${EPREFIX}/var
-       # and not the Gentoo default ${EPREFIX}/var/lib. See bug 572002.
-       local our_conf=(
-               --prefix="${PHP_DESTDIR}"
-               --mandir="${PHP_DESTDIR}/man"
-               --infodir="${PHP_DESTDIR}/info"
-               --libdir="${PHP_DESTDIR}/lib"
-               --with-libdir="$(get_libdir)"
-               --localstatedir="${EPREFIX}/var"
-               --without-pear
-               $(use_enable threads maintainer-zts)
-       )
-
-       our_conf+=(
-               $(use_enable bcmath bcmath)
-               $(use_with bzip2 bz2 "${EPREFIX}/usr")
-               $(use_enable calendar calendar)
-               $(use_enable ctype ctype)
-               $(use_with curl curl "${EPREFIX}/usr")
-               $(use_enable xml dom)
-               $(use_with enchant enchant "${EPREFIX}/usr")
-               $(use_enable exif exif)
-               $(use_enable fileinfo fileinfo)
-               $(use_enable filter filter)
-               $(use_enable ftp ftp)
-               $(use_with nls gettext "${EPREFIX}/usr")
-               $(use_with gmp gmp "${EPREFIX}/usr")
-               $(use_enable hash hash)
-               $(use_with mhash mhash "${EPREFIX}/usr")
-               $(use_with iconv iconv \
-                       $(use elibc_glibc || use elibc_musl || echo 
"${EPREFIX}/usr"))
-               $(use_enable intl intl)
-               $(use_enable ipv6 ipv6)
-               $(use_enable json json)
-               $(use_with kerberos kerberos "${EPREFIX}/usr")
-               $(use_enable xml libxml)
-               $(use_with xml libxml-dir "${EPREFIX}/usr")
-               $(use_enable unicode mbstring)
-               $(use_with crypt mcrypt "${EPREFIX}/usr")
-               $(use_with mssql mssql "${EPREFIX}/usr")
-               $(use_with unicode onig "${EPREFIX}/usr")
-               $(use_with ssl openssl "${EPREFIX}/usr")
-               $(use_with ssl openssl-dir "${EPREFIX}/usr")
-               $(use_enable pcntl pcntl)
-               $(use_enable phar phar)
-               $(use_enable pdo pdo)
-               $(use_enable opcache opcache)
-               $(use_with postgres pgsql "${EPREFIX}/usr")
-               $(use_enable posix posix)
-               $(use_with spell pspell "${EPREFIX}/usr")
-               $(use_with recode recode "${EPREFIX}/usr")
-               $(use_enable simplexml simplexml)
-               $(use_enable sharedmem shmop)
-               $(use_with snmp snmp "${EPREFIX}/usr")
-               $(use_enable soap soap)
-               $(use_enable sockets sockets)
-               $(use_with sqlite sqlite3 "${EPREFIX}/usr")
-               $(use_with sybase-ct sybase-ct "${EPREFIX}/usr")
-               $(use_enable sysvipc sysvmsg)
-               $(use_enable sysvipc sysvsem)
-               $(use_enable sysvipc sysvshm)
-               $(use_with systemd fpm-systemd)
-               $(use_with tidy tidy "${EPREFIX}/usr")
-               $(use_enable tokenizer tokenizer)
-               $(use_enable wddx wddx)
-               $(use_enable xml xml)
-               $(use_enable xmlreader xmlreader)
-               $(use_enable xmlwriter xmlwriter)
-               $(use_with xmlrpc xmlrpc)
-               $(use_with xslt xsl "${EPREFIX}/usr")
-               $(use_enable zip zip)
-               $(use_with zlib zlib "${EPREFIX}/usr")
-               $(use_enable debug debug)
-       )
-
-       # DBA support
-       if use cdb || use berkdb || use flatfile || use gdbm || use inifile \
-               || use qdbm ; then
-               our_conf+=( "--enable-dba${shared}" )
-       fi
-
-       # DBA drivers support
-       our_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
-       our_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
-       our_conf+=( $(use_with gd gd) )
-
-       # IMAP support
-       if use imap ; then
-               our_conf+=(
-                       $(use_with imap imap "${EPREFIX}/usr")
-                       $(use_with ssl imap-ssl "${EPREFIX}/usr")
-               )
-       fi
-
-       # Interbase/firebird support
-       our_conf+=( $(use_with firebird interbase "${EPREFIX}/usr") )
-
-       # LDAP support
-       if use ldap ; then
-               our_conf+=(
-                       $(use_with ldap ldap "${EPREFIX}/usr")
-                       $(use_with ldap-sasl ldap-sasl "${EPREFIX}/usr")
-               )
-       fi
-
-       # MySQL support
-       local mysqllib="mysqlnd"
-       local mysqlilib="mysqlnd"
-       use libmysqlclient && mysqllib="${EPREFIX}/usr"
-       use libmysqlclient && mysqlilib="${EPREFIX}/usr/bin/mysql_config"
-
-       our_conf+=( $(use_with mysql mysql "${mysqllib}") )
-       our_conf+=( $(use_with mysqli mysqli "${mysqlilib}") )
-
-       local mysqlsock="${EPREFIX}/var/run/mysqld/mysqld.sock"
-       if use mysql || use mysqli ; then
-               our_conf+=( $(use_with mysql mysql-sock "${mysqlsock}") )
-       fi
-
-       # ODBC support
-       our_conf+=(
-               $(use_with odbc unixODBC "${EPREFIX}/usr")
-               $(use_with iodbc iodbc "${EPREFIX}/usr")
-       )
-
-       # Oracle support
-       our_conf+=( $(use_with oci8-instant-client oci8) )
-
-       # PDO support
-       if use pdo ; then
-               our_conf+=(
-                       $(use_with mssql pdo-dblib)
-                       $(use_with mysql pdo-mysql "${mysqllib}")
-                       $(use_with postgres pdo-pgsql)
-                       $(use_with sqlite pdo-sqlite "${EPREFIX}/usr")
-                       $(use_with firebird pdo-firebird "${EPREFIX}/usr")
-                       $(use_with odbc pdo-odbc "unixODBC,${EPREFIX}/usr")
-                       $(use_with oci8-instant-client pdo-oci)
-               )
-       fi
-
-       # readline/libedit support
-       our_conf+=(
-               $(use_with readline readline "${EPREFIX}/usr")
-               $(use_with libedit libedit "${EPREFIX}/usr")
-       )
-
-       # Session support
-       if use session ; then
-               our_conf+=( $(use_with sharedmem mm "${EPREFIX}/usr") )
-       else
-               our_conf+=( $(use_enable session session) )
-       fi
-
-       # Use pic for shared modules such as apache2's mod_php
-       our_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
-       our_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
-       our_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" || die
-       for one_sapi in $SAPIS ; do
-               use "${one_sapi}" || continue
-               php_set_ini_dir "${one_sapi}"
-
-               # The BUILD_DIR variable is used to determine where to output
-               # the files that autotools creates. This was all originally
-               # based on the autotools-utils eclass.
-               BUILD_DIR="${WORKDIR}/sapis-build/${one_sapi}"
-               cp -a "${S}" "${BUILD_DIR}" || die
-               cd "${BUILD_DIR}" || die
-
-               local sapi_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+=( "--enable-${sapi}" 
)
-                                       else
-                                               sapi_conf+=( 
"--disable-${sapi}" )
-                                       fi
-                                       ;;
-
-                               apache2)
-                                       if [[ "${one_sapi}" == "${sapi}" ]] ; 
then
-                                               sapi_conf+=( 
--with-apxs2="${EPREFIX}/usr/bin/apxs" )
-                                       else
-                                               sapi_conf+=( --without-apxs2 )
-                                       fi
-                                       ;;
-                       esac
-               done
-
-               # Construct the $myeconfargs array by concatenating $our_conf
-               # (the common args) and $sapi_conf (the SAPI-specific args).
-               local myeconfargs=( "${our_conf[@]}" )
-               myeconfargs+=( "${sapi_conf[@]}" )
-
-               pushd "${BUILD_DIR}" > /dev/null || die
-               econf "${myeconfargs[@]}"
-               popd > /dev/null || die
-       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" || \
-                               die "Failed to change dir to 
${WORKDIR}/sapis-build/$1"
-                       emake
-               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" || die
-       emake INSTALL_ROOT="${D}" \
-               install-build install-headers install-programs
-
-       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}" || die
-
-                       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}"
-                               else
-                                       dobin "${source}"
-                                       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 opcache ; then
-               into "${PHP_DESTDIR#${EPREFIX}}"
-               dolib.so "modules/opcache$(get_libname)"
-       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}" || 
die
-       sed -e "s|php5|php${SLOT}|g" -i "${ED}/etc/env.d/20php${SLOT}" || die
-
-       # 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" || die
-
-       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 || die
-       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
-               elog
-               elog "To enable PHP in apache, you will need to add \"-D PHP\" 
to"
-               elog "your apache2 command. OpenRC users can append that string 
to"
-               elog "APACHE2_OPTS in /etc/conf.d/apache2."
-               elog
-               elog "The apache module configuration file 70_mod_php.conf is"
-               elog "provided (and maintained) by eselect-php."
-               elog
-       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} || die
-                               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
-
-       # Remove dead symlinks for SAPIs that were just disabled. For
-       # example, if the user has the cgi SAPI enabled, then he has an
-       # eselect-php symlink for it. If he later reinstalls PHP with
-       # USE="-cgi", that symlink will break. This call to eselect is
-       # supposed to remove that dead link per bug 572436.
-       eselect php cleanup || die
-
-       if ! has "php${SLOT/./-}" ${PHP_TARGETS}; then
-          elog "To build extensions for this version of PHP, you will need to"
-          elog "add php${SLOT/./-} to your PHP_TARGETS USE_EXPAND variable."
-          elog
-       fi
-
-       # Only mention PHP_INI_VERSION if the user doesn't have it set.
-       case "${PHP_INI_VERSION}" in
-               production|development)
-               ;;
-       *)
-               elog "This ebuild installed a version of php.ini based on"
-               elog "${PHP_INI_UPSTREAM}. You can choose which version of"
-               elog "php.ini to install by default by setting PHP_INI_VERSION"
-               elog "to either 'production' or 'development' in your 
make.conf."
-               elog "Both versions of php.ini can be found with the PHP docs 
in"
-               elog "${EPREFIX}/usr/share/doc/${PF}"
-               elog
-               ;;
-       esac
-
-       elog "For details on how version slotting works, please see"
-       elog "the wiki:"
-       elog
-       elog "  https://wiki.gentoo.org/wiki/PHP";
-       elog
-}
-
-pkg_postrm() {
-       # This serves two purposes. First, if we have just removed the last
-       # installed version of PHP, then this will remove any dead symlinks
-       # belonging to eselect-php. Second, if a user upgrades slots from
-       # (say) 5.6 to 7.0 and depcleans the old slot, then this will update
-       # his existing symlinks to point to the new 7.0 installation. The
-       # latter is bug 432962.
-       #
-       # Note: the eselect-php package may not be installed at this point,
-       # so we can't die() if this command fails.
-       eselect php cleanup
-}

diff --git a/dev-lang/php/php-7.0.11-r2.ebuild 
b/dev-lang/php/php-7.0.11-r2.ebuild
deleted file mode 100644
index 9a572d6..00000000
--- a/dev-lang/php/php-7.0.11-r2.ebuild
+++ /dev/null
@@ -1,768 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=6
-
-inherit autotools flag-o-matic versionator libtool systemd
-
-DESCRIPTION="The PHP language runtime engine"
-HOMEPAGE="http://php.net/";
-SRC_URI="http://php.net/distributions/${P}.tar.xz";
-
-LICENSE="PHP-3.01
-       BSD
-       Zend-2.0
-       bcmath? ( LGPL-2.1+ )
-       fpm? ( BSD-2 )
-       gd? ( gd )
-       unicode? ( BSD-2 LGPL-2.1 )"
-
-SLOT="$(get_version_component_range 1-2)"
-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"
-
-# We can build the following SAPIs in the given order
-SAPIS="embed cli cgi fpm apache2 phpdbg"
-
-# 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 libressl
-       mhash mssql mysql mysqli nls
-       oci8-instant-client odbc +opcache pcntl pdo +phar +posix postgres qdbm
-       readline recode selinux +session sharedmem
-       +simplexml snmp soap sockets spell sqlite ssl
-       sysvipc systemd tidy +tokenizer truetype unicode wddx webp
-       +xml xmlreader xmlwriter xmlrpc xpm xslt zip zlib"
-
-# The supported (that is, autodetected) versions of BDB are listed in
-# the ./configure script. Other versions *work*, but we need to stick to
-# the ones that can be detected to avoid a repeat of bug #564824.
-COMMON_DEPEND="
-       >=app-eselect/eselect-php-0.9.1[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:5.3
-                                       sys-libs/db:5.1
-                                       sys-libs/db:4.8
-                                       sys-libs/db:4.7
-                                       sys-libs/db:4.6
-                                       sys-libs/db:4.5 ) )
-       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:0 )
-       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] )
-       nls? ( sys-devel/gettext )
-       oci8-instant-client? ( dev-db/oracle-instantclient-basic )
-       odbc? ( >=dev-db/unixODBC-1.8.13 )
-       postgres? ( dev-db/postgresql:* )
-       qdbm? ( dev-db/qdbm )
-       readline? ( sys-libs/readline:0= )
-       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? (
-               !libressl? ( dev-libs/openssl:0 )
-               libressl? ( dev-libs/libressl )
-       )
-       tidy? ( app-text/htmltidy )
-       truetype? (
-               =media-libs/freetype-2*
-               !gd? (
-                       virtual/jpeg:0 media-libs/libpng:0= sys-libs/zlib )
-       )
-       unicode? ( dev-libs/oniguruma )
-       wddx? ( >=dev-libs/libxml2-2.6.8 )
-       webp? ( media-libs/libwebp )
-       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 )
-"
-
-RDEPEND="${COMMON_DEPEND}
-       virtual/mta
-       fpm? (
-               selinux? ( sec-policy/selinux-phpfpm )
-               systemd? ( sys-apps/systemd ) )"
-
-DEPEND="${COMMON_DEPEND}
-       app-arch/xz-utils
-       >=sys-devel/bison-3.0.1
-       sys-devel/flex
-       >=sys-devel/m4-1.4.3
-       >=sys-devel/libtool-1.5.18"
-
-# Without USE=readline or libedit, the interactive "php -a" CLI will hang.
-REQUIRED_USE="
-       cli? ( ^^ ( readline libedit ) )
-       truetype? ( gd )
-       webp? ( 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 )
-       qdbm? ( !gdbm )
-       readline? ( !libedit )
-       recode? ( !imap !mysqli )
-       sharedmem? ( !threads )
-       mysql? ( || ( mysqli pdo ) )
-       || ( cli cgi fpm apache2 embed phpdbg )"
-
-PHP_MV="$(get_major_version)"
-
-# Allow users to install production version if they want to
-if [[ "${PHP_INI_VERSION}" == "production" ]]; then
-       PHP_INI_UPSTREAM="php.ini-production"
-else
-       PHP_INI_UPSTREAM="php.ini-development"
-fi
-
-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}" || die
-
-       # default to /tmp for save_path, bug #282768
-       sed -e 's|^;session.save_path .*$|session.save_path = 
"'"${EPREFIX}"'/tmp"|g' -i "${phpinisrc}" || die
-
-       # Set the extension dir
-       sed -e "s|^extension_dir .*$|extension_dir = ${extension_dir}|g" -i 
"${phpinisrc}" || die
-
-       # 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}" || die
-
-       dodir "${PHP_INI_DIR#${EPREFIX}}"
-       insinto "${PHP_INI_DIR#${EPREFIX}}"
-       newins "${phpinisrc}" php.ini
-
-       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 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
-               einfo "Installing FPM config files php-fpm.conf and www.conf"
-               insinto "${PHP_INI_DIR#${EPREFIX}}"
-               doins sapi/fpm/php-fpm.conf
-               insinto "${PHP_INI_DIR#${EPREFIX}}/fpm.d"
-               doins sapi/fpm/www.conf
-       fi
-
-       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() {
-       # Disable some assembly on x86.
-       eapply "${FILESDIR}/fix-x86-build-bug_571658.patch"
-
-       # 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"
-
-       # 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
-
-       eapply_user
-
-       # Force rebuilding aclocal.m4
-       rm -f aclocal.m4 || die "failed to remove aclocal.m4 in src_prepare"
-       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
-
-       # In php-7.x, the FPM pool configuration files have been split off
-       # of the main config. By default the pool config files go in
-       # e.g. /etc/php-fpm.d, which isn't slotted. So here we move the
-       # include directory to a subdirectory "fpm.d" of $PHP_INI_DIR. Later
-       # we'll install the pool configuration file "www.conf" there.
-       php_set_ini_dir fpm
-       sed -i "s~^include=.*$~include=${PHP_INI_DIR}/fpm.d/*.conf~" \
-               sapi/fpm/php-fpm.conf.in \
-               || die 'failed to move the include directory in php-fpm.conf'
-}
-
-src_configure() {
-       addpredict /usr/share/snmp/mibs/.index
-       addpredict /var/lib/net-snmp/mib_indexes
-
-       PHP_DESTDIR="${EPREFIX}/usr/$(get_libdir)/php${SLOT}"
-
-       # The php-fpm config file wants localstatedir to be ${EPREFIX}/var
-       # and not the Gentoo default ${EPREFIX}/var/lib. See bug 572002.
-       local our_conf=(
-               --prefix="${PHP_DESTDIR}"
-               --mandir="${PHP_DESTDIR}/man"
-               --infodir="${PHP_DESTDIR}/info"
-               --libdir="${PHP_DESTDIR}/lib"
-               --with-libdir="$(get_libdir)"
-               --localstatedir="${EPREFIX}/var"
-               --without-pear
-               $(use_enable threads maintainer-zts)
-       )
-
-       our_conf+=(
-               $(use_enable bcmath bcmath)
-               $(use_with bzip2 bz2 "${EPREFIX}/usr")
-               $(use_enable calendar calendar)
-               $(use_enable ctype ctype)
-               $(use_with curl curl "${EPREFIX}/usr")
-               $(use_enable xml dom)
-               $(use_with enchant enchant "${EPREFIX}/usr")
-               $(use_enable exif exif)
-               $(use_enable fileinfo fileinfo)
-               $(use_enable filter filter)
-               $(use_enable ftp ftp)
-               $(use_with nls gettext "${EPREFIX}/usr")
-               $(use_with gmp gmp "${EPREFIX}/usr")
-               $(use_enable hash hash)
-               $(use_with mhash mhash "${EPREFIX}/usr")
-               $(use_with iconv iconv \
-                       $(use elibc_glibc || use elibc_musl || echo 
"${EPREFIX}/usr"))
-               $(use_enable intl intl)
-               $(use_enable ipv6 ipv6)
-               $(use_enable json json)
-               $(use_with kerberos kerberos "${EPREFIX}/usr")
-               $(use_enable xml libxml)
-               $(use_with xml libxml-dir "${EPREFIX}/usr")
-               $(use_enable unicode mbstring)
-               $(use_with crypt mcrypt "${EPREFIX}/usr")
-               $(use_with unicode onig "${EPREFIX}/usr")
-               $(use_with ssl openssl "${EPREFIX}/usr")
-               $(use_with ssl openssl-dir "${EPREFIX}/usr")
-               $(use_enable pcntl pcntl)
-               $(use_enable phar phar)
-               $(use_enable pdo pdo)
-               $(use_enable opcache opcache)
-               $(use_with postgres pgsql "${EPREFIX}/usr")
-               $(use_enable posix posix)
-               $(use_with spell pspell "${EPREFIX}/usr")
-               $(use_with recode recode "${EPREFIX}/usr")
-               $(use_enable simplexml simplexml)
-               $(use_enable sharedmem shmop)
-               $(use_with snmp snmp "${EPREFIX}/usr")
-               $(use_enable soap soap)
-               $(use_enable sockets sockets)
-               $(use_with sqlite sqlite3 "${EPREFIX}/usr")
-               $(use_enable sysvipc sysvmsg)
-               $(use_enable sysvipc sysvsem)
-               $(use_enable sysvipc sysvshm)
-               $(use_with systemd fpm-systemd)
-               $(use_with tidy tidy "${EPREFIX}/usr")
-               $(use_enable tokenizer tokenizer)
-               $(use_enable wddx wddx)
-               $(use_enable xml xml)
-               $(use_enable xmlreader xmlreader)
-               $(use_enable xmlwriter xmlwriter)
-               $(use_with xmlrpc xmlrpc)
-               $(use_with xslt xsl "${EPREFIX}/usr")
-               $(use_enable zip zip)
-               $(use_with zlib zlib "${EPREFIX}/usr")
-               $(use_enable debug debug)
-       )
-
-       # DBA support
-       if use cdb || use berkdb || use flatfile || use gdbm || use inifile \
-               || use qdbm ; then
-               our_conf+=( "--enable-dba${shared}" )
-       fi
-
-       # DBA drivers support
-       our_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
-       our_conf+=(
-               $(use_with truetype freetype-dir "${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")
-       )
-       if use webp; then
-               our_conf+=( --with-webp-dir="${EPREFIX}/usr" )
-       fi
-       # enable gd last, so configure can pick up the previous settings
-       our_conf+=( $(use_with gd gd) )
-
-       # IMAP support
-       if use imap ; then
-               our_conf+=(
-                       $(use_with imap imap "${EPREFIX}/usr")
-                       $(use_with ssl imap-ssl "${EPREFIX}/usr")
-               )
-       fi
-
-       # Interbase/firebird support
-       our_conf+=( $(use_with firebird interbase "${EPREFIX}/usr") )
-
-       # LDAP support
-       if use ldap ; then
-               our_conf+=(
-                       $(use_with ldap ldap "${EPREFIX}/usr")
-                       $(use_with ldap-sasl ldap-sasl "${EPREFIX}/usr")
-               )
-       fi
-
-       # MySQL support
-       local mysqllib="mysqlnd"
-       local mysqlilib="mysqlnd"
-
-       our_conf+=( $(use_with mysqli mysqli "${mysqlilib}") )
-
-       local mysqlsock="${EPREFIX}/var/run/mysqld/mysqld.sock"
-       if use mysql || use mysqli ; then
-               our_conf+=( $(use_with mysql mysql-sock "${mysqlsock}") )
-       fi
-
-       # ODBC support
-       our_conf+=(
-               $(use_with odbc unixODBC "${EPREFIX}/usr")
-               $(use_with iodbc iodbc "${EPREFIX}/usr")
-       )
-
-       # Oracle support
-       our_conf+=( $(use_with oci8-instant-client oci8) )
-
-       # PDO support
-       if use pdo ; then
-               our_conf+=(
-                       $(use_with mssql pdo-dblib "${EPREFIX}/usr")
-                       $(use_with mysql pdo-mysql "${mysqllib}")
-                       $(use_with postgres pdo-pgsql)
-                       $(use_with sqlite pdo-sqlite "${EPREFIX}/usr")
-                       $(use_with firebird pdo-firebird "${EPREFIX}/usr")
-                       $(use_with odbc pdo-odbc "unixODBC,${EPREFIX}/usr")
-                       $(use_with oci8-instant-client pdo-oci)
-               )
-       fi
-
-       # readline/libedit support
-       our_conf+=(
-               $(use_with readline readline "${EPREFIX}/usr")
-               $(use_with libedit libedit "${EPREFIX}/usr")
-       )
-
-       # Session support
-       if use session ; then
-               our_conf+=( $(use_with sharedmem mm "${EPREFIX}/usr") )
-       else
-               our_conf+=( $(use_enable session session) )
-       fi
-
-       # Use pic for shared modules such as apache2's mod_php
-       our_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
-       our_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
-       our_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" || die
-       for one_sapi in $SAPIS ; do
-               use "${one_sapi}" || continue
-               php_set_ini_dir "${one_sapi}"
-
-               # The BUILD_DIR variable is used to determine where to output
-               # the files that autotools creates. This was all originally
-               # based on the autotools-utils eclass.
-               BUILD_DIR="${WORKDIR}/sapis-build/${one_sapi}"
-               cp -a "${S}" "${BUILD_DIR}" || die
-               cd "${BUILD_DIR}" || die
-
-               local sapi_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|phpdbg)
-                                       if [[ "${one_sapi}" == "${sapi}" ]] ; 
then
-                                               sapi_conf+=( "--enable-${sapi}" 
)
-                                       else
-                                               sapi_conf+=( 
"--disable-${sapi}" )
-                                       fi
-                                       ;;
-
-                               apache2)
-                                       if [[ "${one_sapi}" == "${sapi}" ]] ; 
then
-                                               sapi_conf+=( 
--with-apxs2="${EPREFIX}/usr/bin/apxs" )
-                                       else
-                                               sapi_conf+=( --without-apxs2 )
-                                       fi
-                                       ;;
-                       esac
-               done
-
-               # Construct the $myeconfargs array by concatenating $our_conf
-               # (the common args) and $sapi_conf (the SAPI-specific args).
-               local myeconfargs=( "${our_conf[@]}" )
-               myeconfargs+=( "${sapi_conf[@]}" )
-
-               pushd "${BUILD_DIR}" > /dev/null || die
-               econf "${myeconfargs[@]}"
-               popd > /dev/null || die
-       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" || \
-                               die "Failed to change dir to 
${WORKDIR}/sapis-build/$1"
-                       emake
-               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" || die
-       emake INSTALL_ROOT="${D}" \
-               install-build install-headers install-programs
-
-       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}" || die
-
-                       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/libphp${PHP_MV}$(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)"
-                                               ;;
-                                       phpdbg)
-                                               source="sapi/phpdbg/phpdbg"
-                                               ;;
-                                       *)
-                                               die "unhandled sapi in 
src_install"
-                                               ;;
-                               esac
-
-                               if [[ "${source}" == *"$(get_libname)" ]]; then
-                                       dolib.so "${source}"
-                               else
-                                       dobin "${source}"
-                                       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 opcache ; then
-               into "${PHP_DESTDIR#${EPREFIX}}"
-               dolib.so "modules/opcache$(get_libname)"
-       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}" || 
die
-       sed -e "s|php5|php${SLOT}|g" -i "${ED}/etc/env.d/20php${SLOT}" || die
-
-       # 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" || die
-
-       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 || die
-       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
-               elog
-               elog "To enable PHP in apache, you will need to add \"-D PHP\" 
to"
-               elog "your apache2 command. OpenRC users can append that string 
to"
-               elog "APACHE2_OPTS in /etc/conf.d/apache2."
-               elog
-               elog "The apache module configuration file 70_mod_php.conf is"
-               elog "provided (and maintained) by eselect-php."
-               elog
-       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} || die
-                               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
-
-       # Remove dead symlinks for SAPIs that were just disabled. For
-       # example, if the user has the cgi SAPI enabled, then he has an
-       # eselect-php symlink for it. If he later reinstalls PHP with
-       # USE="-cgi", that symlink will break. This call to eselect is
-       # supposed to remove that dead link per bug 572436.
-       eselect php cleanup || die
-
-       if ! has "php${SLOT/./-}" ${PHP_TARGETS}; then
-          elog "To build extensions for this version of PHP, you will need to"
-          elog "add php${SLOT/./-} to your PHP_TARGETS USE_EXPAND variable."
-          elog
-       fi
-
-       # Only mention PHP_INI_VERSION if the user doesn't have it set.
-       case "${PHP_INI_VERSION}" in
-               production|development)
-               ;;
-       *)
-               elog "This ebuild installed a version of php.ini based on"
-               elog "${PHP_INI_UPSTREAM}. You can choose which version of"
-               elog "php.ini to install by default by setting PHP_INI_VERSION"
-               elog "to either 'production' or 'development' in your 
make.conf."
-               elog "Both versions of php.ini can be found with the PHP docs 
in"
-               elog "${EPREFIX}/usr/share/doc/${PF}"
-               elog
-               ;;
-       esac
-
-       elog "For details on how version slotting works, please see"
-       elog "the wiki:"
-       elog
-       elog "  https://wiki.gentoo.org/wiki/PHP";
-       elog
-}
-
-pkg_postrm() {
-       # This serves two purposes. First, if we have just removed the last
-       # installed version of PHP, then this will remove any dead symlinks
-       # belonging to eselect-php. Second, if a user upgrades slots from
-       # (say) 5.6 to 7.0 and depcleans the old slot, then this will update
-       # his existing symlinks to point to the new 7.0 installation. The
-       # latter is bug 432962.
-       #
-       # Note: the eselect-php package may not be installed at this point,
-       # so we can't die() if this command fails.
-       eselect php cleanup
-}

Reply via email to