New PHP versions, fix lots of bugs, add Suhosin support.

(Portage version: 2.1.2.1)

15 files changed, 574 insertions, 40 deletions

diff --git a/dev-lang/php/ChangeLog b/dev-lang/php/ChangeLog
index 09c52adab8c6..b7b095862b4a 100644
--- a/dev-lang/php/ChangeLog
+++ b/dev-lang/php/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for dev-lang/php
-# Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/php/ChangeLog,v 1.148 2006/11/26 23:35:54 chtekk Exp $
+# Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/php/ChangeLog,v 1.149 2007/03/05 02:14:43 chtekk Exp $
+
+*php-5.2.1-r3 (05 Mar 2007)
+*php-5.1.6-r11 (05 Mar 2007)
+*php-4.4.6 (05 Mar 2007)
+
+  05 Mar 2007; Luca Longinotti <chtekk@gentoo.org> +files/20php4-envd,
+  +files/20php5-envd, -php-4.4.4-r8.ebuild, +php-4.4.6.ebuild,
+  -php-5.1.6-r8.ebuild, +php-5.1.6-r11.ebuild, +php-5.2.1-r3.ebuild:
+  New PHP versions, fix lots of bugs, add Suhosin support.
 
   26 Nov 2006; Luca Longinotti <chtekk@gentoo.org> -php-4.4.3-r1.ebuild,
   -php-4.4.4-r4.ebuild, -php-5.1.4-r6.ebuild, -php-5.1.6-r4.ebuild:
diff --git a/dev-lang/php/files/20php4-envd b/dev-lang/php/files/20php4-envd
new file mode 100644
index 000000000000..b4eabf7b0278
--- /dev/null
+++ b/dev-lang/php/files/20php4-envd
@@ -0,0 +1,2 @@
+MANPATH="/usr/lib/php4/man/"
+CONFIG_PROTECT_MASK="/etc/php/cli-php4/ext-active/ /etc/php/cgi-php4/ext-active/ /etc/php/apache1-php4/ext-active/ /etc/php/apache2-php4/ext-active/"
diff --git a/dev-lang/php/files/20php5-envd b/dev-lang/php/files/20php5-envd
new file mode 100644
index 000000000000..c69dfb26b09a
--- /dev/null
+++ b/dev-lang/php/files/20php5-envd
@@ -0,0 +1,2 @@
+MANPATH="/usr/lib/php5/man/"
+CONFIG_PROTECT_MASK="/etc/php/cli-php5/ext-active/ /etc/php/cgi-php5/ext-active/ /etc/php/apache1-php5/ext-active/ /etc/php/apache2-php5/ext-active/"
diff --git a/dev-lang/php/files/digest-php-4.3.11-r5 b/dev-lang/php/files/digest-php-4.3.11-r5
index 4bbbf0463d9b..cd9c2ea9c823 100644
--- a/dev-lang/php/files/digest-php-4.3.11-r5
+++ b/dev-lang/php/files/digest-php-4.3.11-r5
@@ -1,6 +1,3 @@
-MD5 9b0c4b722e6102aa95b475074caac5f7 hardening-patch-4.3.11-0.4.3-gentoo.patch.gz 85180
-RMD160 abc0ce0ee3020c9ec67ac595531c0fae13c8d351 hardening-patch-4.3.11-0.4.3-gentoo.patch.gz 85180
-SHA256 103e80cb39fc1a5b6b93e9d5faf9842ea1e1a7847cfc868369325f80421d29c7 hardening-patch-4.3.11-0.4.3-gentoo.patch.gz 85180
 MD5 fbc67d240812136a9842bc1f2a217b7a php-4.3.11.tar.bz2 4012575
 RMD160 fe44f6c2783ddd469b94744e440e836cff3329e5 php-4.3.11.tar.bz2 4012575
 SHA256 6b133db9ac17d4e1f393003683c1b4d15dff3197559c85fd8dd63ba4868a21c5 php-4.3.11.tar.bz2 4012575
