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 04DFD139695 for ; Wed, 26 Jul 2017 16:00:14 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 1FE201FC069; Wed, 26 Jul 2017 16:00:13 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (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 F03E4E0DD3 for ; Wed, 26 Jul 2017 16:00:12 +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 E8201341736 for ; Wed, 26 Jul 2017 16:00:11 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 4416474BC for ; Wed, 26 Jul 2017 16:00:10 +0000 (UTC) From: "Michael Orlitzky" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Michael Orlitzky" Message-ID: <1501084655.288b21920a83731a4c08c541ba5f73544c850f04.mjo@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: app-eselect/eselect-php/ X-VCS-Repository: repo/gentoo X-VCS-Files: app-eselect/eselect-php/eselect-php-9999.ebuild X-VCS-Directories: app-eselect/eselect-php/ X-VCS-Committer: mjo X-VCS-Committer-Name: Michael Orlitzky X-VCS-Revision: 288b21920a83731a4c08c541ba5f73544c850f04 X-VCS-Branch: master Date: Wed, 26 Jul 2017 16:00:10 +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: 1453bcd9-c8bc-4e11-a8ea-4b256f688b79 X-Archives-Hash: 0d1b10cca45049c58977377fcbeb6469 commit: 288b21920a83731a4c08c541ba5f73544c850f04 Author: Michael Orlitzky gentoo org> AuthorDate: Wed Jul 26 15:28:18 2017 +0000 Commit: Michael Orlitzky gentoo org> CommitDate: Wed Jul 26 15:57:35 2017 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=288b2192 app-eselect/eselect-php: update the live ebuild for recent repo changes. Package-Manager: Portage-2.3.6, Repoman-2.3.1 app-eselect/eselect-php/eselect-php-9999.ebuild | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/app-eselect/eselect-php/eselect-php-9999.ebuild b/app-eselect/eselect-php/eselect-php-9999.ebuild index f32c4a68a2f..7a707fb1480 100644 --- a/app-eselect/eselect-php/eselect-php-9999.ebuild +++ b/app-eselect/eselect-php/eselect-php-9999.ebuild @@ -16,8 +16,8 @@ IUSE="fpm apache2" # The "DirectoryIndex" line in 70_mod_php.conf requires mod_dir. RDEPEND="app-admin/eselect - sys-apps/gentoo-functions - apache2? ( www-servers/apache[apache2_modules_dir] )" + apache2? ( www-servers/apache[apache2_modules_dir] ) + fpm? ( sys-apps/gentoo-functions )" src_prepare() { eapply_user @@ -28,7 +28,14 @@ src_configure(){ # We expect localstatedir to be "var"ish, not "var/lib"ish, because # that's what PHP upstream expects. See for example the FPM # configuration where they put logs in @localstatedir@/log. - econf --localstatedir="${EPREFIX}"/var $(use_enable apache2) $(use_enable fpm) + # + # The libdir is passed explicitly in case the /usr/lib symlink + # is not present (bug 624528). + econf --libdir="${EPREFIX}/usr/$(get_libdir)" \ + --localstatedir="${EPREFIX}/var" \ + --with-piddir="${EPREFIX}/run" \ + $(use_enable apache2) \ + $(use_enable fpm) } src_install() {