commit:     4769b13edaf5ab12fe62bc0b546557540a772a5e
Author:     Brian Evans <grknight <AT> gentoo <DOT> org>
AuthorDate: Tue Jan  2 23:48:37 2018 +0000
Commit:     Brian Evans <grknight <AT> gentoo <DOT> org>
CommitDate: Tue Jan  2 23:49:28 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4769b13e

dev-lang/php: Revbump each release to have better subslot deps

Closes: https://bugs.gentoo.org/643186
Package-Manager: Portage-2.3.19, Repoman-2.3.6

 .../{php-7.0.26.ebuild => php-5.6.32-r1.ebuild}    | 138 +++++++++++++--------
 .../{php-7.0.26.ebuild => php-7.0.26-r1.ebuild}    |  28 ++---
 .../{php-7.1.12.ebuild => php-7.1.12-r1.ebuild}    |  18 +--
 .../php/{php-7.2.0.ebuild => php-7.2.0-r1.ebuild}  |  16 +--
 4 files changed, 116 insertions(+), 84 deletions(-)

diff --git a/dev-lang/php/php-7.0.26.ebuild b/dev-lang/php/php-5.6.32-r1.ebuild
similarity index 86%
copy from dev-lang/php/php-7.0.26.ebuild
copy to dev-lang/php/php-5.6.32-r1.ebuild
index 947d712ca81..82ff27ece5c 100644
--- a/dev-lang/php/php-7.0.26.ebuild
+++ b/dev-lang/php/php-5.6.32-r1.ebuild
@@ -1,13 +1,13 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-inherit flag-o-matic versionator systemd
+inherit autotools flag-o-matic versionator systemd
 
 DESCRIPTION="The PHP language runtime engine"
 HOMEPAGE="https://secure.php.net/";
-SRC_URI="https://secure.php.net/distributions/${P}.tar.xz";
+SRC_URI="https://php.net/distributions/${P}.tar.xz";
 
 LICENSE="PHP-3.01
        BSD
@@ -21,7 +21,7 @@ SLOT="$(get_version_component_range 1-2)"
 KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh 
~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-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="embed cli cgi fpm apache2"
 
 # SAPIs and SAPI-specific USE flags (cli SAPI is default on):
 IUSE="${IUSE}
@@ -33,11 +33,11 @@ IUSE="${IUSE} acl bcmath berkdb bzip2 calendar cdb cjk
        enchant exif +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
+       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
-       sysvipc systemd tidy +tokenizer truetype unicode wddx webp
+       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
@@ -49,18 +49,18 @@ COMMON_DEPEND="
        acl? ( sys-apps/acl )
        apache2? ( || ( >=www-servers/apache-2.4[apache2_modules_unixd,threads=]
                <www-servers/apache-2.4[threads=] ) )
-       berkdb? ( || ( sys-libs/db:5.3
+       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 )
+       bzip2? ( app-arch/bzip2:0= )
        cdb? ( || ( dev-db/cdb dev-db/tinycdb ) )
        cjk? ( !gd? (
                virtual/jpeg:0
                media-libs/libpng:0=
-               sys-libs/zlib
+               sys-libs/zlib:0=
        ) )
        coverage? ( dev-util/lcov )
        crypt? ( >=dev-libs/libmcrypt-2.4 )
@@ -69,12 +69,12 @@ COMMON_DEPEND="
        exif? ( !gd? (
                virtual/jpeg:0
                media-libs/libpng:0=
-               sys-libs/zlib
+               sys-libs/zlib:0=
        ) )
        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 )
+       gd? ( virtual/jpeg:0 media-libs/libpng:0= sys-libs/zlib:0= )
+       gdbm? ( >=sys-libs/gdbm-1.8.0:0= )
+       gmp? ( dev-libs/gmp:0= )
        iconv? ( virtual/libiconv )
        imap? ( virtual/imap-c-client[kerberos=,ssl=] )
        intl? ( dev-libs/icu:= )
@@ -84,6 +84,10 @@ COMMON_DEPEND="
        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 )
@@ -98,18 +102,20 @@ COMMON_DEPEND="
        spell? ( >=app-text/aspell-0.50 )
        sqlite? ( >=dev-db/sqlite-3.7.6.3 )
        ssl? (
-               !libressl? ( dev-libs/openssl:0 )
-               libressl? ( dev-libs/libressl )
+               !libressl? ( dev-libs/openssl:0= )
+               libressl? ( dev-libs/libressl:0= )
        )
+       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 )
+                       virtual/jpeg:0 media-libs/libpng:0= sys-libs/zlib:0= )
        )
        unicode? ( dev-libs/oniguruma:= )
