| 1 |
commit: 437fd8af0fe8caa9255289360f7bc2e49b948b2d |
| 2 |
Author: Brian Evans <grknight <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Mon Jul 17 13:21:12 2017 +0000 |
| 4 |
Commit: Brian Evans <grknight <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Mon Jul 17 13:43:32 2017 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=437fd8af |
| 7 |
|
| 8 |
dev-lang/php: Adjust REQUIRED_USE for GLEP73 |
| 9 |
|
| 10 |
Package-Manager: Portage-2.3.6, Repoman-2.3.2 |
| 11 |
|
| 12 |
dev-lang/php/php-5.6.31.ebuild | 9 ++++----- |
| 13 |
dev-lang/php/php-7.0.21.ebuild | 7 ++++--- |
| 14 |
dev-lang/php/php-7.1.7.ebuild | 15 ++++++++------- |
| 15 |
3 files changed, 16 insertions(+), 15 deletions(-) |
| 16 |
|
| 17 |
diff --git a/dev-lang/php/php-5.6.31.ebuild b/dev-lang/php/php-5.6.31.ebuild |
| 18 |
index 244e5325b27..7310a78821e 100644 |
| 19 |
--- a/dev-lang/php/php-5.6.31.ebuild |
| 20 |
+++ b/dev-lang/php/php-5.6.31.ebuild |
| 21 |
@@ -145,14 +145,14 @@ DEPEND="${COMMON_DEPEND} |
| 22 |
|
| 23 |
# Without USE=readline or libedit, the interactive "php -a" CLI will hang. |
| 24 |
REQUIRED_USE=" |
| 25 |
+ || ( cli cgi fpm apache2 embed ) |
| 26 |
cli? ( ^^ ( readline libedit ) ) |
| 27 |
+ gd? ( zlib ) |
| 28 |
truetype? ( gd ) |
| 29 |
vpx? ( gd ) |
| 30 |
cjk? ( gd ) |
| 31 |
exif? ( gd ) |
| 32 |
- |
| 33 |
xpm? ( gd ) |
| 34 |
- gd? ( zlib ) |
| 35 |
simplexml? ( xml ) |
| 36 |
soap? ( xml ) |
| 37 |
wddx? ( xml ) |
| 38 |
@@ -162,6 +162,7 @@ REQUIRED_USE=" |
| 39 |
ldap-sasl? ( ldap ) |
| 40 |
mhash? ( hash ) |
| 41 |
phar? ( hash ) |
| 42 |
+ recode? ( !imap !mysql !mysqli !libmysqlclient ) |
| 43 |
libmysqlclient? ( || ( |
| 44 |
mysql |
| 45 |
mysqli |
| 46 |
@@ -170,10 +171,8 @@ REQUIRED_USE=" |
| 47 |
|
| 48 |
qdbm? ( !gdbm ) |
| 49 |
readline? ( !libedit ) |
| 50 |
- recode? ( !imap !mysql !mysqli ) |
| 51 |
sharedmem? ( !threads ) |
| 52 |
- |
| 53 |
- !cli? ( !cgi? ( !fpm? ( !apache2? ( !embed? ( cli ) ) ) ) )" |
| 54 |
+" |
| 55 |
|
| 56 |
PHP_MV="$(get_major_version)" |
| 57 |
|
| 58 |
|
| 59 |
diff --git a/dev-lang/php/php-7.0.21.ebuild b/dev-lang/php/php-7.0.21.ebuild |
| 60 |
index dd6ee29f566..90e9c59f5df 100644 |
| 61 |
--- a/dev-lang/php/php-7.0.21.ebuild |
| 62 |
+++ b/dev-lang/php/php-7.0.21.ebuild |
| 63 |
@@ -139,13 +139,14 @@ DEPEND="${COMMON_DEPEND} |
| 64 |
|
| 65 |
# Without USE=readline or libedit, the interactive "php -a" CLI will hang. |
| 66 |
REQUIRED_USE=" |
| 67 |
+ || ( cli cgi fpm apache2 embed phpdbg ) |
| 68 |
cli? ( ^^ ( readline libedit ) ) |
| 69 |
+ gd? ( zlib ) |
| 70 |
truetype? ( gd ) |
| 71 |
webp? ( gd ) |
| 72 |
cjk? ( gd ) |
| 73 |
exif? ( gd ) |
| 74 |
xpm? ( gd ) |
| 75 |
- gd? ( zlib ) |
| 76 |
simplexml? ( xml ) |
| 77 |
soap? ( xml ) |
| 78 |
wddx? ( xml ) |
| 79 |
@@ -157,10 +158,10 @@ REQUIRED_USE=" |
| 80 |
phar? ( hash ) |
| 81 |
qdbm? ( !gdbm ) |
| 82 |
readline? ( !libedit ) |
| 83 |
- recode? ( !imap !mysqli ) |
| 84 |
+ recode? ( !imap !mysqli !mysql ) |
| 85 |
sharedmem? ( !threads ) |
| 86 |
mysql? ( || ( mysqli pdo ) ) |
| 87 |
- || ( cli cgi fpm apache2 embed phpdbg )" |
| 88 |
+" |
| 89 |
|
| 90 |
PHP_MV="$(get_major_version)" |
| 91 |
|
| 92 |
|
| 93 |
diff --git a/dev-lang/php/php-7.1.7.ebuild b/dev-lang/php/php-7.1.7.ebuild |
| 94 |
index 05df33e58a1..dca745576e5 100644 |
| 95 |
--- a/dev-lang/php/php-7.1.7.ebuild |
| 96 |
+++ b/dev-lang/php/php-7.1.7.ebuild |
| 97 |
@@ -121,13 +121,14 @@ DEPEND="${COMMON_DEPEND} |
| 98 |
|
| 99 |
# Without USE=readline or libedit, the interactive "php -a" CLI will hang. |
| 100 |
REQUIRED_USE=" |
| 101 |
+ || ( cli cgi fpm apache2 embed phpdbg ) |
| 102 |
cli? ( ^^ ( readline libedit ) ) |
| 103 |
- truetype? ( gd zlib ) |
| 104 |
- webp? ( gd zlib ) |
| 105 |
- cjk? ( gd zlib ) |
| 106 |
- exif? ( gd zlib ) |
| 107 |
- xpm? ( gd zlib ) |
| 108 |
gd? ( zlib ) |
| 109 |
+ truetype? ( gd ) |
| 110 |
+ webp? ( gd ) |
| 111 |
+ cjk? ( gd ) |
| 112 |
+ exif? ( gd ) |
| 113 |
+ xpm? ( gd ) |
| 114 |
simplexml? ( xml ) |
| 115 |
soap? ( xml ) |
| 116 |
wddx? ( xml ) |
| 117 |
@@ -139,10 +140,10 @@ REQUIRED_USE=" |
| 118 |
phar? ( hash ) |
| 119 |
qdbm? ( !gdbm ) |
| 120 |
readline? ( !libedit ) |
| 121 |
- recode? ( !imap !mysqli ) |
| 122 |
+ recode? ( !imap !mysqli !mysql ) |
| 123 |
sharedmem? ( !threads ) |
| 124 |
mysql? ( || ( mysqli pdo ) ) |
| 125 |
- || ( cli cgi fpm apache2 embed phpdbg )" |
| 126 |
+" |
| 127 |
|
| 128 |
PHP_MV="$(get_major_version)" |
Archives