[gentoo-commits] repo/gentoo:master commit in: dev-lang/php/

[Brian Evans]

commit:     437fd8af0fe8caa9255289360f7bc2e49b948b2d
Author:     Brian Evans <grknight <AT> gentoo <DOT> org>
AuthorDate: Mon Jul 17 13:21:12 2017 +0000
Commit:     Brian Evans <grknight <AT> gentoo <DOT> org>
CommitDate: Mon Jul 17 13:43:32 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=437fd8af

dev-lang/php: Adjust REQUIRED_USE for GLEP73

Package-Manager: Portage-2.3.6, Repoman-2.3.2

 dev-lang/php/php-5.6.31.ebuild |  9 ++++-----
 dev-lang/php/php-7.0.21.ebuild |  7 ++++---
 dev-lang/php/php-7.1.7.ebuild  | 15 ++++++++-------
 3 files changed, 16 insertions(+), 15 deletions(-)

diff --git a/dev-lang/php/php-5.6.31.ebuild b/dev-lang/php/php-5.6.31.ebuild
index 244e5325b27..7310a78821e 100644
--- a/dev-lang/php/php-5.6.31.ebuild
+++ b/dev-lang/php/php-5.6.31.ebuild
@@ -145,14 +145,14 @@ DEPEND="${COMMON_DEPEND}
 
 # Without USE=readline or libedit, the interactive "php -a" CLI will hang.
 REQUIRED_USE="
+       || ( cli cgi fpm apache2 embed )
        cli? ( ^^ ( readline libedit ) )
+       gd? ( zlib )
        truetype? ( gd )
        vpx? ( gd )
        cjk? ( gd )
        exif? ( gd )
-
        xpm? ( gd )
-       gd? ( zlib )
        simplexml? ( xml )
        soap? ( xml )
        wddx? ( xml )
@@ -162,6 +162,7 @@ REQUIRED_USE="
        ldap-sasl? ( ldap )
        mhash? ( hash )
        phar? ( hash )
+       recode? ( !imap !mysql !mysqli !libmysqlclient )
        libmysqlclient? ( || (
                mysql
                mysqli
@@ -170,10 +171,8 @@ REQUIRED_USE="
 
        qdbm? ( !gdbm )
        readline? ( !libedit )
-       recode? ( !imap !mysql !mysqli )
        sharedmem? ( !threads )
-
-       !cli? ( !cgi? ( !fpm? ( !apache2? ( !embed? ( cli ) ) ) ) )"
+"
 
 PHP_MV="$(get_major_version)"
 

diff --git a/dev-lang/php/php-7.0.21.ebuild b/dev-lang/php/php-7.0.21.ebuild
index dd6ee29f566..90e9c59f5df 100644
--- a/dev-lang/php/php-7.0.21.ebuild
+++ b/dev-lang/php/php-7.0.21.ebuild
@@ -139,13 +139,14 @@ DEPEND="${COMMON_DEPEND}
 
 # Without USE=readline or libedit, the interactive "php -a" CLI will hang.
 REQUIRED_USE="
+       || ( cli cgi fpm apache2 embed phpdbg )
        cli? ( ^^ ( readline libedit ) )
+       gd? ( zlib )
        truetype? ( gd )
        webp? ( gd )
        cjk? ( gd )
        exif? ( gd )
        xpm? ( gd )
-       gd? ( zlib )
        simplexml? ( xml )
        soap? ( xml )
        wddx? ( xml )
@@ -157,10 +158,10 @@ REQUIRED_USE="
        phar? ( hash )
        qdbm? ( !gdbm )
        readline? ( !libedit )
-       recode? ( !imap !mysqli )
+       recode? ( !imap !mysqli !mysql )
        sharedmem? ( !threads )
        mysql? ( || ( mysqli pdo ) )
-       || ( cli cgi fpm apache2 embed phpdbg )"
+"
 
 PHP_MV="$(get_major_version)"
 

diff --git a/dev-lang/php/php-7.1.7.ebuild b/dev-lang/php/php-7.1.7.ebuild
index 05df33e58a1..dca745576e5 100644
--- a/dev-lang/php/php-7.1.7.ebuild
+++ b/dev-lang/php/php-7.1.7.ebuild
@@ -121,13 +121,14 @@ DEPEND="${COMMON_DEPEND}
 
 # Without USE=readline or libedit, the interactive "php -a" CLI will hang.
 REQUIRED_USE="
+       || ( cli cgi fpm apache2 embed phpdbg )
        cli? ( ^^ ( readline libedit ) )
-       truetype? ( gd zlib )
-       webp? ( gd zlib )
-       cjk? ( gd zlib )
-       exif? ( gd zlib )
-       xpm? ( gd zlib )
        gd? ( zlib )
+       truetype? ( gd )
+       webp? ( gd )
+       cjk? ( gd )
+       exif? ( gd )
+       xpm? ( gd )
        simplexml? ( xml )
        soap? ( xml )
        wddx? ( xml )
@@ -139,10 +140,10 @@ REQUIRED_USE="
        phar? ( hash )
        qdbm? ( !gdbm )
        readline? ( !libedit )
-       recode? ( !imap !mysqli )
+       recode? ( !imap !mysqli !mysql )
        sharedmem? ( !threads )
        mysql? ( || ( mysqli pdo ) )
-       || ( cli cgi fpm apache2 embed phpdbg )"
+"
 
 PHP_MV="$(get_major_version)"