+       vpx? ( media-libs/libvpx:0= )
        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 )
@@ -117,11 +123,11 @@ COMMON_DEPEND="
        xpm? (
                x11-libs/libXpm
                virtual/jpeg:0
-               media-libs/libpng:0= sys-libs/zlib
+               media-libs/libpng:0= sys-libs/zlib:0=
        )
        xslt? ( dev-libs/libxslt >=dev-libs/libxml2-2.6.8 )
-       zip? ( sys-libs/zlib )
-       zlib? ( sys-libs/zlib )
+       zip? ( sys-libs/zlib:0= )
+       zlib? ( sys-libs/zlib:0= )
 "
 
 RDEPEND="${COMMON_DEPEND}
@@ -139,10 +145,10 @@ DEPEND="${COMMON_DEPEND}
 
 # Without USE=readline or libedit, the interactive "php -a" CLI will hang.
 REQUIRED_USE="
-       || ( cli cgi fpm apache2 embed phpdbg )
+       || ( cli cgi fpm apache2 embed )
        cli? ( ^^ ( readline libedit ) )
        truetype? ( gd )
-       webp? ( gd )
+       vpx? ( gd )
        cjk? ( gd )
        exif? ( gd )
        xpm? ( gd )
@@ -156,11 +162,16 @@ REQUIRED_USE="
        ldap-sasl? ( ldap )
        mhash? ( hash )
        phar? ( hash )
+       recode? ( !imap !mysql !mysqli !libmysqlclient )
+       libmysqlclient? ( || (
+               mysql
+               mysqli
+               pdo
+       ) )
+
        qdbm? ( !gdbm )
        readline? ( !libedit )
-       recode? ( !imap !mysqli !mysql )
        sharedmem? ( !threads )
-       mysql? ( || ( mysqli pdo ) )
 "
 
 PHP_MV="$(get_major_version)"
