commit:     a792cedc184897175195c932024f1cda643378c0
Author:     Brian Evans <grknight <AT> gentoo <DOT> org>
AuthorDate: Thu Jul 12 14:02:16 2018 +0000
Commit:     Brian Evans <grknight <AT> gentoo <DOT> org>
CommitDate: Thu Jul 12 14:02:16 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a792cedc

dev-lang/php: Refine the REQUIRED_USE on gd to help the user

Package-Manager: Portage-2.3.42, Repoman-2.3.9

 dev-lang/php/php-5.6.35-r1.ebuild    | 10 +++++-----
 dev-lang/php/php-5.6.36.ebuild       | 10 +++++-----
 dev-lang/php/php-7.0.29.ebuild       | 10 +++++-----
 dev-lang/php/php-7.0.30.ebuild       | 10 +++++-----
 dev-lang/php/php-7.1.16.ebuild       | 10 +++++-----
 dev-lang/php/php-7.1.18.ebuild       | 10 +++++-----
 dev-lang/php/php-7.1.19.ebuild       | 10 +++++-----
 dev-lang/php/php-7.2.7.ebuild        | 10 +++++-----
 dev-lang/php/php-7.3.0_alpha1.ebuild | 10 +++++-----
 dev-lang/php/php-7.3.0_alpha3.ebuild | 10 +++++-----
 10 files changed, 50 insertions(+), 50 deletions(-)

diff --git a/dev-lang/php/php-5.6.35-r1.ebuild 
b/dev-lang/php/php-5.6.35-r1.ebuild
index 56d281890cd..152ebfe276c 100644
--- a/dev-lang/php/php-5.6.35-r1.ebuild
+++ b/dev-lang/php/php-5.6.35-r1.ebuild
@@ -147,11 +147,11 @@ DEPEND="${COMMON_DEPEND}
 REQUIRED_USE="
        || ( cli cgi fpm apache2 embed )
        cli? ( ^^ ( readline libedit ) )
-       truetype? ( gd )
-       vpx? ( gd )
-       cjk? ( gd )
-       exif? ( gd )
-       xpm? ( gd )
+       truetype? ( gd zlib )
+       vpx? ( gd zlib )
+       cjk? ( gd zlib )
+       exif? ( gd zlib )
+       xpm? ( gd zlib )
        gd? ( zlib )
        simplexml? ( xml )
        soap? ( xml )

diff --git a/dev-lang/php/php-5.6.36.ebuild b/dev-lang/php/php-5.6.36.ebuild
index 5b743906a99..fe5b563b7ea 100644
--- a/dev-lang/php/php-5.6.36.ebuild
+++ b/dev-lang/php/php-5.6.36.ebuild
@@ -147,11 +147,11 @@ DEPEND="${COMMON_DEPEND}
 REQUIRED_USE="
        || ( cli cgi fpm apache2 embed )
        cli? ( ^^ ( readline libedit ) )
-       truetype? ( gd )
-       vpx? ( gd )
-       cjk? ( gd )
-       exif? ( gd )
-       xpm? ( gd )
+       truetype? ( gd zlib )
+       vpx? ( gd zlib )
+       cjk? ( gd zlib )
+       exif? ( gd zlib )
+       xpm? ( gd zlib )
        gd? ( zlib )
        simplexml? ( xml )
        soap? ( xml )

diff --git a/dev-lang/php/php-7.0.29.ebuild b/dev-lang/php/php-7.0.29.ebuild
index a5743214637..08da09b6482 100644
--- a/dev-lang/php/php-7.0.29.ebuild
+++ b/dev-lang/php/php-7.0.29.ebuild
@@ -141,11 +141,11 @@ DEPEND="${COMMON_DEPEND}
 REQUIRED_USE="
        || ( cli cgi fpm apache2 embed phpdbg )
        cli? ( ^^ ( readline libedit ) )
-       truetype? ( gd )
-       webp? ( gd )
-       cjk? ( gd )
-       exif? ( gd )
-       xpm? ( gd )
+       truetype? ( gd zlib )
+       webp? ( gd zlib )
+       cjk? ( gd zlib )
+       exif? ( gd zlib )
+       xpm? ( gd zlib )
        gd? ( zlib )
        simplexml? ( xml )
        soap? ( xml )

diff --git a/dev-lang/php/php-7.0.30.ebuild b/dev-lang/php/php-7.0.30.ebuild
index cfcbd02ee74..9e0175a2b43 100644
--- a/dev-lang/php/php-7.0.30.ebuild
+++ b/dev-lang/php/php-7.0.30.ebuild
@@ -141,11 +141,11 @@ DEPEND="${COMMON_DEPEND}
 REQUIRED_USE="
        || ( cli cgi fpm apache2 embed phpdbg )
        cli? ( ^^ ( readline libedit ) )
-       truetype? ( gd )
-       webp? ( gd )
-       cjk? ( gd )
-       exif? ( gd )
-       xpm? ( gd )
+       truetype? ( gd zlib )
+       webp? ( gd zlib )
+       cjk? ( gd zlib )
+       exif? ( gd zlib )
+       xpm? ( gd zlib )
        gd? ( zlib )
        simplexml? ( xml )
        soap? ( xml )

diff --git a/dev-lang/php/php-7.1.16.ebuild b/dev-lang/php/php-7.1.16.ebuild
index 0adf8fe59a0..da637b55abb 100644
--- a/dev-lang/php/php-7.1.16.ebuild
+++ b/dev-lang/php/php-7.1.16.ebuild
@@ -123,11 +123,11 @@ DEPEND="${COMMON_DEPEND}
 REQUIRED_USE="
        || ( cli cgi fpm apache2 embed phpdbg )
        cli? ( ^^ ( readline libedit ) )
