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 3744B138350 for ; Mon, 2 Mar 2020 02:51:56 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 54701E08DA; Mon, 2 Mar 2020 02:51:55 +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 24C41E08DA for ; Mon, 2 Mar 2020 02:51:55 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (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 9D0D734F03F for ; Mon, 2 Mar 2020 02:51:53 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 10050148 for ; Mon, 2 Mar 2020 02:51:52 +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: <1583117412.1da1f7fe7ebc3a02ada674c2a65900ed076ae0a6.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.2.28-r1.ebuild dev-lang/php/php-7.3.15-r1.ebuild dev-lang/php/php-7.4.3-r1.ebuild X-VCS-Directories: dev-lang/php/ X-VCS-Committer: grknight X-VCS-Committer-Name: Brian Evans X-VCS-Revision: 1da1f7fe7ebc3a02ada674c2a65900ed076ae0a6 X-VCS-Branch: master Date: Mon, 2 Mar 2020 02:51:52 +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-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 85c72958-1782-4289-a166-9e3487e9afac X-Archives-Hash: 99864c35b69a655dba185845c1190d06 commit: 1da1f7fe7ebc3a02ada674c2a65900ed076ae0a6 Author: Brian Evans gentoo org> AuthorDate: Mon Mar 2 02:50:12 2020 +0000 Commit: Brian Evans gentoo org> CommitDate: Mon Mar 2 02:50:12 2020 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1da1f7fe dev-lang/php: Fix installation of phar command Originally added in the wrong location as it requires the cli SAPI to be active Bug: https://bugs.gentoo.org/707876 Signed-off-by: Brian Evans gentoo.org> dev-lang/php/php-7.2.28-r1.ebuild | 8 +++++--- dev-lang/php/php-7.3.15-r1.ebuild | 8 +++++--- dev-lang/php/php-7.4.3-r1.ebuild | 8 +++++--- 3 files changed, 15 insertions(+), 9 deletions(-) diff --git a/dev-lang/php/php-7.2.28-r1.ebuild b/dev-lang/php/php-7.2.28-r1.ebuild index b5a5a227589..3fbf7551268 100644 --- a/dev-lang/php/php-7.2.28-r1.ebuild +++ b/dev-lang/php/php-7.2.28-r1.ebuild @@ -530,9 +530,6 @@ src_install() { emake INSTALL_ROOT="${D}" \ install-build install-headers install-programs - # Install the "phar" archive utility. - use phar && emake INSTALL_ROOT="${D}" install-pharcmd - local extension_dir="$("${ED}/${PHP_DESTDIR#${EPREFIX}}/bin/php-config" --extension-dir)" # Create the directory where we'll put version-specific php scripts @@ -560,6 +557,11 @@ src_install() { case "$sapi" in cli) source="sapi/cli/php" + # Install the "phar" archive utility. + if use phar ; then + emake INSTALL_ROOT="${D}" install-pharcmd + dosym "${dest}/bin/phar" "/usr/bin/phar${SLOT}" + fi ;; cgi) source="sapi/cgi/php-cgi" diff --git a/dev-lang/php/php-7.3.15-r1.ebuild b/dev-lang/php/php-7.3.15-r1.ebuild index e2dc3f12050..186360d2ab6 100644 --- a/dev-lang/php/php-7.3.15-r1.ebuild +++ b/dev-lang/php/php-7.3.15-r1.ebuild @@ -531,9 +531,6 @@ src_install() { emake INSTALL_ROOT="${D}" \ install-build install-headers install-programs - # Install the "phar" archive utility. - use phar && emake INSTALL_ROOT="${D}" install-pharcmd - local extension_dir="$("${ED}/${PHP_DESTDIR#${EPREFIX}}/bin/php-config" --extension-dir)" # Create the directory where we'll put version-specific php scripts @@ -561,6 +558,11 @@ src_install() { case "$sapi" in cli) source="sapi/cli/php" + # Install the "phar" archive utility. + if use phar ; then + emake INSTALL_ROOT="${D}" install-pharcmd + dosym "${dest}/bin/phar" "/usr/bin/phar${SLOT}" + fi ;; cgi) source="sapi/cgi/php-cgi" diff --git a/dev-lang/php/php-7.4.3-r1.ebuild b/dev-lang/php/php-7.4.3-r1.ebuild index 97bb7fcbf21..4bc7906738b 100644 --- a/dev-lang/php/php-7.4.3-r1.ebuild +++ b/dev-lang/php/php-7.4.3-r1.ebuild @@ -521,9 +521,6 @@ src_install() { emake INSTALL_ROOT="${D}" \ install-build install-headers install-programs - # Install the "phar" archive utility. - use phar && emake INSTALL_ROOT="${D}" install-pharcmd - local extension_dir="$("${ED}/${PHP_DESTDIR#${EPREFIX}}/bin/php-config" --extension-dir)" # Create the directory where we'll put version-specific php scripts @@ -551,6 +548,11 @@ src_install() { case "$sapi" in cli) source="sapi/cli/php" + # Install the "phar" archive utility. + if use phar ; then + emake INSTALL_ROOT="${D}" install-pharcmd + dosym "${dest}/bin/phar" "/usr/bin/phar${SLOT}" + fi ;; cgi) source="sapi/cgi/php-cgi"