@@ -205,11 +216,9 @@ php_install_ini() {
 
        # SAPI-specific handling
        if [[ "${sapi}" == "fpm" ]] ; then
-               einfo "Installing FPM config files php-fpm.conf and www.conf"
+               einfo "Installing FPM config file php-fpm.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,production}
@@ -222,17 +231,43 @@ php_set_ini_dir() {
 }
 
 src_prepare() {
-       default
-
-       # 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'
+       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() {
@@ -282,6 +317,7 @@ src_configure() {
                $(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")
@@ -299,6 +335,7 @@ src_configure() {
                $(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)
@@ -335,14 +372,13 @@ src_configure() {
        # 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")
        )
-       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) )
 
@@ -368,7 +404,10 @@ src_configure() {
        # 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"
@@ -388,7 +427,7 @@ src_configure() {
        # PDO support
        if use pdo ; then
                our_conf+=(
-                       $(use_with mssql pdo-dblib "${EPREFIX}/usr")
+                       $(use_with mssql pdo-dblib)
                        $(use_with mysql pdo-mysql "${mysqllib}")
                        $(use_with postgres pdo-pgsql)
                        $(use_with sqlite pdo-sqlite "${EPREFIX}/usr")
@@ -455,7 +494,7 @@ src_configure() {
 
                for sapi in $SAPIS ; do
                        case "$sapi" in
-                               cli|cgi|embed|fpm|phpdbg)
+                               cli|cgi|embed|fpm)
                                        if [[ "${one_sapi}" == "${sapi}" ]] ; 
then
                                                sapi_conf+=( "--enable-${sapi}" 
)
                                        else
@@ -536,7 +575,7 @@ src_install() {
                                # 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)" \
+                               newins ".libs/libphp5$(get_libname)" \
                                           "libphp${PHP_MV}$(get_libname)"
                                keepdir "/usr/$(get_libdir)/apache2/modules"
                        else
@@ -556,9 +595,6 @@ src_install() {
                                        embed)
                                                
source="libs/libphp${PHP_MV}$(get_libname)"
                                                ;;
-                                       phpdbg)
-                                               source="sapi/phpdbg/phpdbg"
-                                               ;;
                                        *)
                                                die "unhandled sapi in 
src_install"
                                                ;;
@@ -621,12 +657,8 @@ src_test() {
                export TEST_PHP_EXECUTABLE="${PHP_BIN}"
        fi
 
-       if [[ -x "${WORKDIR}/sapis-build/cgi/sapi/cgi/php-cgi" ]] ; then
-               export 
TEST_PHP_CGI_EXECUTABLE="${WORKDIR}/sapis-build/cgi/sapi/cgi/php-cgi"
-       fi
-
-       if [[ -x "${WORKDIR}/sapis-build/phpdbg/sapi/phpdbg/phpdbg" ]] ; then
-               export 
TEST_PHPDBG_EXECUTABLE="${WORKDIR}/sapis-build/phpdbg/sapi/phpdbg/phpdbg"
+       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 \

diff --git a/dev-lang/php/php-7.0.26.ebuild b/dev-lang/php/php-7.0.26-r1.ebuild
similarity index 97%
rename from dev-lang/php/php-7.0.26.ebuild
rename to dev-lang/php/php-7.0.26-r1.ebuild
index 947d712ca81..dde911b26c6 100644
--- a/dev-lang/php/php-7.0.26.ebuild
+++ b/dev-lang/php/php-7.0.26-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -55,12 +55,12 @@ COMMON_DEPEND="
                                        sys-libs/db:4.7
                                        sys-libs/db:4.6
                                        sys-libs/db:4.5 ) )
-       bzip2? ( app-arch/bzip2 )
+       bzip2? ( app-arch/bzip2:0= )
        cdb? ( || ( dev-db/cdb dev-db/tinycdb ) )
        cjk? ( !gd? (
                virtual/jpeg:0
                media-libs/libpng:0=
-               sys-libs/zlib
+               sys-libs/zlib:0=
        ) )
        coverage? ( dev-util/lcov )
        crypt? ( >=dev-libs/libmcrypt-2.4 )
@@ -69,12 +69,12 @@ COMMON_DEPEND="
        exif? ( !gd? (
                virtual/jpeg:0
                media-libs/libpng:0=
-               sys-libs/zlib
+               sys-libs/zlib:0=
        ) )
        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 )
+       gd? ( virtual/jpeg:0 media-libs/libpng:0= sys-libs/zlib:0= )
+       gdbm? ( >=sys-libs/gdbm-1.8.0:0= )
+       gmp? ( dev-libs/gmp:0= )
        iconv? ( virtual/libiconv )
        imap? ( virtual/imap-c-client[kerberos=,ssl=] )
        intl? ( dev-libs/icu:= )
@@ -98,18 +98,18 @@ COMMON_DEPEND="
        spell? ( >=app-text/aspell-0.50 )
        sqlite? ( >=dev-db/sqlite-3.7.6.3 )
        ssl? (
-               !libressl? ( dev-libs/openssl:0 )
-               libressl? ( dev-libs/libressl )
+               !libressl? ( dev-libs/openssl:0= )
+               libressl? ( dev-libs/libressl:0= )
        )
        tidy? ( app-text/htmltidy )
        truetype? (
                =media-libs/freetype-2*
                !gd? (
-                       virtual/jpeg:0 media-libs/libpng:0= sys-libs/zlib )
+                       virtual/jpeg:0 media-libs/libpng:0= sys-libs/zlib:0= )
        )
        unicode? ( dev-libs/oniguruma:= )
        wddx? ( >=dev-libs/libxml2-2.6.8 )
-       webp? ( media-libs/libwebp )
+       webp? ( media-libs/libwebp:0= )
        xml? ( >=dev-libs/libxml2-2.6.8 )
        xmlrpc? ( >=dev-libs/libxml2-2.6.8 virtual/libiconv )
        xmlreader? ( >=dev-libs/libxml2-2.6.8 )
@@ -117,11 +117,11 @@ COMMON_DEPEND="
        xpm? (
                x11-libs/libXpm
                virtual/jpeg:0
-               media-libs/libpng:0= sys-libs/zlib
+               media-libs/libpng:0= sys-libs/zlib:0=
        )
        xslt? ( dev-libs/libxslt >=dev-libs/libxml2-2.6.8 )
-       zip? ( sys-libs/zlib )
-       zlib? ( sys-libs/zlib )
+       zip? ( sys-libs/zlib:0= )
+       zlib? ( sys-libs/zlib:0= )
 "
 
 RDEPEND="${COMMON_DEPEND}

diff --git a/dev-lang/php/php-7.1.12.ebuild b/dev-lang/php/php-7.1.12-r1.ebuild
similarity index 98%
rename from dev-lang/php/php-7.1.12.ebuild
rename to dev-lang/php/php-7.1.12-r1.ebuild
index 36bff5fe6f1..5430dc1231b 100644
--- a/dev-lang/php/php-7.1.12.ebuild
+++ b/dev-lang/php/php-7.1.12-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -55,7 +55,7 @@ COMMON_DEPEND="
                                        sys-libs/db:4.7
                                        sys-libs/db:4.6
                                        sys-libs/db:4.5 ) )
