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

Package-Manager: Portage-2.3.42, Repoman-2.3.9

diff --git a/dev-lang/php/php-5.6.35-r1.ebuild b/dev-lang/php/php-5.6.35-r1.ebuild
index 56d281890cd81c03fa6f52bd0598a84d1876fd83..152ebfe276c15ee18c19be34f28a01adc48aebc5 100644 (file)
--- 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 5b743906a99359fb91ba5ee8390d2dd13e94535c..fe5b563b7ea5ba2a882f49c5e8196ab481584ad4 100644 (file)
--- 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 a5743214637411b31cda98bb5c1a3ac49ce82f71..08da09b6482b363fbf4fdc0a0c848eeda6f55b0b 100644 (file)
--- 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 cfcbd02ee740cb7575ba40f10b2bb56f9fa2da71..9e0175a2b439a4cca8972375f4e4a576b1cdfa6f 100644 (file)
--- 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 0adf8fe59a01f0717b4b9e258a7750af1e87aac3..da637b55abbd6aa905b19b5258aacda077ac1f6f 100644 (file)
--- 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 f53642ef9653bc7744875db45d45c32cb5016632..b7d2c829465a037b2e4016c994ecd66d3cfe2ff4 100644 (file)
--- 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 1432a2ae457cc97710e49a56db3e287255039521..d649e1715b3a32a048456d62254890849a96a024 100644 (file)
--- 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 ecf193ae0d19fd7dbc4dc25d29f10de02b625d77..4bc61dfc550fdf7dae06468cb8594244dd510e7f 100644 (file)
--- 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 27d2d493ca14323ff2bab369fbf53c3af3d6fcc4..ba87c83f797e974e93492eb6acbe30118a952ec7 100644 (file)
--- 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 532071c64877862a4bfedf82743a312728145114..ecc2efff30e7aef519982c1326bda7b8f17ad82d 100644 (file)
--- 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 )