diff options
author | Michael Orlitzky <mjo@gentoo.org> | 2016-07-10 21:25:46 -0400 |
---|---|---|
committer | Michael Orlitzky <mjo@gentoo.org> | 2016-07-10 21:26:01 -0400 |
commit | 7cd30f93ff9444fe97fe6ed2f44979c8598cf26a (patch) | |
tree | a1fed10f0435d655ad716d6cce8912a0de0dde02 /dev-lang/php/php-7.0.8.ebuild | |
parent | 361fb48dfdefd0b5442dd36e1b3d9a2cb47f8b07 (diff) | |
download | gentoo-7cd30f93ff9444fe97fe6ed2f44979c8598cf26a.tar.gz gentoo-7cd30f93ff9444fe97fe6ed2f44979c8598cf26a.tar.xz |
dev-lang/php: new edit/revision to hide some elog messages when possible.
Two of the elog messages that we show only need to be dealt with
once. If the user has the recently-emerged slot of PHP in his
PHP_TARGETS already, then we don't need to bug him about that. And if
he has PHP_INI_VERSION set to a legal value, then we don't need to
inform him about that either.
A new revision is made for the php-5.6.x series. The 7.x series is not
stable, so an in-place edit was made.
Gentoo-Bug: 440574
Package-Manager: portage-2.2.28
Diffstat (limited to 'dev-lang/php/php-7.0.8.ebuild')
-rw-r--r-- | dev-lang/php/php-7.0.8.ebuild | 47 |
1 files changed, 27 insertions, 20 deletions
diff --git a/dev-lang/php/php-7.0.8.ebuild b/dev-lang/php/php-7.0.8.ebuild index fbc800d86da..5925bb3a4da 100644 --- a/dev-lang/php/php-7.0.8.ebuild +++ b/dev-lang/php/php-7.0.8.ebuild @@ -204,16 +204,12 @@ DEPEND="${DEPEND} >=sys-devel/libtool-1.5.18" # Allow users to install production version if they want to +if [[ "${PHP_INI_VERSION}" == "production" ]]; then + PHP_INI_UPSTREAM="php.ini-production" +else + PHP_INI_UPSTREAM="php.ini-development" +fi -case "${PHP_INI_VERSION}" in - production|development) - ;; - *) - PHP_INI_VERSION="development" - ;; -esac - -PHP_INI_UPSTREAM="php.ini-${PHP_INI_VERSION}" PHP_INI_FILE="php.ini" want_apache @@ -770,17 +766,28 @@ pkg_postinst() { # supposed to remove that dead link per bug 572436. eselect php cleanup || die - elog "To build extensions for this version of PHP, you will need to" - elog "add php${SLOT/./-} to your PHP_TARGETS USE_EXPAND variable." - elog - elog "This ebuild installed a version of php.ini based on" - elog "php.ini-${PHP_INI_VERSION}. You can choose which version of" - elog "php.ini to install by default by setting PHP_INI_VERSION" - elog "to either 'production' or 'development' in your make.conf." - elog "Both versions of php.ini can be found with the PHP docs in" - elog "${EPREFIX}/usr/share/doc/${PF}" - elog - elog "For more details on how version slotting works, please see" + if ! has "php${SLOT/./-}" ${PHP_TARGETS}; then + elog "To build extensions for this version of PHP, you will need to" + elog "add php${SLOT/./-} to your PHP_TARGETS USE_EXPAND variable." + elog + fi + + # Only mention PHP_INI_VERSION if the user doesn't have it set. + case "${PHP_INI_VERSION}" in + production|development) + ;; + *) + elog "This ebuild installed a version of php.ini based on" + elog "${PHP_INI_UPSTREAM}. You can choose which version of" + elog "php.ini to install by default by setting PHP_INI_VERSION" + elog "to either 'production' or 'development' in your make.conf." + elog "Both versions of php.ini can be found with the PHP docs in" + elog "${EPREFIX}/usr/share/doc/${PF}" + elog + ;; + esac + + elog "For details on how version slotting works, please see" elog "the wiki:" elog elog " https://wiki.gentoo.org/wiki/PHP" |