From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id D7E0F1382C5 for ; Fri, 2 Mar 2018 02:10:42 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id B8E6FE0934; Fri, 2 Mar 2018 02:10:41 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 950F5E0960 for ; Fri, 2 Mar 2018 02:10:41 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 285F5335C34 for ; Fri, 2 Mar 2018 02:10:40 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 9F429235 for ; Fri, 2 Mar 2018 02:10:38 +0000 (UTC) From: "Brian Evans" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Brian Evans" Message-ID: <1519956623.e4cb484c2c7c5764e6701a00dd6dd1cff414d270.grknight@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: dev-lang/php/ X-VCS-Repository: repo/gentoo X-VCS-Files: dev-lang/php/php-7.0.28.ebuild X-VCS-Directories: dev-lang/php/ X-VCS-Committer: grknight X-VCS-Committer-Name: Brian Evans X-VCS-Revision: e4cb484c2c7c5764e6701a00dd6dd1cff414d270 X-VCS-Branch: master Date: Fri, 2 Mar 2018 02:10:38 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: fa825f24-89a3-4a2e-859b-49674200bf1a X-Archives-Hash: 45a3d6f54b8f8102fefc7d7947cd10af commit: e4cb484c2c7c5764e6701a00dd6dd1cff414d270 Author: Brian Evans gentoo org> AuthorDate: Fri Mar 2 02:04:26 2018 +0000 Commit: Brian Evans gentoo 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