fix builddir related issues

(Portage version: 2.1.8.3/cvs/Linux x86_64)

4 files changed, 48 insertions, 10 deletions

diff --git a/dev-lang/php/ChangeLog b/dev-lang/php/ChangeLog
index 1f652e21c7b8..06417419ff9a 100644
--- a/dev-lang/php/ChangeLog
+++ b/dev-lang/php/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-lang/php
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/php/ChangeLog,v 1.404 2010/08/09 10:47:58 mabi Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/php/ChangeLog,v 1.405 2010/08/09 13:02:23 mabi Exp $
+
+  09 Aug 2010; Matti Bickel <mabi@gentoo.org>
+  files/eblits/src_configure-v1.eblit, files/eblits/src_configure-v52.eblit:
+  configure sapi build dirs in 5.2, too (bug #331751); use proper path for
+  libevent, fix sharedext, fpm config file install (bug #331735)
 
   09 Aug 2010; Matti Bickel <mabi@gentoo.org>
   files/eblits/src_test-v1.eblit:
diff --git a/dev-lang/php/files/eblits/src_configure-v1.eblit b/dev-lang/php/files/eblits/src_configure-v1.eblit
index 258e39e6ae78..64f077bdb464 100644
--- a/dev-lang/php/files/eblits/src_configure-v1.eblit
+++ b/dev-lang/php/files/eblits/src_configure-v1.eblit
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/php/files/eblits/src_configure-v1.eblit,v 1.5 2010/08/08 20:32:22 mabi Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/php/files/eblits/src_configure-v1.eblit,v 1.6 2010/08/09 13:02:23 mabi Exp $
 
 eblit-php-src_configure() {
 	PHP_DESTDIR="/usr/$(get_libdir)/php${PHP_MV}"
@@ -218,7 +218,7 @@ eblit-php-src_configure() {
 	fi
 
 	if has fpm ${IUSE//+} && use fpm ; then
-		my_conf="${my_conf} --with-libevent-dir=/usr/lib"
+		my_conf="${my_conf} --with-libevent-dir=/usr/`get_libdir`"
 	fi
 
 
diff --git a/dev-lang/php/files/eblits/src_configure-v52.eblit b/dev-lang/php/files/eblits/src_configure-v52.eblit
index 3808daa561e3..40af374e286a 100644
--- a/dev-lang/php/files/eblits/src_configure-v52.eblit
+++ b/dev-lang/php/files/eblits/src_configure-v52.eblit
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/php/files/eblits/src_configure-v52.eblit,v 1.1 2010/08/02 16:56:42 mabi Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/php/files/eblits/src_configure-v52.eblit,v 1.2 2010/08/09 13:02:23 mabi Exp $
 
 eblit-php-src_configure() {
 	PHP_DESTDIR="/usr/$(get_libdir)/php${SLOT}"
@@ -229,5 +229,38 @@ eblit-php-src_configure() {
 			append-ldflags "-Wl,--version-script=${FILESDIR}/php${PHP_MV}-ldvs"
 		fi
 	fi
-}
 
+	mkdir -p "${WORKDIR}/sapis-build"
+	for one_sapi in $SAPIS ; do
+		use "${one_sapi}" || continue
+		php_set_ini_dir "${one_sapi}"
+
+		cp -r "${S}" "${WORKDIR}/sapis-build/${one_sapi}"
+		cd "${WORKDIR}/sapis-build/${one_sapi}"
+
+		sapi_conf="${my_conf} --with-config-file-path=${PHP_INI_DIR}
+			--with-config-file-scan-dir=${PHP_EXT_INI_DIR_ACTIVE}"
+
+		for sapi in $SAPIS ; do
+			case "$sapi" in
+				cli|cgi|embed|fpm)
+					if [[ "${one_sapi}" == "${sapi}" ]] ; then
+						sapi_conf="${sapi_conf} --enable-${sapi}"
+					else
+						sapi_conf="${sapi_conf} --disable-${sapi}"
+					fi
+					;;
+
+				apache2)
+					if [[ "${one_sapi}" == "${sapi}" ]] ; then
+						sapi_conf="${sapi_conf} --with-apxs2=/usr/sbin/apxs"
+					else
+						sapi_conf="${sapi_conf} --without-apxs2"
+					fi
+					;;
+			esac
+		done
+
+		econf ${sapi_conf}
+	done
+}
diff --git a/dev-lang/php/files/eblits/src_install-v1.eblit b/dev-lang/php/files/eblits/src_install-v1.eblit
index ce3d578da685..defed8fd0092 100644
--- a/dev-lang/php/files/eblits/src_install-v1.eblit
+++ b/dev-lang/php/files/eblits/src_install-v1.eblit
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/php/files/eblits/src_install-v1.eblit,v 1.8 2010/08/09 10:27:53 mabi Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/php/files/eblits/src_install-v1.eblit,v 1.9 2010/08/09 13:02:23 mabi Exp $
 
 eblit-php-src_install() {
 	# see bug #324739 for what happens when we don't have that
@@ -29,7 +29,7 @@ eblit-php-src_install() {
 	# And install the modules to it
 	if use sharedext ; then
 		insinto "${extension_dir}"
-		doins "${S}/modules/"*.so
+		doins "${WORKDIR}/sapis-build/${first_sapi}/modules/"*.so
 	fi
 
 	# Generate the USE file for PHP
@@ -117,8 +117,8 @@ php_install_ini() {
 		for extension in "${D}/${extension_dir}/"*.so ; do
 			extension="${extension##*/}"
 			inifilename="${extension/.so/.ini}"
-			echo "extension=${extension}" > "${S}/modules/$inifilename"
-			doins "${S}/modules/$inifilename"
+			echo "extension=${extension}" > "${WORKDIR}/sapis-build/${phpsapi}/modules/$inifilename"
+			doins "${WORKDIR}/sapis-build/${phpsapi}/modules/$inifilename"
 			dosym "${PHP_EXT_INI_DIR}/${inifilename}" "${PHP_EXT_INI_DIR_ACTIVE}/${inifilename}"
 		done
 	fi
@@ -147,7 +147,7 @@ php_install_ini() {
 		einfo "Installing FPM CGI config file php-fpm.conf"
 		epatch "${FILESDIR}/php-fpm-gentooified.patch"
 		insinto ${PHP_INI_DIR}
-		doins "${S}/sapi/fpm/php-fpm.conf"
+		doins "${WORKDIR}/sapis-build/fpm/sapi/fpm/php-fpm.conf"
 		dodir "/etc/init.d"
 		insinto "/etc/init.d"
 		newins  "${FILESDIR}/php-fpm.init" "php-fpm"