-       truetype? ( gd )
-       webp? ( gd )
-       cjk? ( gd )
-       exif? ( gd )
-       xpm? ( gd )
+       truetype? ( gd zlib )
+       webp? ( gd zlib )
+       cjk? ( gd zlib )
+       exif? ( gd zlib )
+       xpm? ( gd zlib )
        gd? ( zlib )
        simplexml? ( xml )
        soap? ( xml )

diff --git a/dev-lang/php/php-7.1.18.ebuild b/dev-lang/php/php-7.1.18.ebuild
index f53642ef965..b7d2c829465 100644
--- a/dev-lang/php/php-7.1.18.ebuild
+++ b/dev-lang/php/php-7.1.18.ebuild
@@ -123,11 +123,11 @@ DEPEND="${COMMON_DEPEND}
 REQUIRED_USE="
        || ( cli cgi fpm apache2 embed phpdbg )
        cli? ( ^^ ( readline libedit ) )
-       truetype? ( gd )
-       webp? ( gd )
-       cjk? ( gd )
-       exif? ( gd )
-       xpm? ( gd )
+       truetype? ( gd zlib )
+       webp? ( gd zlib )
+       cjk? ( gd zlib )
+       exif? ( gd zlib )
+       xpm? ( gd zlib )
        gd? ( zlib )
        simplexml? ( xml )
        soap? ( xml )

diff --git a/dev-lang/php/php-7.1.19.ebuild b/dev-lang/php/php-7.1.19.ebuild
index 1432a2ae457..d649e1715b3 100644
--- a/dev-lang/php/php-7.1.19.ebuild
+++ b/dev-lang/php/php-7.1.19.ebuild
@@ -123,11 +123,11 @@ DEPEND="${COMMON_DEPEND}
 REQUIRED_USE="
        || ( cli cgi fpm apache2 embed phpdbg )
        cli? ( ^^ ( readline libedit ) )
-       truetype? ( gd )
-       webp? ( gd )
-       cjk? ( gd )
-       exif? ( gd )
-       xpm? ( gd )
+       truetype? ( gd zlib )
+       webp? ( gd zlib )
+       cjk? ( gd zlib )
+       exif? ( gd zlib )
+       xpm? ( gd zlib )
        gd? ( zlib )
        simplexml? ( xml )
        soap? ( xml )

diff --git a/dev-lang/php/php-7.2.7.ebuild b/dev-lang/php/php-7.2.7.ebuild
index ecf193ae0d1..4bc61dfc550 100644
--- a/dev-lang/php/php-7.2.7.ebuild
+++ b/dev-lang/php/php-7.2.7.ebuild
@@ -127,11 +127,11 @@ DEPEND="${COMMON_DEPEND}
 REQUIRED_USE="
        || ( cli cgi fpm apache2 embed phpdbg )
        cli? ( ^^ ( readline libedit ) )
-       truetype? ( gd )
-       webp? ( gd )
-       cjk? ( gd )
-       exif? ( gd )
-       xpm? ( gd )
+       truetype? ( gd zlib )
+       webp? ( gd zlib )
+       cjk? ( gd zlib )
+       exif? ( gd zlib )
+       xpm? ( gd zlib )
        gd? ( zlib )
        simplexml? ( xml )
        soap? ( xml )

diff --git a/dev-lang/php/php-7.3.0_alpha1.ebuild 
b/dev-lang/php/php-7.3.0_alpha1.ebuild
index 27d2d493ca1..ba87c83f797 100644
--- a/dev-lang/php/php-7.3.0_alpha1.ebuild
+++ b/dev-lang/php/php-7.3.0_alpha1.ebuild
@@ -130,11 +130,11 @@ DEPEND="${COMMON_DEPEND}
 REQUIRED_USE="
        || ( cli cgi fpm apache2 embed phpdbg )
        cli? ( ^^ ( readline libedit ) )
-       truetype? ( gd )
-       webp? ( gd )
-       cjk? ( gd )
-       exif? ( gd )
-       xpm? ( gd )
+       truetype? ( gd zlib )
+       webp? ( gd zlib )
+       cjk? ( gd zlib )
+       exif? ( gd zlib )
+       xpm? ( gd zlib )
        gd? ( zlib )
        simplexml? ( xml )
        soap? ( xml )

diff --git a/dev-lang/php/php-7.3.0_alpha3.ebuild 
b/dev-lang/php/php-7.3.0_alpha3.ebuild
index 532071c6487..ecc2efff30e 100644
--- a/dev-lang/php/php-7.3.0_alpha3.ebuild
+++ b/dev-lang/php/php-7.3.0_alpha3.ebuild
@@ -130,11 +130,11 @@ DEPEND="${COMMON_DEPEND}
 REQUIRED_USE="
        || ( cli cgi fpm apache2 embed phpdbg )
        cli? ( ^^ ( readline libedit ) )
-       truetype? ( gd )
-       webp? ( gd )
-       cjk? ( gd )
-       exif? ( gd )
-       xpm? ( gd )
+       truetype? ( gd zlib )
+       webp? ( gd zlib )
+       cjk? ( gd zlib )
+       exif? ( gd zlib )
+       xpm? ( gd zlib )
        gd? ( zlib )
        simplexml? ( xml )
        soap? ( xml )

Reply via email to