fix builddir related issues

Package-Manager: portage-2.1.8.3/cvs/Linux x86_64

5 files changed, 52 insertions, 14 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/Manifest b/dev-lang/php/Manifest
index b886d938b3dd..c965e6522513 100644
--- a/dev-lang/php/Manifest
+++ b/dev-lang/php/Manifest
@@ -7,9 +7,9 @@ AUX eblits/common-v1.eblit 376 RMD160 524d38035ef01b215c6dc06699c41550c246de9d S
 AUX eblits/pkg_postinst-v1.eblit 2184 RMD160 ce65ba811eab10862d067c7e2b4bdc8d2b0aee56 SHA1 11c14f2235041cfb08e33cf2550bebef2037e92b SHA256 9e1cd81be4f051f3156de0ce5398a338b2ab6f8e73047c5983beda47f2f762b0
 AUX eblits/pkg_setup-v1.eblit 777 RMD160 aa63e7ab1bae34feffbbfaae902f11c6e797ba9d SHA1 f7334a4750b1a1bb2f24021dff884733a88ac347 SHA256 2613f51ee9e3a258dbab38ff2df724f2971a50a5ad8c097cb5a4e3744df5fc8a
 AUX eblits/src_compile-v1.eblit 1183 RMD160 23aca3186c9bdefb7f9d81cb6eb3018b55d1b923 SHA1 f63650c6404e71197a5bedab071d227375b0e7c3 SHA256 172c24da709ae5d57a1da19b1f34bf965212a7df1af9cd62e3c6847131a34afc
-AUX eblits/src_configure-v1.eblit 10840 RMD160 c6954d814f3a7b6b0854e2f075d73a497dcd0178 SHA1 6575fbe4bca7df9968079ab1a6825b57ac248dd5 SHA256 53d37939f5c0a4382a09f454b6a25d2953c8b93dc59e5fc349497faafb58c909
-AUX eblits/src_configure-v52.eblit 9725 RMD160 42a1fa556a93e49ba2d15bb4404d08fb15782f74 SHA1 3ae459cf8575364a3870a66e18216d1dc49a7858 SHA256 11dc18f439dadcec9a09dd9c06a68ad6a689b9623cea6d1858565ed881b29699
-AUX eblits/src_install-v1.eblit 4909 RMD160 7523f7b1189363a04451ed3141b0c6f7465267a6 SHA1 3346dcba01d2812ecdd77ac2701ca8e3ac4afa5b SHA256 4366984f3426eca8231f8dde2f02727abf7fb5ff02fcf675d87f3f71d80683df
+AUX eblits/src_configure-v1.eblit 10849 RMD160 500822ece89b530d7fa9e1b19726d551960c9485 SHA1 4a309331ad8a6104ece12a609f567ce978fd21b2 SHA256 d39bb9e67f5e7fd6f8ad30d94abfa80da1f9cc0bb030d5caa4cb543dd3b88577
+AUX eblits/src_configure-v52.eblit 10547 RMD160 871d384d6f7ca91ea7a90b2042335256cbbbbe6c SHA1 8037a56a0a9860673009cc088c3e334691cfdbed SHA256 4124fe39604b3ddb4c4fe0523b412a3beab197b5517f54055b6f8e6bdb1f8f4f
+AUX eblits/src_install-v1.eblit 5021 RMD160 d8b79086fa4f1cd5a15c9134f4fc2096ccf16857 SHA1 d34a86ed56a090ba5d713252622a4dfd471e39f2 SHA256 a597d5582cfa8a03643029eb5d2a2aa4fb55ff3f0bac71c942e6aa0489404c1d
 AUX eblits/src_prepare-v1.eblit 2616 RMD160 ccff64d09cc90ada1ea5d1311457cf9a05f12f8e SHA1 7db40d0ca7ef01e5b61962f261511803f768f1bc SHA256 915b9755a37f7670f6e436fe5072dae8f5e6b437ccdfbff835e26bb2f9d22b1e
 AUX eblits/src_test-v1.eblit 1530 RMD160 10031a5128dab729106c6fbfe4e899b1583818cb SHA1 0f1abf995913c2c381e2496b8670ea4f6e97964b SHA256 67501925cfdaf9043e4985d0f1c797e62fb42bf47e6863b5ffdecb104888e82c
 AUX php-5.2.10-pdo_dblib.patch 559 RMD160 062604e291113b2bb86044b5eeffb72fad210fbc SHA1 d59d26e6557dac86e582e1a6ed7bb4795cf150c6 SHA256 0548d63d7379cd19f7ade6ca1222b1b577f684b142ff6b0e8e23742b1f7f9794
@@ -33,5 +33,5 @@ EBUILD php-5.2.13.ebuild 16859 RMD160 e899ea551626ec77614931e052189a51b52cac5f S
 EBUILD php-5.2.14.ebuild 9072 RMD160 431a359b11f6eea093810d4c75c91a60b81244c7 SHA1 43f10aaf4fc98cf0b5112d461b52aab3896461c2 SHA256 ca023b01ef470c5a55ce34050766c97defe08c8ca66c3c012a876bb2add3fa95
 EBUILD php-5.3.2.ebuild 9228 RMD160 a809dae438ea243e519b4b46d00ebe1cd3eb09ee SHA1 ea00f7476447459337e3c967948293d67ff32818 SHA256 868a4e6dc6a158bcdba7dc4178e2f317273775675caf061e0796ea8ec9f406f0
 EBUILD php-5.3.3-r1.ebuild 9488 RMD160 924e4983967f64f00ebe008f39612276b76363d6 SHA1 39d27e6c8784a28d4af3f08e14d7ae14c8b44449 SHA256 8cf49205fe501c03adbb0e2e3be4cb97ae1889c6e787028aac7453b9cbe7fa50
-MISC ChangeLog 69768 RMD160 c7f679bf9dafb52be08f5681b801db70f65ae873 SHA1 7f578a39afed6dd59108a379518b16e46e3e117e SHA256 8ab8f93560713ba24a51ed464ec17b06ab63c4e8f9aabe95898e17aa30a39c06
+MISC ChangeLog 70032 RMD160 239b6372013e426ae6c98a10132456b58abd085e SHA1 1315a4749edc714f92b3b6cdc31400b55667e0d1 SHA256 9d7b54a5da19384b52d2a3391c20ec86067c0c675ebe61341311ba77c642aed5
 MISC metadata.xml 2251 RMD160 4167b367fe5472e090fec27c09a465e558b8caf9 SHA1 059e3863cc1e500cf438f12ca98fe7f4ebd24722 SHA256 f402e3753e18c32922a694ab1bbde615754f26bbebc401b90b18f57bf5e49342
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"