sync with php-overlay

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

4 files changed, 26 insertions, 8 deletions

diff --git a/dev-lang/php/ChangeLog b/dev-lang/php/ChangeLog
index e8e76d060931..ddc9191c4501 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.384 2010/06/12 22:05:54 mabi Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/php/ChangeLog,v 1.385 2010/06/14 17:03:23 mabi Exp $
+
+  14 Jun 2010; <mabi@gentoo.org> files/eblits/src_install-v1.eblit,
+  php-5.3.2.ebuild:
+  sync with overlay: repair apache2 USE dep, cli SAPI on by default (bug
+  #310383), show all SAPIs in php-config (bug #278439)
 
   12 Jun 2010; <mabi@gentoo.org> php-5.3.2.ebuild, metadata.xml:
   USE="mbstring" already covered by USE="unicode"; set USE-defaults to match
diff --git a/dev-lang/php/Manifest b/dev-lang/php/Manifest
index fa9184e4f7f6..e4468f61722c 100644
--- a/dev-lang/php/Manifest
+++ b/dev-lang/php/Manifest
@@ -8,7 +8,7 @@ AUX eblits/pkg_postinst-v1.eblit 2184 RMD160 ce65ba811eab10862d067c7e2b4bdc8d2b0
 AUX eblits/pkg_setup-v1.eblit 643 RMD160 b0ac84af7c2cddaca058ca0562306cdc8ddff108 SHA1 88572e5da2d10b2bcbfa3f35a2d39366cbabb364 SHA256 6b7181294ce309d5cdee68e1f7e7c9365910c940db4391ae1ca62e0d6eb9b27e
 AUX eblits/src_compile-v1.eblit 1851 RMD160 64e65a7647907da821a277da9a4df970ae3bda0b SHA1 c22b8c4526ce081fb7de8234d93cc8cfa2616414 SHA256 da47bc9f75ba4de64c1848b07ea1324b707301421431f469296f32a8f2369648
 AUX eblits/src_configure-v1.eblit 9853 RMD160 f254f602a885bea556768250445d70156ae34a8d SHA1 8895766562f0045f057a95d918308232005dfd61 SHA256 b954cb2bfaa4fc6fe55e3752f5491282db0a5d48966e1a3cd6f55fed1eb63bcc
-AUX eblits/src_install-v1.eblit 3584 RMD160 26ff6c2ce3c586a23f1ca7997aa94e0d6efc7083 SHA1 e6b98320877d8fbe5d7359190d774c16cd782c81 SHA256 86a8e9028eef946e770e26ec74b0a13edbe7934fa34365c1f6532061221faff0
+AUX eblits/src_install-v1.eblit 4025 RMD160 150514ec274f0892ee271466015116493eb4a74e SHA1 91b7bffec8fccf4b3230e2072e0ccf555b4c671e SHA256 2b1da468a1ecfa1507b9ab51e626203d421e5c4a3b694d77b01c065e3ae4fcff
 AUX eblits/src_prepare-v1.eblit 2616 RMD160 ccff64d09cc90ada1ea5d1311457cf9a05f12f8e SHA1 7db40d0ca7ef01e5b61962f261511803f768f1bc SHA256 915b9755a37f7670f6e436fe5072dae8f5e6b437ccdfbff835e26bb2f9d22b1e
 AUX eblits/src_test-v1.eblit 1480 RMD160 68ef731042ef236efee923649b318239c0219d52 SHA1 81c047f180e43eb1e6b0309ee8d6751950ce1b97 SHA256 ddc836ca2e7b2abac20450fc6eb8c7d30277c567d23051016b903ece1d07a6b2
 AUX php-5.2.10-pdo_dblib.patch 559 RMD160 062604e291113b2bb86044b5eeffb72fad210fbc SHA1 d59d26e6557dac86e582e1a6ed7bb4795cf150c6 SHA256 0548d63d7379cd19f7ade6ca1222b1b577f684b142ff6b0e8e23742b1f7f9794
@@ -41,6 +41,6 @@ EBUILD php-5.2.11.ebuild 16796 RMD160 4d55fe8a9787c726a23a426e891ceffbb44faef6 S
 EBUILD php-5.2.12.ebuild 16901 RMD160 42ad4d01a89392445e491f1d784a7f23028fb0dc SHA1 17f6e1da1793a06c10636e332440c37535262a7d SHA256 cbab429ae3fe5bc0fe4cb961dbb1df91be35c04f7c8340cfee39117afcfeddcc
 EBUILD php-5.2.13.ebuild 16879 RMD160 c580f3e8de5be0a3338ae3f816153c1d42b4337f SHA1 4bc3f1792d3f85a96ecbf538f97c76d1de8dda4a SHA256 811314bfdf521766794650581c963b31d81c10071311e20121e4a1ca5458a51f
 EBUILD php-5.2.9-r2.ebuild 16727 RMD160 aa0e1af3e50b550111c3d1490adc9e8ed2432b34 SHA1 1e4b46b562d74e758db1ec52751419cd02333878 SHA256 7187f6feedc92c355543713cb07218a48f1cd45e9394fa6d4a00bbe7e5b3010b
-EBUILD php-5.3.2.ebuild 9315 RMD160 855ad7ca6703c36525a16e1d5ba6c659b4881eae SHA1 1da6a6e82fe7f228c94b45e81a89041a00657006 SHA256 89a53d10f5adbd84b3d558822dfb03b0093bef9d16f37a5ca076e1b8b393ade6
-MISC ChangeLog 66627 RMD160 5c604e4d40b32e71a3df38c481f8a35a7fa88785 SHA1 0bc2216ee72dfae95d3f87342122aca4f315ba11 SHA256 4d6c4ca7ccc9cebbdda161de73b1bc738f3d9b53051d58c8b4b8b9151cb97e28
+EBUILD php-5.3.2.ebuild 9302 RMD160 8ceebd031b518a6253e2d149dd45a668bfeefa0c SHA1 b6f94c95b1992f6b414a32fbb9dafa1936a9746b SHA256 3f86897f3e6d57a3764138ff23bb87a289e421d99995b9e18ad4a71673f46dc8
+MISC ChangeLog 66844 RMD160 12a3fc7193db3bdf80d67b1d85032c3e36efee14 SHA1 7068d1a553606fea6ab627574469bd4693e794ed SHA256 68db8151a13d32686014a11382311ce9173a6519782b4d398da15f9313940ae1
 MISC metadata.xml 2185 RMD160 2e1d4afa19f7370b62080f3f62bc0f8e525b82bd SHA1 2b758e52eb1e1130fffe162e6cd2122deaf18bf3 SHA256 8a8be20f80edd56dd9f16b90f4ff91fde426b05861e737750664223801e2c667
diff --git a/dev-lang/php/files/eblits/src_install-v1.eblit b/dev-lang/php/files/eblits/src_install-v1.eblit
index ce0ca97e4902..d3312579f171 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.2 2010/06/09 16:11:28 mabi Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/php/files/eblits/src_install-v1.eblit,v 1.3 2010/06/14 17:03:22 mabi Exp $
 
 eblit-php-src_install() {
 	# Makefile forgets to create this before trying to write to it...
@@ -26,6 +26,7 @@ eblit-php-src_install() {
 	keepdir /usr/share/php${PHP_MV}
 
 	local sapi="", file=""
+	local sapi_list=""
 
 	for sapi in ${SAPIS}; do
 		if use "${sapi}" ; then
@@ -46,6 +47,14 @@ eblit-php-src_install() {
 			fi
 
 			php_install_ini "${sapi}"
+
+			# construct correct SAPI string for php-config
+			# thanks to ferringb for the bash voodoo
+			if [[ "${sapi}" == "apache2" ]]; then
+			    sapi_list="${sapi_list:+${sapi_list} }apache2handler"
+			else
+				sapi_list="${sapi_list:+${sapi_list} }${sapi}"
+			fi
 		fi
 	done
 
@@ -54,6 +63,10 @@ eblit-php-src_install() {
 		"20php${PHP_MV}"
 	sed -e "s|/lib/|/$(get_libdir)/|g" -i \
 		"${D}/etc/env.d/20php${PHP_MV}"
+
+	# set php-config variable correctly (bug #278439)
+	sed -e "s:^\(php_sapis=\)\".*\"$:\1\"${sapi_list}\":" -i \
+		"${D}/usr/$(get_libdir)/php5/bin/php-config"
 }
 
 php_install_ini() {
diff --git a/dev-lang/php/php-5.3.2.ebuild b/dev-lang/php/php-5.3.2.ebuild
index 05700f7e89b1..8c9fa0122deb 100644
--- a/dev-lang/php/php-5.3.2.ebuild
+++ b/dev-lang/php/php-5.3.2.ebuild
@@ -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/php-5.3.2.ebuild,v 1.7 2010/06/12 22:05:54 mabi Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/php/php-5.3.2.ebuild,v 1.8 2010/06/14 17:03:23 mabi Exp $
 
 EAPI=2
 
@@ -76,7 +76,7 @@ IUSE="kolab"
 
 # SAPIs and SAPI-specific USE flags:
 IUSE="${IUSE}
-	${SAPIS}
+	+${SAPIS}
 	concurrentmodphp threads"
 
 IUSE="${IUSE} adabas bcmath berkdb birdstep bzip2 calendar cdb cjk
@@ -94,7 +94,7 @@ IUSE="${IUSE} adabas bcmath berkdb birdstep bzip2 calendar cdb cjk
 DEPEND="app-admin/php-toolkit
 	>=dev-libs/libpcre-7.9[unicode]
 	adabas? ( >=dev-db/unixODBC-1.8.13 )
-	apache2? ( !threads? ( www-servers/apache[-threads] ) )
+	apache2? ( www-servers/apache[threads=] )
 	berkdb? ( =sys-libs/db-4* )
 	birdstep? ( >=dev-db/unixODBC-1.8.13 )
 	bzip2? ( app-arch/bzip2 )