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 922A81382C5 for ; Tue, 8 Dec 2020 02:32:52 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id A6A4DE0870; Tue, 8 Dec 2020 02:32:50 +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 8E6AEE0870 for ; Tue, 8 Dec 2020 02:32:50 +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 167DA340FCC for ; Tue, 8 Dec 2020 02:32:49 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 78041481 for ; Tue, 8 Dec 2020 02:32:47 +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: <1607394744.8c791c3e47ecf2ad892b2585ae732ad49965ee70.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-8.0.0.ebuild X-VCS-Directories: dev-lang/php/ X-VCS-Committer: grknight X-VCS-Committer-Name: Brian Evans X-VCS-Revision: 8c791c3e47ecf2ad892b2585ae732ad49965ee70 X-VCS-Branch: master Date: Tue, 8 Dec 2020 02:32:47 +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: 6a97f7b6-89b0-4340-80b8-ac864c82b182 X-Archives-Hash: bd0e09ca0baf819bd045f4d894f1bac7 commit: 8c791c3e47ecf2ad892b2585ae732ad49965ee70 Author: Brian Evans gentoo org> AuthorDate: Tue Dec 8 02:32:24 2020 +0000 Commit: Brian Evans gentoo org> CommitDate: Tue Dec 8 02:32:24 2020 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8c791c3e dev-lang/php: Fix embed and apache2 installs for 8.0.0 Signed-off-by: Brian Evans gentoo.org> dev-lang/php/php-8.0.0.ebuild | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/dev-lang/php/php-8.0.0.ebuild b/dev-lang/php/php-8.0.0.ebuild index 59f2e692f17..801d79b66ce 100644 --- a/dev-lang/php/php-8.0.0.ebuild +++ b/dev-lang/php/php-8.0.0.ebuild @@ -75,7 +75,7 @@ RESTRICT="!test? ( test )" # the ./configure script. Other versions *work*, but we need to stick to # the ones that can be detected to avoid a repeat of bug #564824. COMMON_DEPEND=" - >=app-eselect/eselect-php-0.9.1[apache2?,fpm?] + >=app-eselect/eselect-php-0.9.7[apache2?,fpm?] >=dev-libs/libpcre2-10.30[unicode] fpm? ( acl? ( sys-apps/acl ) ) apache2? ( www-servers/apache[apache2_modules_unixd(+),threads=] ) @@ -538,7 +538,7 @@ src_install() { # We're specifically not using emake install-sapi as libtool # may cause unnecessary relink failures (see bug #351266) insinto "${PHP_DESTDIR#${EPREFIX}}/apache2/" - newins ".libs/libphp${PHP_MV}$(get_libname)" \ + newins ".libs/libphp$(get_libname)" \ "libphp${PHP_MV}$(get_libname)" keepdir "/usr/$(get_libdir)/apache2/modules" else @@ -561,7 +561,7 @@ src_install() { source="sapi/fpm/php-fpm" ;; embed) - source="libs/libphp${PHP_MV}$(get_libname)" + source="libs/libphp$(get_libname)" ;; phpdbg) source="sapi/phpdbg/phpdbg"