Revision bump with fix for gdMaxColors (security bug #292132)

Package-Manager: portage-2.2_rc49/cvs/Linux x86_64

3 files changed, 560 insertions, 2 deletions

diff --git a/dev-lang/php/ChangeLog b/dev-lang/php/ChangeLog
index 3a8a11a8e32e..0c50ead14a1b 100644
--- a/dev-lang/php/ChangeLog
+++ b/dev-lang/php/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-lang/php
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/php/ChangeLog,v 1.351 2009/10/19 09:12:38 volkmar Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/php/ChangeLog,v 1.352 2009/11/13 16:11:51 cla Exp $
+
+*php-5.2.11-r1 (13 Nov 2009)
+
+  13 Nov 2009; Dawid Węgliński <cla@gentoo.org> +php-5.2.11-r1.ebuild:
+  Revision bump with fix for gdMaxColors (security bug #292132)
 
   19 Oct 2009; Mounir Lamouri <volkmar@gentoo.org> php-5.2.11.ebuild:
   Stabilizing for ppc, bug 285434 (also fixing bug 278064)
diff --git a/dev-lang/php/Manifest b/dev-lang/php/Manifest
index 94f377540fb3..1e8940b99eb6 100644
--- a/dev-lang/php/Manifest
+++ b/dev-lang/php/Manifest
@@ -13,6 +13,7 @@ DIST php-5.2.9.tar.bz2 10203122 RMD160 fc2b316ff05462667704027cf2a1a4ac0a238422
 DIST php-patchset-5.2.10-r0.tar.bz2 11015 RMD160 703a9f3dce390c9572c88099035a09d343e98452 SHA1 62071c0f6edb892b43ba5150a04c28deab59ef4d SHA256 f949b2ea3dc7eb1456e473b9597288def2d86e58cfe9dd4ce5a8cf25cdcd6d0c
 DIST php-patchset-5.2.10-r1.tar.bz2 11294 RMD160 1f23bbb661f40ac44ed4e39e51abc0a8d5d2b9a0 SHA1 66841d8f64058e6fdd74fb82dc686e75f5f36f6d SHA256 e32a9f08307707476dec5ad44a6923c7827d7635c2b723d3e70cc82eee1da1e3
 DIST php-patchset-5.2.11-r0.tar.bz2 10171 RMD160 f02780907f8d2fa44aba1974de4376b5e14497c0 SHA1 47586ffae72ff3966afa4cf20ae355190dbac29c SHA256 441bc612aa7e19e2a4c2fd37181fb652e84cdf002d1841ebcf2e631d0bd4cd99
+DIST php-patchset-5.2.11-r1.tar.bz2 10403 RMD160 53ce1a43697db2cf79eba89a548f52efa64c0d20 SHA1 905e1fc34be10b5ed0abe816cbce2524933559f4 SHA256 fd4f95de091cbe7d52ee3008b45a189f2158bbf861e2017b92a8a3b7a8abb32c
 DIST php-patchset-5.2.9-r2.tar.bz2 17294 RMD160 1367ccf198686df2ff81408b1d6fb7096fa6790b SHA1 d5d1528aa775ff4af9251a6843a5f18bffcb4795 SHA256 ba77dab6cf96f874070afee76d1ad7b48a55a8738bc0e0bc6c54f011b9070dc1
 DIST suhosin-patch-5.2.10-0.9.7.patch.gz 23072 RMD160 18df1686a48d652f581591115b51461e9dacf5a4 SHA1 3768bbded0bb2376414322b26308342452cb927a SHA256 51d8496172b838c4bbb40f783b535162169b5e218cd6093ecc25cfcfa0c469f8
 DIST suhosin-patch-5.2.11-0.9.7.patch.gz 23050 RMD160 0f6d442aace34c221f9fbff42a63e7f3b4489f15 SHA1 248419332131efc53f3306c2a57a4b1a9dc92cc1 SHA256 392f10c9b7d9c47f30e989fb7775cc46d36153b933bf7ac9ccd8826b2954584b
@@ -20,7 +21,8 @@ DIST suhosin-patch-5.2.9-0.9.7.patch.gz 23026 RMD160 1d2e01a935c4bbc9e858796f8f6
 EBUILD php-5.2.10-r1.ebuild 16748 RMD160 e0b0798218cf89540133a51ad69a8f90a7fcd875 SHA1 29346dca57478197bdd5241c97ffc672a837da9d SHA256 b5e86d4d7b967649b0f59dad6c1b2bb41184d70a01539f7dab2384ed6f0603c4
 EBUILD php-5.2.10-r2.ebuild 16837 RMD160 870d5cd011ae9ff2a3e9482b0c70995fb9ab6026 SHA1 5a568341061cdef5a9666c1dc12bcaf3b07c019e SHA256 db7c3e4a0d0c4ffafbb4c912ef001e386d6edc016b5a7b160a01ada4ff4a2569
 EBUILD php-5.2.10.ebuild 16728 RMD160 521189c16994cbacfe19b0ace61b575febe44127 SHA1 68ec6a195e90567a16e8907f0b7ffc1b600ec786 SHA256 de179a373f19a95d698b32cadaa844a911182ffdcc82d6fc5eb549f196fef55f
+EBUILD php-5.2.11-r1.ebuild 16960 RMD160 177e15b0678dc2bbcc07149b717d5b702b095c4b SHA1 80df8472bbf21dad7558802edc3c40dd68950863 SHA256 8c3bfe7bcba919b743dc810967eff639087d05516b2aeb701e6f91e43d4f1fd8
 EBUILD php-5.2.11.ebuild 16789 RMD160 5574011183da002d3286596defacfab4afdd5f0c SHA1 88349a763ad89a9af6bec83725c8905dcfa65769 SHA256 2d790dcb8181e1b300266d5b36df2e0ddf7f785872886ca93a33bae3792f5302
 EBUILD php-5.2.9-r2.ebuild 16731 RMD160 faf16639679e3391fdce77f60d95a26f6f960899 SHA1 725b035a6b399e62b7011522eebea9404957d220 SHA256 604d9d60c171ef9518b6f2136db42848220c12e0eef88f2745671ce4843d9148
-MISC ChangeLog 61358 RMD160 26c56b054e8c72782c4e16533351fa527ba1f845 SHA1 6cf3021426300d9a29579b3a2b54a153de280e64 SHA256 46a4eab69a22cdcd0f17cccbb79aafeb4ac14e35fc7b8afca822b9d9f4dd6c67
+MISC ChangeLog 61522 RMD160 031fa1f1cdd7be75f0b4e82e32643d28b2ede137 SHA1 06770904aa9de98d4d3d43b3accbe0ec2d76031f SHA256 7eef57771e63fadbf4350ad3770e692523a56d379dd1ca7829cd2cc3f261a681
 MISC metadata.xml 1494 RMD160 c8579965284d7e60e3bf12600eea425175e6c480 SHA1 24c24ff7bb2efb47c02f604f0896c99da87ffe67 SHA256 6a5df2911eff7c828d9da402914c08554b8c8752b0545a74af9ba6f8fa8f59a9
diff --git a/dev-lang/php/php-5.2.11-r1.ebuild b/dev-lang/php/php-5.2.11-r1.ebuild
new file mode 100644
index 000000000000..d794ae83354b
--- /dev/null
+++ b/dev-lang/php/php-5.2.11-r1.ebuild
@@ -0,0 +1,551 @@
+# Copyright 1999-2009 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/php/php-5.2.11-r1.ebuild,v 1.1 2009/11/13 16:11:51 cla Exp $
+
+CGI_SAPI_USE="discard-path force-cgi-redirect"
+APACHE2_SAPI_USE="concurrentmodphp threads"
+IUSE="cli cgi ${CGI_SAPI_USE} ${APACHE2_SAPI_USE} fastbuild"
+
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd"
+
+# NOTE: Portage doesn't support setting PROVIDE based on the USE flags
+#		that have been enabled, so we have to PROVIDE everything for now
+#		and hope for the best
+PROVIDE="virtual/php virtual/httpd-php"
+
+# php package settings
+SLOT="5"
+MY_PHP_PV="${PV}"
+MY_PHP_P="php-${MY_PHP_PV}"
+PHP_PACKAGE="1"
+# php patch settings, general
+PHP_PATCHSET_URI="http://dev.gentoo.org/~cla/distfiles/php-patchset-${PVR}.tar.bz2"
+PHP_PATCHSET_REV="${PR/r/}"
+PHP_PATCHSET_REV="${PHP_PATCHSET_REV/2/1}"
+SUHOSIN_PATCH="suhosin-patch-${MY_PHP_PV}-0.9.7.patch.gz"
+MULTILIB_PATCH="${MY_PHP_PV}/opt/multilib-search-path.patch"
+# php patch settings, ebuild specific
+FASTBUILD_PATCH="${MY_PHP_PV}/opt/fastbuild.patch"
+CONCURRENTMODPHP_PATCH="${MY_PHP_PV}/opt/concurrent_apache_modules.patch"
+# kolab patch - http://kolab.org/cgi-bin/viewcvs-kolab.cgi/server/patches/php/
+# bugs about this go to wrobel@gentoo.org
+KOLAB_PATCH="${MY_PHP_PV}/opt/kolab-imap-annotations.patch"
+
+inherit versionator php5_2-sapi apache-module
+
+# Suhosin patch support
+[[ -n "${SUHOSIN_PATCH}" ]] && SRC_URI="${SRC_URI} suhosin? ( http://gentoo.longitekk.com/${SUHOSIN_PATCH} )"
+
+DESCRIPTION="The PHP language runtime engine: CLI, CGI and Apache2 SAPIs."
+
+DEPEND="app-admin/php-toolkit
+	imap? ( >=virtual/imap-c-client-2006k )
+	pcre? ( >=dev-libs/libpcre-7.8 )
+	xml? ( >=dev-libs/libxml2-2.7.2-r2 )
+	xmlrpc? ( >=dev-libs/libxml2-2.7.2-r2 virtual/libiconv )
+	suhosin? ( >=dev-php5/suhosin-0.9.29 )"
+
+RDEPEND="${DEPEND}"
+if [[ -n "${KOLAB_PATCH}" ]] ; then
+	IUSE="${IUSE} kolab"
+	DEPEND="${DEPEND}
+		kolab? ( >=net-libs/c-client-2004g-r1 )"
+fi
+
+want_apache
+
+pkg_setup() {
+	PHPCONFUTILS_AUTO_USE=""
+
+	# Make sure the user has specified at least one SAPI
+	einfo "Determining SAPI(s) to build"
+	phpconfutils_require_any "  Enabled  SAPI:" "  Disabled SAPI:" cli cgi apache2
+
+	# Threaded Apache2 support
+	if use apache2 ; then
+		has_apache_threads
+	fi
+
+	# Concurrent PHP Apache2 modules support
+	if use apache2 ; then
+		if use concurrentmodphp ; then
+			ewarn
+			ewarn "'concurrentmodphp' makes it possible to load multiple, differently"
+			ewarn "versioned mod_php's into the same Apache instance. This is done with"
+			ewarn "a few linker tricks and workarounds, and is not guaranteed to always"
+			ewarn "work correctly, so use it at your own risk. Especially, do not use"
+			ewarn "this in conjunction with PHP modules (PECL, ...) other than the ones"
+			ewarn "you may find in the Portage tree or the PHP Overlay!"
+			ewarn "This is an experimental feature, so please rebuild PHP"
+			ewarn "without the 'concurrentmodphp' USE flag if you experience"
+			ewarn "any problems, and then reproduce any bugs before filing"
+			ewarn "them in Gentoo's Bugzilla or bugs.php.net."
+			ewarn "If you have conclusive evidence that a bug directly"
+			ewarn "derives from 'concurrentmodphp', please file a bug in"
+			ewarn "Gentoo's Bugzilla only."
+			ewarn
+			ebeep 5
+		fi
+	fi
+
+	# fastbuild support
+	if use fastbuild ; then
+		ewarn
+		ewarn "'fastbuild' attempts to build all SAPIs in a single pass."
+		ewarn "This is an experimental feature, so please rebuild PHP"
+		ewarn "without the 'fastbuild' USE flag if you experience"
+		ewarn "any problems, and then reproduce any bugs before filing"
+		ewarn "them in Gentoo's Bugzilla or bugs.php.net."
+		ewarn "If you have conclusive evidence that a bug directly"
+		ewarn "derives from 'fastbuild', please file a bug in"
+		ewarn "Gentoo's Bugzilla only."
+		ewarn
+	fi
+
+	if use pcre ; then
+		built_with_use dev-libs/libpcre unicode || \
+			die "Please rebuild dev-libs/libpcre with USE=unicode"
+	fi
+
+	depend.apache_pkg_setup
+	php5_2-sapi_pkg_setup
+}
+
+php_determine_sapis() {
+	# holds the list of sapis that we want to build
+	PHPSAPIS=
+
+	if use cli || phpconfutils_usecheck cli ; then
+		PHPSAPIS="${PHPSAPIS} cli"
+	fi
+
+	if use cgi ; then
+		PHPSAPIS="${PHPSAPIS} cgi"
+	fi
+
+	# note - apache SAPI comes after the simpler cli/cgi sapis
+	if use apache2 ; then
+		PHPSAPIS="${PHPSAPIS} apache${APACHE_VERSION}"
+	fi
+}
+
+src_unpack() {
+	if [[ "${PHP_PACKAGE}" == 1 ]] ; then
+		unpack ${A}
+	fi
+
+	cd "${S}"
+
+	# Concurrent PHP Apache2 modules support
+	if use apache2 ; then
+		if use concurrentmodphp ; then
+			if [[ -n "${CONCURRENTMODPHP_PATCH}" ]] && [[ -f "${WORKDIR}/${CONCURRENTMODPHP_PATCH}" ]] ; then
+				epatch "${WORKDIR}/${CONCURRENTMODPHP_PATCH}"
+			else
+				ewarn "There is no concurrent mod_php patch available for this PHP release yet!"
+			fi
+		fi
+	fi
+
+	# fastbuild support
+	if use fastbuild ; then
+		if [[ -n "${FASTBUILD_PATCH}" ]] && [[ -f "${WORKDIR}/${FASTBUILD_PATCH}" ]] ; then
+			epatch "${WORKDIR}/${FASTBUILD_PATCH}"
+		else
+			ewarn "There is no fastbuild patch available for this PHP release yet!"
+		fi
+	fi
+
+	# kolab support
+	if [[ -n "${KOLAB_PATCH}" ]] ; then
+		use kolab && epatch "${WORKDIR}/${KOLAB_PATCH}"
+	fi
+
+	# Security bug #292132
+	epatch "${WORKDIR}"/${MY_PHP_PV}/gd-maxcolors.patch
+
+	# pretend to not have flex, bug 221357
+	sed -re 's:( +)PHP_SUBST\(LEX\):\1LEX="exit 0;"\n\0:' -i acinclude.m4
+
+	# Now let the eclass do the rest and regenerate the configure
+	php5_2-sapi_src_unpack
+
+	# Fix Makefile.global:test to consider the CGI SAPI if present
+	if use cgi ; then
+		sed -e "s|test \! -z \"\$(top_builddir)/php-cli\" \&\& test -x \"\$(top_builddir)/php-cli\"|test \! -z \"\$(top_builddir)/php-cli\" \&\& test -x \"\$(top_builddir)/php-cli\" \&\& test \! -z \"\$(top_builddir)/php-cgi\" \&\& test -x \"\$(top_builddir)/php-cgi\"|g" -i Makefile.global
+		sed -e "s|TEST_PHP_EXECUTABLE=\"\$(top_builddir)/php-cli\"|TEST_PHP_EXECUTABLE=\"\$(top_builddir)/php-cli\" TEST_PHP_CGI_EXECUTABLE=\"\$(top_builddir)/php-cgi\"|g" -i Makefile.global
+	fi
+
+	# try to fix some test cases which fail because of sandbox otherwise
+	sed -e 's:/no/such/:.\0:' -i ext/standard/tests/file/005_error.phpt \
+		ext/standard/tests/file/006_error.phpt \
+		ext/standard/tests/file/touch.phpt
+
+	# REMOVING BROKEN TESTS:
+	# removing this test as it has been broken for ages and is not easily
+	# fixable (depends on a lot of factors)
+	rm ext/standard/tests/general_functions/phpinfo.phpt
+
+	# never worked properly, no easy fix
+	rm ext/iconv/tests/bug16069.phpt ext/iconv/tests/iconv_stream_filter.phpt
+
+	# needs write access to /tmp and others
+	rm ext/session/tests/session_save_path_variation5.phpt
+
+	# new tests since 5.2.7 which have never been working for me
+	rm ext/spl/tests/arrayObject___construct_basic4.phpt \
+		ext/spl/tests/arrayObject___construct_basic5.phpt \
+		ext/spl/tests/arrayObject_exchangeArray_basic3.phpt \
+		ext/spl/tests/arrayObject_setFlags_basic1.phpt
+
+	# those might as well be related to suhosin
+	rm ext/session/tests/session_decode_variation3.phpt \
+		ext/session/tests/session_encode_variation8.phpt
+
+	# missing skipif
+	use reflection || \
+		rm ext/standard/tests/directory/DirectoryClass_basic_001.phpt
+
+	# sandbox-related (sandbox checks for permissions before even looking
+	# at the fs, but the tests expect "No such file or directory"
+	sed -e 's:/blah:./bla:' -i \
+		ext/session/tests/session_save_path_variation{2,3}.phpt
+	rm ext/standard/tests/file/rename_variation13.phpt
+
+	# test passes, but run-tests.php claims failure
+	rm ext/standard/tests/file/tempnam_variation4.phpt
+
+	# these tests behave differently with suhosin enabled, adapting them...
+	use suhosin && sed -e 's:File(\.\./):File(..):g' -i \
+		tests/security/open_basedir*{.inc,.phpt}
+}
+
+src_compile() {
+	# bug 217392 (autconf-2.62 behavior changes)
+	export CFLAGS="${CFLAGS} -D_GNU_SOURCE"
+	export CXXFLAGS="${CXXFLAGS} -D_GNU_SOURCE"
+	if use fastbuild && [[ -n "${FASTBUILD_PATCH}" ]] ; then
+		src_compile_fastbuild
+	else
+		src_compile_normal
+	fi
+}
+
+src_compile_fastbuild() {
+	php_determine_sapis
+
+	build_cli=0
+	build_cgi=0
+	build_apache2=0
+	my_conf=""
+
+	for x in ${PHPSAPIS} ; do
+		case ${x} in
+			cli)
+				build_cli=1
+				;;
+			cgi)
+				build_cgi=1
+				;;
+			apache2)
+				build_apache2=1
+				;;
+		esac
+	done
+
+	if [[ ${build_cli} = 1 ]] ; then
+		my_conf="${my_conf} --enable-cli"
+	else
+		my_conf="${my_conf} --disable-cli"
+	fi
+
+	if [[ ${build_cgi} = 1 ]] ; then
+		my_conf="${my_conf} --enable-cgi --enable-fastcgi"
+		phpconfutils_extension_enable "discard-path" "discard-path" 0
+		phpconfutils_extension_enable "force-cgi-redirect" "force-cgi-redirect" 0
+	else
+		my_conf="${my_conf} --disable-cgi"
+	fi
+
+	if [[ ${build_apache2} = 1 ]] ; then
+		my_conf="${my_conf} --with-apxs2=/usr/sbin/apxs2"
+
+		# Threaded Apache2 support
+		if use threads ; then
+			my_conf="${my_conf} --enable-maintainer-zts"
+			ewarn "Enabling ZTS for Apache2 MPM"
+		fi
+
+		# Concurrent PHP Apache2 modules support
+		if use concurrentmodphp ; then
+			append-ldflags "-Wl,--version-script=${FILESDIR}/php5-ldvs"
+		fi
+	fi
+
+	if use pcre || phpconfutils_usecheck pcre ; then
+		myconf="${my_conf} --with-pcre-dir=/usr"
+		phpconfutils_extension_with "pcre-regex" "pcre" 0 "/usr"
+	fi
+
+	# Now we know what we are building, build it
+	php5_2-sapi_src_compile
+
+	# To keep the separate php.ini files for each SAPI, we change the
+	# build-defs.h and recompile
+
+	if [[ ${build_cli} = 1 ]] ; then
+		einfo
+		einfo "Building CLI SAPI"
+		einfo
+
+		sed -e 's|^#define PHP_CONFIG_FILE_PATH.*|#define PHP_CONFIG_FILE_PATH "/etc/php/cli-php5"|g;' -i main/build-defs.h
+		sed -e 's|^#define PHP_CONFIG_FILE_SCAN_DIR.*|#define PHP_CONFIG_FILE_SCAN_DIR "/etc/php/cli-php5/ext-active"|g;' -i main/build-defs.h
+		for x in main/main.o main/main.lo main/php_ini.o main/php_ini.lo ; do
+			[[ -f ${x} ]] && rm -f ${x}
+		done
+		make sapi/cli/php || die "Unable to make CLI SAPI"
+		cp sapi/cli/php php-cli || die "Unable to copy CLI SAPI"
+	fi
+
+	if [[ ${build_cgi} = 1 ]] ; then
+		einfo
+		einfo "Building CGI SAPI"
+		einfo
+
+		sed -e 's|^#define PHP_CONFIG_FILE_PATH.*|#define PHP_CONFIG_FILE_PATH "/etc/php/cgi-php5"|g;' -i main/build-defs.h
+		sed -e 's|^#define PHP_CONFIG_FILE_SCAN_DIR.*|#define PHP_CONFIG_FILE_SCAN_DIR "/etc/php/cgi-php5/ext-active"|g;' -i main/build-defs.h
+		for x in main/main.o main/main.lo main/php_ini.o main/php_ini.lo ; do
+			[[ -f ${x} ]] && rm -f ${x}
+		done
+		make sapi/cgi/php-cgi || die "Unable to make CGI SAPI"
+		cp sapi/cgi/php-cgi php-cgi || die "Unable to copy CGI SAPI"
+	fi
+
+	if [[ ${build_apache2} = 1 ]] ; then
+		einfo
+		einfo "Building apache${APACHE_VERSION} SAPI"
+		einfo
+
+		sed -e "s|^#define PHP_CONFIG_FILE_PATH.*|#define PHP_CONFIG_FILE_PATH \"/etc/php/apache${APACHE_VERSION}-php5\"|g;" -i main/build-defs.h
+		sed -e "s|^#define PHP_CONFIG_FILE_SCAN_DIR.*|#define PHP_CONFIG_FILE_SCAN_DIR \"/etc/php/apache${APACHE_VERSION}-php5/ext-active\"|g;" -i main/build-defs.h
+		for x in main/main.o main/main.lo main/php_ini.o main/php_ini.lo ; do
+			[[ -f ${x} ]] && rm -f ${x}
+		done
+		make || die "Unable to make apache${APACHE_VERSION} SAPI"
+	fi
+}
+
+src_compile_normal() {
+	php_determine_sapis
+
+	CLEAN_REQUIRED=0
+	my_conf=""
+
+	# Support the Apache2 extras, they must be set globally for all
+	# SAPIs to work correctly, especially for external PHP extensions
+	if use apache2 ; then
+		# Concurrent PHP Apache2 modules support
+		if use concurrentmodphp ; then
+			append-ldflags "-Wl,--version-script=${FILESDIR}/php5-ldvs"
+		fi
+	fi
+
+	for x in ${PHPSAPIS} ; do
+		if use pcre || phpconfutils_usecheck pcre ; then
+			myconf="${my_conf} --with-pcre-dir=/usr"
+			phpconfutils_extension_with "pcre-regex" "pcre" 0 "/usr"
+		fi
+
+		# Support the Apache2 extras, they must be set globally for all
+		# SAPIs to work correctly, especially for external PHP extensions
+		if use apache2 ; then
+			# Threaded Apache2 support
+			if use threads ; then
+				my_conf="${my_conf} --enable-maintainer-zts"
+				ewarn "Enabling ZTS for Apache2 MPM"
+			fi
+		fi
+
+		if [[ "${CLEAN_REQUIRED}" = 1 ]] ; then
+			make clean
+		fi
+
+		PHPSAPI="${x}"
+
+		case ${x} in
+			cli)
+				my_conf="${my_conf} --enable-cli --disable-cgi"
+				php5_2-sapi_src_compile
+				cp sapi/cli/php php-cli || die "Unable to copy CLI SAPI"
+				;;
+			cgi)
+				my_conf="${my_conf} --disable-cli --enable-cgi --enable-fastcgi"
+				phpconfutils_extension_enable "discard-path" "discard-path" 0
+				phpconfutils_extension_enable "force-cgi-redirect" "force-cgi-redirect" 0
+				php5_2-sapi_src_compile
+				cp sapi/cgi/php-cgi php-cgi || die "Unable to copy CGI SAPI"
+				;;
+			apache2)
+				my_conf="${my_conf} --disable-cli --with-apxs2=/usr/sbin/apxs2"
+				php5_2-sapi_src_compile
+				;;
+		esac
+
+		CLEAN_REQUIRED=1
+		my_conf=""
+	done
+}
+
+src_install() {
+	php_determine_sapis
+
+	destdir=/usr/$(get_libdir)/php5
+
+	# Let the eclass do the common work
+	php5_2-sapi_src_install
+
+	einfo
+	einfo "Installing SAPI(s) ${PHPSAPIS}"
+	einfo
+
+	for x in ${PHPSAPIS} ; do
+
+		PHPSAPI="${x}"
+
+		case ${x} in
+			cli)
+				einfo "Installing CLI SAPI"
+				into ${destdir}
+				newbin php-cli php || die "Unable to install ${x} sapi"
+				php5_2-sapi_install_ini
+				;;
+			cgi)
+				einfo "Installing CGI SAPI"
+				into ${destdir}
+				dobin php-cgi || die "Unable to install ${x} sapi"
+				php5_2-sapi_install_ini
+				;;
+			apache2)
+				einfo "Installing Apache${APACHE_VERSION} SAPI"
+				make INSTALL_ROOT="${D}" install-sapi || die "Unable to install ${x} SAPI"
+				if use concurrentmodphp ; then
+					einfo "Installing Apache${APACHE_VERSION} config file for PHP5-concurrent (70_mod_php5_concurr.conf)"
+					insinto ${APACHE_MODULES_CONFDIR}
+					newins "${FILESDIR}/70_mod_php5_concurr.conf-apache2-r1" "70_mod_php5_concurr.conf"
+
+					# Put the ld version script in the right place so it's always accessible
+					insinto "/var/lib/php-pkg/${CATEGORY}/${PN}-${PVR}/"
+					doins "${FILESDIR}/php5-ldvs"
+
+					# Redefine the extension dir to have the modphp suffix
+					PHPEXTDIR="`"${D}/${destdir}/bin/php-config" --extension-dir`-versioned"
+				else
+					einfo "Installing Apache${APACHE_VERSION} config file for PHP5 (70_mod_php5.conf)"
+					insinto ${APACHE_MODULES_CONFDIR}
+					newins "${FILESDIR}/70_mod_php5.conf-apache2-r1" "70_mod_php5.conf"
+				fi
+				php5_2-sapi_install_ini
+				;;
+		esac
+	done
+
+	# Install env.d files
+	newenvd "${FILESDIR}/20php5-envd" "20php5"
+	sed -e "s|/lib/|/$(get_libdir)/|g" -i "${D}/etc/env.d/20php5"
+}
+
+pkg_postinst() {
+	# Output some general info to the user
+	if use apache2 ; then
+		APACHE2_MOD_DEFINE="PHP5"
+		if use concurrentmodphp ; then
+			APACHE2_MOD_CONF="70_mod_php5_concurr"
+		else
+			APACHE2_MOD_CONF="70_mod_php5"
+		fi
+		apache-module_pkg_postinst
+	fi
+
+	# Update Apache2 to use mod_php
+	if use apache2 ; then
+		"${ROOT}/usr/sbin/php-select" -t apache2 php5 > /dev/null 2>&1
+		exitStatus=$?
+		if [[ ${exitStatus} == 2 ]] ; then
+			php-select apache2 php5
+		elif [[ ${exitStatus} == 4 ]] ; then
+			ewarn
+			ewarn "Apache2 is configured to load a different version of PHP."
+			ewarn "To make Apache2 use PHP v5, use php-select:"
+			ewarn
+			ewarn "    php-select apache2 php5"
+			ewarn
+		fi
+	fi
+
+	# Create the symlinks for php-cli
+	if use cli || phpconfutils_usecheck cli ; then
+		"${ROOT}/usr/sbin/php-select" -t php php5 > /dev/null 2>&1
+		exitStatus=$?
+		if [[ ${exitStatus} == 5 ]] ; then
+			php-select php php5
+		elif [[ ${exitStatus} == 4 ]] ; then
+			ewarn
+			ewarn "/usr/bin/php links to a different version of PHP."
+			ewarn "To make /usr/bin/php point to PHP v5, use php-select:"
+			ewarn
+			ewarn "    php-select php php5"
+			ewarn
+		fi
+	fi
+
+	# Create the symlinks for php-cgi
+	if use cgi ; then
+		"${ROOT}/usr/sbin/php-select" -t php-cgi php5 > /dev/null 2>&1
+		exitStatus=$?
+		if [[ ${exitStatus} == 5 ]] ; then
+			php-select php-cgi php5
+		elif [[ ${exitStatus} == 4 ]] ; then
+			ewarn
+			ewarn "/usr/bin/php-cgi links to a different version of PHP."
+			ewarn "To make /usr/bin/php-cgi point to PHP v5, use php-select:"
+			ewarn
+			ewarn "    php-select php-cgi php5"
+			ewarn
+		fi
+	fi
+
+	# Create the symlinks for php-devel
+	"${ROOT}/usr/sbin/php-select" -t php-devel php5 > /dev/null 2>&1
+	exitStatus=$?
+	if [[ $exitStatus == 5 ]] ; then
+		php-select php-devel php5
+	elif [[ $exitStatus == 4 ]] ; then
+		ewarn
+		ewarn "/usr/bin/php-config and/or /usr/bin/phpize are linked to a"
+		ewarn "different version of PHP. To make them point to PHP v5, use"
+		ewarn "php-select:"
+		ewarn
+		ewarn "    php-select php-devel php5"
+		ewarn
+	fi
+
+	php5_2-sapi_pkg_postinst
+}
+
+src_test() {
+	vecho ">>> Test phase [test]: ${CATEGORY}/${PF}"
+	if [[ ! -x "${S}"/php-cli ]]; then
+		ewarn "Running the php test suite requires USE=cli"
+		return
+	fi
+
+	export TEST_PHP_EXECUTABLE="${S}"/php-cli
+	if [[ -x "${S}"/php-cgi ]]; then
+		export TEST_PHP_CGI_EXECUTABLE="${S}"/php-cgi
+	fi
+	REPORT_EXIT_STATUS=1 "${S}"/php-cli -n "${S}"/run-tests.php -n
+
+	if [[ $? != 0 ]] ; then
+		eerror "Not all tests were successful!"
+	fi
+}