[gentoo-commits] repo/gentoo:master commit in: dev-lang/php/

[Brian Evans]

commit:     e4cb484c2c7c5764e6701a00dd6dd1cff414d270
Author:     Brian Evans <grknight <AT> gentoo <DOT> org>
AuthorDate: Fri Mar  2 02:04:26 2018 +0000
Commit:     Brian Evans <grknight <AT> gentoo <DOT> org>
CommitDate: Fri Mar  2 02:10:23 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e4cb484c

dev-lang/php: move fpm-systemd specific option to that SAPI

Package-Manager: Portage-2.3.24, Repoman-2.3.6

 dev-lang/php/php-7.0.28.ebuild | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/dev-lang/php/php-7.0.28.ebuild b/dev-lang/php/php-7.0.28.ebuild
index 6757747f0ea..45b3218e4f6 100644
--- a/dev-lang/php/php-7.0.28.ebuild
+++ b/dev-lang/php/php-7.0.28.ebuild
@@ -301,7 +301,6 @@ src_configure() {
                $(use_enable sysvipc sysvmsg)
                $(use_enable sysvipc sysvsem)
                $(use_enable sysvipc sysvshm)
-               $(use_with systemd fpm-systemd)
                $(use_with tidy tidy "${EPREFIX}/usr")
                $(use_enable tokenizer tokenizer)
                $(use_enable wddx wddx)
@@ -457,7 +456,12 @@ src_configure() {
                                cli|cgi|embed|fpm|phpdbg)
                                        if [[ "${one_sapi}" == "${sapi}" ]] ; 
then
                                                sapi_conf+=( "--enable-${sapi}" 
)
-                                               [[ "fpm" == "${sapi}" ]] && 
sapi_conf+=( $(use_with acl fpm-acl) )
+                                               if [[ "fpm" == "${sapi}" ]] ; 
then
+                                                       sapi_conf+=(
+                                                               $(use_with acl 
fpm-acl)
+                                                               $(use_with 
systemd fpm-systemd)
+                                                       )
+                                               fi
                                        else
                                                sapi_conf+=( 
"--disable-${sapi}" )
                                        fi