diff --git a/dev-lang/php/files/digest-php-4.4.4-r6 b/dev-lang/php/files/digest-php-4.4.4-r6
index c2bc37f47baa..d63c94fc0927 100644
--- a/dev-lang/php/files/digest-php-4.4.4-r6
+++ b/dev-lang/php/files/digest-php-4.4.4-r6
@@ -1,6 +1,3 @@
-MD5 55220bd02880e8981455fe83bafa0c8d hardening-patch-4.4.4-0.4.15-gentoo.patch.gz 61351
-RMD160 4c7b02b6a86005136ed6eb751ba549fe1ea275b0 hardening-patch-4.4.4-0.4.15-gentoo.patch.gz 61351
-SHA256 3885d9dba28e8a689d26d1d1889ecd1b8c8289bb25c337d472084c809daba291 hardening-patch-4.4.4-0.4.15-gentoo.patch.gz 61351
 MD5 bc6fa8908e2ac36e93bab9f7d42cda3a php-4.4.4.tar.bz2 4478698
 RMD160 02fd7d5135a9e5ce11d905a4a474a5d42b8441f3 php-4.4.4.tar.bz2 4478698
 SHA256 9f0742fce014a255f8453c1264afee5de289a9e9dcd57c448c77b46978f6a76b php-4.4.4.tar.bz2 4478698
diff --git a/dev-lang/php/files/digest-php-4.4.4-r8 b/dev-lang/php/files/digest-php-4.4.4-r8
deleted file mode 100644
index 68f8fb3cfd83..000000000000
--- a/dev-lang/php/files/digest-php-4.4.4-r8
+++ /dev/null
@@ -1,9 +0,0 @@
-MD5 55220bd02880e8981455fe83bafa0c8d hardening-patch-4.4.4-0.4.15-gentoo.patch.gz 61351
-RMD160 4c7b02b6a86005136ed6eb751ba549fe1ea275b0 hardening-patch-4.4.4-0.4.15-gentoo.patch.gz 61351
-SHA256 3885d9dba28e8a689d26d1d1889ecd1b8c8289bb25c337d472084c809daba291 hardening-patch-4.4.4-0.4.15-gentoo.patch.gz 61351
-MD5 bc6fa8908e2ac36e93bab9f7d42cda3a php-4.4.4.tar.bz2 4478698
-RMD160 02fd7d5135a9e5ce11d905a4a474a5d42b8441f3 php-4.4.4.tar.bz2 4478698
-SHA256 9f0742fce014a255f8453c1264afee5de289a9e9dcd57c448c77b46978f6a76b php-4.4.4.tar.bz2 4478698
-MD5 81ed636101b3b3dabd513633db8654f5 php-patchset-4.4.4-r4.tar.bz2 21579
-RMD160 6a46f412185b9775dc2b1a1bb0801248b3702ea1 php-patchset-4.4.4-r4.tar.bz2 21579
-SHA256 62c63d3d04d5cfd856ee8c74e6617089235b1abe4df4baf450c5888945acfa20 php-patchset-4.4.4-r4.tar.bz2 21579
diff --git a/dev-lang/php/files/digest-php-4.4.6 b/dev-lang/php/files/digest-php-4.4.6
new file mode 100644
index 000000000000..492d2c4651fb
--- /dev/null
+++ b/dev-lang/php/files/digest-php-4.4.6
@@ -0,0 +1,9 @@
+MD5 5db283824310c87efb18c76b4735c4bd php-4.4.6.tar.bz2 4559282
+RMD160 16a81ee94d1f8f56adf3e76dde32c62597130674 php-4.4.6.tar.bz2 4559282
+SHA256 c468c70e9536b5cbaf8a2615ab9e13c065da19944314633eef675be4d4e40065 php-4.4.6.tar.bz2 4559282
+MD5 7ba532e3132773050c3be7d71e8c9379 php-patchset-4.4.6-r1.tar.bz2 19282
+RMD160 e2576d82f1ca6e1336834ed87767fac9471623c0 php-patchset-4.4.6-r1.tar.bz2 19282
+SHA256 2fb21dfe058fabc57e63e01cc9990c6d8d5d9d74ebd9cc42c13d58cc64f71016 php-patchset-4.4.6-r1.tar.bz2 19282
+MD5 4b3800d1c182f5cf48d60ccb2f7c8acd suhosin-patch-4.4.6-0.9.6-gentoo.patch.gz 21530
+RMD160 cdf02a0ed5d66203c0082063c87b66a6e4109088 suhosin-patch-4.4.6-0.9.6-gentoo.patch.gz 21530
+SHA256 8a52e6c9b1f1c980734daf2fa0d5e68364cd64b20a7c82d68c7fdd135cb788f8 suhosin-patch-4.4.6-0.9.6-gentoo.patch.gz 21530
diff --git a/dev-lang/php/files/digest-php-5.0.5-r5 b/dev-lang/php/files/digest-php-5.0.5-r5
index a61252bffa1e..3d7cc3b43678 100644
--- a/dev-lang/php/files/digest-php-5.0.5-r5
+++ b/dev-lang/php/files/digest-php-5.0.5-r5
@@ -1,6 +1,3 @@
-MD5 dd3aaa1c68bfd1626901721686474700 hardening-patch-5.0.5-0.4.8-gentoo.patch.gz 57864
-RMD160 f68e2870ef56f005ae062f53053ecffd87b2059d hardening-patch-5.0.5-0.4.8-gentoo.patch.gz 57864
-SHA256 6d8e61ff1fa10ce238600e936de1eac665c5237482ae6c3b4db05c6b7d684a7c hardening-patch-5.0.5-0.4.8-gentoo.patch.gz 57864
 MD5 b5d4ca75bbb11ee5b830fa67213d9f7f php-5.0.5.tar.bz2 4895556
 RMD160 6a9a892affba229770154407860cd1c2a098eaf9 php-5.0.5.tar.bz2 4895556
 SHA256 aa63e769059d2452b153db6d4e6b421228d0606cbe8b11ace00e4c1b5c2cdc4f php-5.0.5.tar.bz2 4895556
