diff options
author | Michael Orlitzky <mjo@gentoo.org> | 2016-12-08 19:35:40 -0500 |
---|---|---|
committer | Michael Orlitzky <mjo@gentoo.org> | 2016-12-08 23:34:41 -0500 |
commit | 685ee720dc8485bdfa3e513daa5b5b8f07d047d0 (patch) | |
tree | 4fa04f67c4eeacc29e80321f212e4eeebd234708 /dev-lang | |
parent | dev-lang/php: three new revisions adding ACL support for php-fpm. (diff) | |
download | gentoo-685ee720dc8485bdfa3e513daa5b5b8f07d047d0.tar.gz gentoo-685ee720dc8485bdfa3e513daa5b5b8f07d047d0.tar.bz2 gentoo-685ee720dc8485bdfa3e513daa5b5b8f07d047d0.zip |
dev-lang/php: allow app-text/htmltidy in php:7.1.
To help phase out the abandoned and buggy app-text/htmltidy, I tried
to make the new php:7.1 depend on app-text/tidy-html5
instead. However, since older versions of PHP do not support
tidy-html5, that causes a problem: php:7.1 cannot be installed
alongside the older versions when USE=tidy is set for both of them.
This solution is somewhat of a cop out, allowing htmltidy to be used
in php:7.1 as a last resort. The alternative would have been to
backport the tidy-html5 support to (both) older versions of PHP. That
may eventually become necessary if it looks like htmltidy will be
masked for removal; however, for now, this is the path of least
resistance.
Gentoo-Bug: 601614
Package-Manager: portage-2.3.0
Diffstat (limited to 'dev-lang')
-rw-r--r-- | dev-lang/php/php-7.1.0-r2.ebuild (renamed from dev-lang/php/php-7.1.0-r1.ebuild) | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/dev-lang/php/php-7.1.0-r1.ebuild b/dev-lang/php/php-7.1.0-r2.ebuild index bd32aea490ff..d0298d28bff5 100644 --- a/dev-lang/php/php-7.1.0-r1.ebuild +++ b/dev-lang/php/php-7.1.0-r2.ebuild @@ -101,7 +101,7 @@ COMMON_DEPEND=" !libressl? ( dev-libs/openssl:0 ) libressl? ( dev-libs/libressl ) ) - tidy? ( app-text/tidy-html5 ) + tidy? ( || ( app-text/tidy-html5 app-text/htmltidy ) ) truetype? ( =media-libs/freetype-2* !gd? ( |