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