dev-lang/php: Final REQUIRED_USE tweaks for usability

Package-Manager: Portage-2.3.6, Repoman-2.3.2

diff --git a/dev-lang/php/php-5.6.30.ebuild b/dev-lang/php/php-5.6.30.ebuild
index 802119c18f714515824369e68677aa951c303fa1..0dd5527d5e9ecf4d22148ad1be38eb4aeb605ddf 100644 (file)
--- a/dev-lang/php/php-5.6.30.ebuild
+++ b/dev-lang/php/php-5.6.30.ebuild
@@ -145,12 +145,12 @@ 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 ) )
        truetype? ( gd )
        vpx? ( gd )
        cjk? ( gd )
        exif? ( gd )
-
        xpm? ( gd )
        gd? ( zlib )
        simplexml? ( 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-5.6.31.ebuild b/dev-lang/php/php-5.6.31.ebuild
index 7310a78821e8e8bbf47edf90b425d1e8e7174c9a..0548b46abbe248602e326e353b479cab2dd95f76 100644 (file)
--- a/dev-lang/php/php-5.6.31.ebuild
+++ b/dev-lang/php/php-5.6.31.ebuild
@@ -147,12 +147,12 @@ DEPEND="${COMMON_DEPEND}
 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 )

diff --git a/dev-lang/php/php-7.0.15.ebuild b/dev-lang/php/php-7.0.15.ebuild
index 0d130a0e29207ba9a97cecb2162ce2e0cabc31db..9d14cd817c28cd83c637653a193b5dd79d16809c 100644 (file)
--- a/dev-lang/php/php-7.0.15.ebuild
+++ b/dev-lang/php/php-7.0.15.ebuild
@@ -139,6 +139,7 @@ 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 )
        webp? ( gd )
@@ -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.0.19.ebuild b/dev-lang/php/php-7.0.19.ebuild
index c0316ea85092723d899887305c1fbaa7393443e1..6d0d49263b18669fc6b684d7ab41873835830f96 100644 (file)
--- a/dev-lang/php/php-7.0.19.ebuild
+++ b/dev-lang/php/php-7.0.19.ebuild
@@ -139,6 +139,7 @@ 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 )
        webp? ( gd )
@@ -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.0.21.ebuild b/dev-lang/php/php-7.0.21.ebuild
index 90e9c59f5dfe77ffa22d8832c6cefd8c962d3d98..04e4ebd73e42fde58f4273ffa6965c8a3a18c09c 100644 (file)
--- a/dev-lang/php/php-7.0.21.ebuild
+++ b/dev-lang/php/php-7.0.21.ebuild
@@ -141,12 +141,12 @@ DEPEND="${COMMON_DEPEND}
 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 )