| 1 |
commit: b3035c9a156c3d57cb14f1d712fa8576d6877e7d |
| 2 |
Author: Michael Orlitzky <mjo <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Thu Jan 28 01:43:01 2016 +0000 |
| 4 |
Commit: Michael Orlitzky <mjo <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Thu Jan 28 14:45:39 2016 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b3035c9a |
| 7 |
|
| 8 |
dev-lang/php: enforce what was an elog warning with REQUIRED_USE. |
| 9 |
|
| 10 |
The interactive "php -a" command-line interface will hang unless PHP |
| 11 |
is built with USE=readline. This used to be an elog warning, but was |
| 12 |
rather easy to overlook and mysterious to those who hit the bug. We |
| 13 |
already have REQUIRED_USE for our other flags, so it makes sense to |
| 14 |
enforce the cli dependency on readline there. |
| 15 |
|
| 16 |
Package-Manager: portage-2.2.26 |
| 17 |
|
| 18 |
dev-lang/php/{php-5.6.17-r4.ebuild => php-5.6.17-r5.ebuild} | 7 ++----- |
| 19 |
dev-lang/php/{php-7.0.2-r4.ebuild => php-7.0.2-r5.ebuild} | 7 ++----- |
| 20 |
2 files changed, 4 insertions(+), 10 deletions(-) |
| 21 |
|
| 22 |
diff --git a/dev-lang/php/php-5.6.17-r4.ebuild b/dev-lang/php/php-5.6.17-r5.ebuild |
| 23 |
similarity index 99% |
| 24 |
rename from dev-lang/php/php-5.6.17-r4.ebuild |
| 25 |
rename to dev-lang/php/php-5.6.17-r5.ebuild |
| 26 |
index 184650e..82e7a03 100644 |
| 27 |
--- a/dev-lang/php/php-5.6.17-r4.ebuild |
| 28 |
+++ b/dev-lang/php/php-5.6.17-r5.ebuild |
| 29 |
@@ -165,7 +165,9 @@ DEPEND="${DEPEND} |
| 30 |
|
| 31 |
php="=${CATEGORY}/${PF}" |
| 32 |
|
| 33 |
+# Without USE=readline, the interactive "php -a" CLI will hang. |
| 34 |
REQUIRED_USE=" |
| 35 |
+ cli? ( readline ) |
| 36 |
truetype? ( gd ) |
| 37 |
vpx? ( gd ) |
| 38 |
cjk? ( gd ) |
| 39 |
@@ -774,11 +776,6 @@ pkg_postinst() { |
| 40 |
elog "Make sure that PHP_TARGETS in ${EPREFIX}/etc/make.conf includes" |
| 41 |
elog "php${SLOT/./-} in order to compile extensions for the ${SLOT} ABI." |
| 42 |
elog |
| 43 |
- if ! use readline && use cli ; then |
| 44 |
- ewarn "Note that in order to use php interactivly, you need to" |
| 45 |
- ewarn "enable the readline USE flag or php -a will hang." |
| 46 |
- elog |
| 47 |
- fi |
| 48 |
elog "This ebuild installed a version of php.ini based on" |
| 49 |
elog "php.ini-${PHP_INI_VERSION}. You can choose which version of" |
| 50 |
elog "php.ini to install by default by setting PHP_INI_VERSION" |
| 51 |
|
| 52 |
diff --git a/dev-lang/php/php-7.0.2-r4.ebuild b/dev-lang/php/php-7.0.2-r5.ebuild |
| 53 |
similarity index 99% |
| 54 |
rename from dev-lang/php/php-7.0.2-r4.ebuild |
| 55 |
rename to dev-lang/php/php-7.0.2-r5.ebuild |
| 56 |
index f5d4818..e502be4 100644 |
| 57 |
--- a/dev-lang/php/php-7.0.2-r4.ebuild |
| 58 |
+++ b/dev-lang/php/php-7.0.2-r5.ebuild |
| 59 |
@@ -158,7 +158,9 @@ DEPEND="${DEPEND} |
| 60 |
|
| 61 |
php="=${CATEGORY}/${PF}" |
| 62 |
|
| 63 |
+# Without USE=readline, the interactive "php -a" CLI will hang. |
| 64 |
REQUIRED_USE=" |
| 65 |
+ cli? ( readline ) |
| 66 |
truetype? ( gd ) |
| 67 |
vpx? ( gd ) |
| 68 |
cjk? ( gd ) |
| 69 |
@@ -766,11 +768,6 @@ pkg_postinst() { |
| 70 |
elog "Make sure that PHP_TARGETS in ${EPREFIX}/etc/make.conf includes" |
| 71 |
elog "php${SLOT/./-} in order to compile extensions for the ${SLOT} ABI." |
| 72 |
elog |
| 73 |
- if ! use readline && use cli ; then |
| 74 |
- ewarn "Note that in order to use php interactivly, you need to" |
| 75 |
- ewarn "enable the readline USE flag or php -a will hang." |
| 76 |
- elog |
| 77 |
- fi |
| 78 |
elog "This ebuild installed a version of php.ini based on" |
| 79 |
elog "php.ini-${PHP_INI_VERSION}. You can choose which version of" |
| 80 |
elog "php.ini to install by default by setting PHP_INI_VERSION" |
Archives