[gentoo-commits] repo/gentoo:master commit in: app-eselect/eselect-php/

[Michael Orlitzky]

commit:     288b21920a83731a4c08c541ba5f73544c850f04
Author:     Michael Orlitzky <mjo <AT> gentoo <DOT> org>
AuthorDate: Wed Jul 26 15:28:18 2017 +0000
Commit:     Michael Orlitzky <mjo <AT> gentoo <DOT> 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() {