diff --git a/dev-lang/php/files/digest-php-5.1.6-r11 b/dev-lang/php/files/digest-php-5.1.6-r11
new file mode 100644
index 000000000000..54c00c678611
--- /dev/null
+++ b/dev-lang/php/files/digest-php-5.1.6-r11
@@ -0,0 +1,9 @@
+MD5 08e423aa314369d4392a36b3f7246afc php-5.1.6.tar.bz2 6454408
+RMD160 7ac52f4674532397c982f6ced594b70dd17522af php-5.1.6.tar.bz2 6454408
+SHA256 3e9510ce715f28b7e6b803fcdadb73b37c83792c0b5e1e9bcb066ab972649996 php-5.1.6.tar.bz2 6454408
+MD5 e2f377cf0e043348f655fd35a170138a php-patchset-5.1.6-r8.tar.bz2 30004
+RMD160 5f93cda0783ba541cdc392d8f82344d340a6cc47 php-patchset-5.1.6-r8.tar.bz2 30004
+SHA256 f9e5f9b9ccf0fd4be00822a4d75832eb09f989db7229e275b666f00e6dad93d7 php-patchset-5.1.6-r8.tar.bz2 30004
+MD5 2e36ccba7e34191685308fb78def2c60 suhosin-patch-5.1.6-0.9.6-gentoo.patch.gz 23153
+RMD160 8ae3b22638f927041f769e8052fba3841f891bbf suhosin-patch-5.1.6-0.9.6-gentoo.patch.gz 23153
+SHA256 07c89856820e2dbbefdb5141412fa1a52dd6f9f38fa987573fdccf5fa6a68361 suhosin-patch-5.1.6-0.9.6-gentoo.patch.gz 23153
diff --git a/dev-lang/php/files/digest-php-5.1.6-r6 b/dev-lang/php/files/digest-php-5.1.6-r6
index 9cf6dd48b3cf..a23b340f8d50 100644
--- a/dev-lang/php/files/digest-php-5.1.6-r6
+++ b/dev-lang/php/files/digest-php-5.1.6-r6
@@ -1,6 +1,3 @@
-MD5 ba5d540574209a683dd8cf8d564e3b61 hardening-patch-5.1.6-0.4.15-gentoo-r1.patch.gz 61476
-RMD160 5185bf7b2282b3bed2f6a06a8314cfab7b5b8cbc hardening-patch-5.1.6-0.4.15-gentoo-r1.patch.gz 61476
-SHA256 836416114d4408377d04ee5b704dde0bd74511c0f114fe02602dab12e9e4902c hardening-patch-5.1.6-0.4.15-gentoo-r1.patch.gz 61476
 MD5 08e423aa314369d4392a36b3f7246afc php-5.1.6.tar.bz2 6454408
 RMD160 7ac52f4674532397c982f6ced594b70dd17522af php-5.1.6.tar.bz2 6454408
 SHA256 3e9510ce715f28b7e6b803fcdadb73b37c83792c0b5e1e9bcb066ab972649996 php-5.1.6.tar.bz2 6454408