-       bzip2? ( app-arch/bzip2 )
+       bzip2? ( app-arch/bzip2:0= )
        cdb? ( || ( dev-db/cdb dev-db/tinycdb ) )
        coverage? ( dev-util/lcov )
        crypt? ( >=dev-libs/libmcrypt-2.4 )
@@ -63,8 +63,8 @@ COMMON_DEPEND="
        enchant? ( app-text/enchant )
        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 )
+       gdbm? ( >=sys-libs/gdbm-1.8.0:0= )
+       gmp? ( dev-libs/gmp:0= )
        iconv? ( virtual/libiconv )
        imap? ( virtual/imap-c-client[kerberos=,ssl=] )
        intl? ( dev-libs/icu:= )
@@ -88,22 +88,22 @@ COMMON_DEPEND="
        spell? ( >=app-text/aspell-0.50 )
        sqlite? ( >=dev-db/sqlite-3.7.6.3 )
        ssl? (
-               !libressl? ( dev-libs/openssl:0 )
-               libressl? ( dev-libs/libressl )
+               !libressl? ( dev-libs/openssl:0= )
+               libressl? ( dev-libs/libressl:0= )
        )
        tidy? ( || ( app-text/tidy-html5 app-text/htmltidy ) )
        truetype? ( =media-libs/freetype-2* )
        unicode? ( dev-libs/oniguruma:= )
        wddx? ( >=dev-libs/libxml2-2.6.8 )
-       webp? ( media-libs/libwebp )
+       webp? ( media-libs/libwebp:0= )
        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 )
        xslt? ( dev-libs/libxslt >=dev-libs/libxml2-2.6.8 )
-       zip? ( sys-libs/zlib )
-       zlib? ( sys-libs/zlib )
+       zip? ( sys-libs/zlib:0= )
+       zlib? ( sys-libs/zlib:0= )
 "
 
 RDEPEND="${COMMON_DEPEND}

diff --git a/dev-lang/php/php-7.2.0.ebuild b/dev-lang/php/php-7.2.0-r1.ebuild
similarity index 98%
rename from dev-lang/php/php-7.2.0.ebuild
rename to dev-lang/php/php-7.2.0-r1.ebuild
index fd201e4c1c5..ec498c6c441 100644
--- a/dev-lang/php/php-7.2.0.ebuild
+++ b/dev-lang/php/php-7.2.0-r1.ebuild
@@ -56,15 +56,15 @@ COMMON_DEPEND="
                                        sys-libs/db:4.7
                                        sys-libs/db:4.6
                                        sys-libs/db:4.5 ) )
-       bzip2? ( app-arch/bzip2 )
+       bzip2? ( app-arch/bzip2:0= )
        cdb? ( || ( dev-db/cdb dev-db/tinycdb ) )
        coverage? ( dev-util/lcov )
        curl? ( >=net-misc/curl-7.10.5 )
        enchant? ( app-text/enchant )
        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 )
+       gdbm? ( >=sys-libs/gdbm-1.8.0:0= )
+       gmp? ( dev-libs/gmp:0= )
        iconv? ( virtual/libiconv )
        imap? ( virtual/imap-c-client[kerberos=,ssl=] )
        intl? ( dev-libs/icu:= )
@@ -90,24 +90,24 @@ COMMON_DEPEND="
        spell? ( >=app-text/aspell-0.50 )
        sqlite? ( >=dev-db/sqlite-3.7.6.3 )
        ssl? (
-               !libressl? ( dev-libs/openssl:0 )
-               libressl? ( dev-libs/libressl )
+               !libressl? ( dev-libs/openssl:0= )
+               libressl? ( dev-libs/libressl:0= )
        )
        tidy? ( || ( app-text/tidy-html5 app-text/htmltidy ) )
        tokyocabinet? ( dev-db/tokyocabinet )
        truetype? ( =media-libs/freetype-2* )
        unicode? ( dev-libs/oniguruma:= )
        wddx? ( >=dev-libs/libxml2-2.6.8 )
-       webp? ( media-libs/libwebp )
+       webp? ( media-libs/libwebp:0= )
        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 )
        xslt? ( dev-libs/libxslt >=dev-libs/libxml2-2.6.8 )
-       zip? ( sys-libs/zlib )
+       zip? ( sys-libs/zlib:0= )
        zip-encryption? ( >=dev-libs/libzip-1.2.0:= )
-       zlib? ( sys-libs/zlib )
+       zlib? ( sys-libs/zlib:0= )
 "
 
 RDEPEND="${COMMON_DEPEND}

Reply via email to