diff --git a/dev-lang/php/files/digest-php-5.1.6-r8 b/dev-lang/php/files/digest-php-5.1.6-r8
deleted file mode 100644
index 675b8ceaffab..000000000000
--- a/dev-lang/php/files/digest-php-5.1.6-r8
+++ /dev/null
@@ -1,9 +0,0 @@
-MD5 ba5d540574209a683dd8cf8d564e3b61 hardening-patch-5.1.6-0.4.15-gentoo-r1.patch.gz 61476
-RMD160 5185bf7b2282b3bed2f6a06a8314cfab7b5b8cbc hardening-patch-5.1.6-0.4.15-gentoo-r1.patch.gz 61476
-SHA256 836416114d4408377d04ee5b704dde0bd74511c0f114fe02602dab12e9e4902c hardening-patch-5.1.6-0.4.15-gentoo-r1.patch.gz 61476
-MD5 08e423aa314369d4392a36b3f7246afc php-5.1.6.tar.bz2 6454408
-RMD160 7ac52f4674532397c982f6ced594b70dd17522af php-5.1.6.tar.bz2 6454408
-SHA256 3e9510ce715f28b7e6b803fcdadb73b37c83792c0b5e1e9bcb066ab972649996 php-5.1.6.tar.bz2 6454408
-MD5 af5dc2be4f0d265a73e4fdc1be1b5b0f php-patchset-5.1.6-r4.tar.bz2 26474
-RMD160 fa1ac197d9f9a97e053f20b64babdfeec371dbb3 php-patchset-5.1.6-r4.tar.bz2 26474
-SHA256 c90c724072b3f826e474c646eb907202c0166df472b64538863263b7bf9c028d php-patchset-5.1.6-r4.tar.bz2 26474
diff --git a/dev-lang/php/files/digest-php-5.2.1-r3 b/dev-lang/php/files/digest-php-5.2.1-r3
new file mode 100644
index 000000000000..54bf65570079
--- /dev/null
+++ b/dev-lang/php/files/digest-php-5.2.1-r3
@@ -0,0 +1,9 @@
+MD5 261218e3569a777dbd87c16a15f05c8d php-5.2.1.tar.bz2 7163383
+RMD160 f75078e0e43cb9c64e6d0a8d51a2ebd23cc9131d php-5.2.1.tar.bz2 7163383
+SHA256 4b60fa70969644d193d58dd7cb9f2765e304c6368e98b1551e92e8d4e14d35ed php-5.2.1.tar.bz2 7163383
+MD5 7ea0587e479d92196831b95e260d2039 php-patchset-5.2.1-r4.tar.bz2 23599
+RMD160 271aee07634277b37c450824d2f188203beef154 php-patchset-5.2.1-r4.tar.bz2 23599
+SHA256 fc4627d63cd387981b3c3f04e2d5c83a227e446929aefbbc44316981c3565138 php-patchset-5.2.1-r4.tar.bz2 23599
+MD5 93c12d351c3ddb811b12f2d897c4f1d5 suhosin-patch-5.2.1-0.9.6.2-gentoo.patch.gz 22686
+RMD160 93d0ba56d9caa5264e60e812e18d100180d610bc suhosin-patch-5.2.1-0.9.6.2-gentoo.patch.gz 22686
+SHA256 f6072cfd46f9d308b43653844c3f5062e6ce0bfe91c02da0a10c96905f0d0829 suhosin-patch-5.2.1-0.9.6.2-gentoo.patch.gz 22686
diff --git a/dev-lang/php/php-4.4.4-r8.ebuild b/dev-lang/php/php-4.4.6.ebuild
index 71bfeb68c1cb..b85410b27b04 100644
--- a/dev-lang/php/php-4.4.4-r8.ebuild
+++ b/dev-lang/php/php-4.4.6.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2006 Gentoo Foundation
+# Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/php/php-4.4.4-r8.ebuild,v 1.1 2006/10/27 12:17:35 chtekk Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/php/php-4.4.6.ebuild,v 1.1 2007/03/05 02:14:43 chtekk Exp $
 
 CGI_SAPI_USE="discard-path force-cgi-redirect"
 APACHE2_SAPI_USE="concurrentmodphp threads"
@@ -20,8 +20,8 @@ MY_PHP_P="php-${MY_PHP_PV}"
 PHP_PACKAGE="1"
 
 # php patch settings, general
-PHP_PATCHSET_REV="4"
-HARDENEDPHP_PATCH="hardening-patch-${MY_PHP_PV}-0.4.15-gentoo.patch.gz"
+PHP_PATCHSET_REV="1"
+SUHOSIN_PATCH="suhosin-patch-${MY_PHP_PV}-0.9.6-gentoo.patch.gz"
 MULTILIB_PATCH="${MY_PHP_PV}/opt/php${MY_PHP_PV}-multilib-search-path.patch"
 # php patch settings, ebuild specific
 FASTBUILD_PATCH="${MY_PHP_PV}/opt/php${MY_PHP_PV}-fastbuild.patch"
@@ -405,6 +405,10 @@ src_install() {
 				;;
 		esac
 	done
+
+	# Install env.d files
+	newenvd "${FILESDIR}/20php4-envd" "20php4"
+	sed -e "s|/lib/|/$(get_libdir)/|g" -i "${D}/etc/env.d/20php4"
 }
 
 pkg_postinst() {
diff --git a/dev-lang/php/php-5.1.6-r8.ebuild b/dev-lang/php/php-5.1.6-r11.ebuild
index ae97fe21edb7..db178db931f6 100644
--- a/dev-lang/php/php-5.1.6-r8.ebuild
+++ b/dev-lang/php/php-5.1.6-r11.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2006 Gentoo Foundation
+# Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/php/php-5.1.6-r8.ebuild,v 1.1 2006/10/27 12:17:35 chtekk Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/php/php-5.1.6-r11.ebuild,v 1.1 2007/03/05 02:14:43 chtekk Exp $
 
 CGI_SAPI_USE="discard-path force-cgi-redirect"
 APACHE2_SAPI_USE="concurrentmodphp threads"
@@ -20,8 +20,8 @@ MY_PHP_P="php-${MY_PHP_PV}"
 PHP_PACKAGE="1"
 
 # php patch settings, general
-PHP_PATCHSET_REV="4"
-HARDENEDPHP_PATCH="hardening-patch-${MY_PHP_PV}-0.4.15-gentoo-r1.patch.gz"
+PHP_PATCHSET_REV="8"
+SUHOSIN_PATCH="suhosin-patch-${MY_PHP_PV}-0.9.6-gentoo.patch.gz"
 MULTILIB_PATCH="${MY_PHP_PV}/opt/php${MY_PHP_PV}-multilib-search-path.patch"
 # php patch settings, ebuild specific
 FASTBUILD_PATCH="${MY_PHP_PV}/opt/php${MY_PHP_PV}-fastbuild.patch"
@@ -405,6 +405,10 @@ src_install() {
 				;;
 		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() {
diff --git a/dev-lang/php/php-5.2.1-r3.ebuild b/dev-lang/php/php-5.2.1-r3.ebuild
new file mode 100644
index 000000000000..9432c71fd77a
--- /dev/null
+++ b/dev-lang/php/php-5.2.1-r3.ebuild
@@ -0,0 +1,516 @@
+# Copyright 1999-2007 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/php/php-5.2.1-r3.ebuild,v 1.1 2007/03/05 02:14:43 chtekk 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_REV="4"
+SUHOSIN_PATCH="suhosin-patch-${MY_PHP_PV}-0.9.6.2-gentoo.patch.gz"
+MULTILIB_PATCH="${MY_PHP_PV}/opt/php${MY_PHP_PV}-multilib-search-path.patch"
+# php patch settings, ebuild specific
+FASTBUILD_PATCH="${MY_PHP_PV}/opt/php${MY_PHP_PV}-fastbuild.patch"
+CONCURRENTMODPHP_PATCH="${MY_PHP_PV}/opt/php${MY_PHP_PV}-concurrent_apache_modules.patch"
+
+inherit php5_2-sapi apache-module
+
+DESCRIPTION="The PHP language runtime engine: CLI, CGI and Apache SAPIs."
+
+DEPEND="app-admin/php-toolkit"
+RDEPEND="${DEPEND}"
+
+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 apache apache2
+
+	# Threaded Apache2 support
+	if useq apache2 ; then
+		if [[ "${APACHE_VERSION}" != "0" ]] ; then
+			if ! useq threads ; then
+				APACHE2_SAFE_MPMS="itk peruser prefork"
+			else
+				APACHE2_SAFE_MPMS="event leader metuxmpm perchild threadpool worker"
+			fi
+
+			ewarn
+			ewarn "If this package fails with a fatal error about Apache2 not having"
+			ewarn "been compiled with a compatible MPM, this is normally because you"
+			ewarn "need to toggle the 'threads' USE flag."
+			ewarn
+			ewarn "If 'threads' is off, try switching it on."
+			ewarn "If 'threads' is on, try switching it off."
+			ewarn
+
+			apache-module_pkg_setup
+		fi
+	fi
+
+	# Concurrent PHP Apache2 modules support
+	if useq apache2 ; then
+		if [[ "${APACHE_VERSION}" != "0" ]] ; then
+			if useq 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
+	fi
+
+	# fastbuild support
+	if useq 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
+
+	php5_2-sapi_pkg_setup
+}
+
+php_determine_sapis() {
+	# holds the list of sapis that we want to build
+	PHPSAPIS=
+
+	if useq cli || phpconfutils_usecheck cli ; then
+		PHPSAPIS="${PHPSAPIS} cli"
+	fi
+
+	if useq cgi ; then
+		PHPSAPIS="${PHPSAPIS} cgi"
+	fi
+
+	# note - we can only build one apache sapi for now
+	# note - apache SAPI comes after the simpler cli/cgi sapis
+	if useq apache || useq apache2 ; then
+		if [[ "${APACHE_VERSION}" != "0" ]] ; then
+			PHPSAPIS="${PHPSAPIS} apache${APACHE_VERSION}"
+		fi
+	fi
+}
+
+src_unpack() {
+	if [[ "${PHP_PACKAGE}" == 1 ]] ; then
+		unpack ${A}
+	fi
+
+	cd "${S}"
+
+	# Concurrent PHP Apache2 modules support
+	if useq apache2 ; then
+		if [[ "${APACHE_VERSION}" != "0" ]] ; then
+			if useq 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
+	fi
+
+	# fastbuild support
+	if useq 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
+
+	# 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 useq 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
+}
+
+src_compile() {
+	if useq 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_apache1=0
+	build_apache2=0
+	my_conf=""
+
+	for x in ${PHPSAPIS} ; do
+		case ${x} in
+			cli)
+				build_cli=1
+				;;
+			cgi)
+				build_cgi=1
+				;;
+			apache1)
+				build_apache1=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_apache1} = 1 ]] ; then
+		my_conf="${my_conf} --with-apxs=/usr/sbin/apxs"
+	fi
+
+	if [[ ${build_apache2} = 1 ]] ; then
+		my_conf="${my_conf} --with-apxs2=/usr/sbin/apxs2"
+
+		# Threaded Apache2 support
+		if useq threads ; then
+			my_conf="${my_conf} --enable-maintainer-zts"
+			ewarn "Enabling ZTS for Apache2 MPM"
+		fi
+
+		# Concurrent PHP Apache2 modules support
+		if useq concurrentmodphp ; then
+			append-ldflags "-Wl,--version-script=${FILESDIR}/php5-ldvs"
+		fi
+	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 || die "Unable to make CGI SAPI"
+		cp sapi/cgi/php php-cgi || die "Unable to copy CGI SAPI"
+	fi
+
+	if [[ ${build_apache1} = 1 ]] || [[ ${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 useq apache2 ; then
+		if [[ "${APACHE_VERSION}" != "0" ]] ; then
+			# Concurrent PHP Apache2 modules support
+			if useq concurrentmodphp ; then
+				append-ldflags "-Wl,--version-script=${FILESDIR}/php5-ldvs"
+			fi
+		fi
+	fi
+
+	for x in ${PHPSAPIS} ; do
+		# Support the Apache2 extras, they must be set globally for all
+		# SAPIs to work correctly, especially for external PHP extensions
+		if useq apache2 ; then
+			if [[ "${APACHE_VERSION}" != "0" ]] ; then
+				# Threaded Apache2 support
+				if useq threads ; then
+					my_conf="${my_conf} --enable-maintainer-zts"
+					ewarn "Enabling ZTS for Apache2 MPM"
+				fi
+			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 php-cgi || die "Unable to copy CGI SAPI"
+				;;
+			apache1)
+				my_conf="${my_conf} --disable-cli --with-apxs=/usr/sbin/apxs"
+				php5_2-sapi_src_compile
+				;;
+			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
+				;;
+			apache1)
+				einfo "Installing Apache${APACHE_VERSION} SAPI"
+				make INSTALL_ROOT="${D}" install-sapi || die "Unable to install ${x} SAPI"
+				einfo "Installing Apache${APACHE_VERSION} config file for PHP5 (70_mod_php5.conf)"
+				insinto ${APACHE_MODULES_CONFDIR}
+				newins "${FILESDIR}/70_mod_php5.conf-apache1" "70_mod_php5.conf"
+				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 useq 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" "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" "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 useq apache || useq apache2 ; then
+		APACHE1_MOD_DEFINE="PHP5"
+		APACHE1_MOD_CONF="70_mod_php5"
+		APACHE2_MOD_DEFINE="PHP5"
+		if useq concurrentmodphp ; then
+			APACHE2_MOD_CONF="70_mod_php5_concurr"
+		else
+			APACHE2_MOD_CONF="70_mod_php5"
+		fi
+		apache-module_pkg_postinst
+	fi
+
+	# Update Apache1 to use mod_php
+	if useq apache ; then
+		"${ROOT}/usr/sbin/php-select" -t apache1 php5 > /dev/null 2>&1
+		exitStatus=$?
+		if [[ ${exitStatus} == 2 ]] ; then
+			php-select apache1 php5
+		elif [[ ${exitStatus} == 4 ]] ; then
+			ewarn
+			ewarn "Apache1 is configured to load a different version of PHP."
+			ewarn "To make Apache1 use PHP v5, use php-select:"
+			ewarn
+			ewarn "    php-select apache1 php5"
+			ewarn
+		fi
+	fi
+
+	# Update Apache2 to use mod_php
+	if useq 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 useq 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 useq 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() {
+	einfo ">>> Test phase [test]: ${CATEGORY}/${PF}"
+	if ! emake -j1 test ; then
+		hasq test ${FEATURES} && die "Make test failed. See above for details."
+		hasq test ${FEATURES} || eerror "Make test failed. See above for details."
+	fi
+}