importing -r7 (patchset: r8) from php-testing overlay, including the snmp memory leak fix from bug 231528 by popular demand

Package-Manager: portage-2.2_rc8/cvs/Linux 2.6.26-gentoo x86_64

4 files changed, 36 insertions, 519 deletions

diff --git a/dev-lang/php/ChangeLog b/dev-lang/php/ChangeLog
index 814ba85ac524..93651616ae53 100644
--- a/dev-lang/php/ChangeLog
+++ b/dev-lang/php/ChangeLog
@@ -1,10 +1,22 @@
 # ChangeLog for dev-lang/php
 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/php/ChangeLog,v 1.292 2008/08/23 05:40:38 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/php/ChangeLog,v 1.293 2008/09/06 20:48:36 hoffie Exp $
+
+*php-5.2.6-r7 (06 Sep 2008)
+
+  06 Sep 2008; Christian Hoffmann <hoffie@gentoo.org> -php-5.2.6.ebuild,
+  -php-5.2.6-r2.ebuild, +php-5.2.6-r7.ebuild:
+  importing -r7 (patchset: r8) from php-testing overlay, including the snmp
+  memory leak fix from bug 231528; no need to upgrade for users with
+  USE=-snmp
 
   23 Aug 2008; Jeroen Roovers <jer@gentoo.org> metadata.xml:
   Add GLEP 56 USE flag descriptions.
 
+  15 Aug 2008; Christian Hoffmann <hoffie@gentoo.org> -php-5.2.6.ebuild,
+  -php-5.2.6-r2.ebuild:
+  removing old and vulnerable
+
   09 Aug 2008; Christian Hoffmann <hoffie@gentoo.org> -php-4.4.8.ebuild:
   Removing php-4 (bug 189172); use the php-4 (layman) overlay instead, if
   you really insist on keeping it installed
diff --git a/dev-lang/php/Manifest b/dev-lang/php/Manifest
index ec8567d8fc18..1a23df66ec6e 100644
--- a/dev-lang/php/Manifest
+++ b/dev-lang/php/Manifest
@@ -1,3 +1,6 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX 20php4-envd 145 RMD160 fb57b2d202ab1031303e7525a8ef5b353dc04ef8 SHA1 34ef066d2de22f147fc86bbe884692af7631f726 SHA256 17cd1a952434988b4c2125e4d1eef1df7114809f404605d35f255674419dd5d5
 AUX 20php5-envd 145 RMD160 8c81fb7dc1d1ddf16fd956d748514db3bcb27603 SHA1 f1cef57c0def8e2c5422aaf136f40b4ff47801d2 SHA256 efaae9e6ae5f7010e073c2ab6d8a9dda009f0707c7d7b0c027e142c94f7041a4
 AUX 70_mod_php.conf-apache2 454 RMD160 7e99b278a010c958d698454a2aa43e1a351c69e8 SHA1 895e986f880a1dee9b0a45fdcd99ccce44999a6b SHA256 dd7116f3439e06ef2d6126403360c2722355f8481552fdce0cb601af331f81ee
@@ -9,16 +12,19 @@ AUX php5-ldvs 22 RMD160 5846dab2745b68a88175dd4e72d0b8cf4756dd46 SHA1 592398c925
 DIST php-5.2.5.tar.bz2 7773024 RMD160 2d5755f2ae8884e80f0a5c70e8fdfdb6deed46bc SHA1 6b46fd095891183b328163b70cdb5acd30a24b7a SHA256 5cac1e70df5019ebdfdab2e0b8b216f7fdf56b9895c9f68c993313918249bba3
 DIST php-5.2.6.tar.bz2 9571312 RMD160 27f730d4b1ceb1c42ff03618dbfa0dc87a00990b SHA1 2a2b1afa657a7739a23784c869d57c3e0a7ad6b4 SHA256 1892b2dd50b56ae2c9aec027fcd9035b76673f113555bc2bc1007bab8ae4db81
 DIST php-patchset-5.2.5-r1.tar.bz2 15350 RMD160 777f77e351ed024952f2adf323261db28f98c428 SHA1 d794d02e57ae400cf32638e1168f3dd6d213911b SHA256 50860764cf068465af09acc5ed32ad89f2e8ee0e03b02b2dd70fa19bd1176f10
-DIST php-patchset-5.2.6-r0.tar.bz2 10713 RMD160 408d25f1c28c582c5053c4eaf21c02e63e420d52 SHA1 b6b3b3c5d69288352a27075dddc2e00c87360d04 SHA256 161c9febd0f14fe8fa64f58016c2cf52ae39105f40c0735098218c122debed56
-DIST php-patchset-5.2.6-r2.tar.bz2 15621 RMD160 baee575d1e4c67eede70ceeb3a8119df2062c0cc SHA1 f3b57129e1e0ca56a61cceed2f7bbe796334cf43 SHA256 f49be3db0c4eb09918c1797eb304a91a0ef56fdd1db0c6d47504b785f718e995
 DIST php-patchset-5.2.6-r7.tar.bz2 26988 RMD160 186e1b132ee8ffc7b9005d0784ef190fe42c0fb0 SHA1 826445f967a31aaa3ec65979ab0aa88861c96c0b SHA256 c6223eb75fbb487a317f715a84b1b40eb0f9e170b7818091edb6d4289a9a4579
+DIST php-patchset-5.2.6-r8.tar.bz2 28070 RMD160 74a33ffb6f3437883510161fc7bd57fbfbff4310 SHA1 f57441d6b2e25256811f15a31d088b0c3e0505fc SHA256 58f6d4708c13eb2ff5800a96d7f8b9144bb824093cc444cee0399597e1138f7f
 DIST suhosin-patch-5.2.5-0.9.6.2.patch.gz 23157 RMD160 25863ad76bea4a8e5bf50bd916835b5d9324452c SHA1 1102e2e1de922b5199462100a7bbbb7cef5c3f58 SHA256 fd77ccdeb90c83af7492876dda17518de95dd74a5b6feecc5a1bd2c8e322ab53
-DIST suhosin-patch-5.2.5_p20080206-0.9.6.2-gentoo.patch.gz 22985 RMD160 330d248a64790552945b5f94be749391acec5b26 SHA1 e087ad94cdddf03e8fa8fb49357963e75aae97bc SHA256 e3ac5634dc481b829b42d6f1521e10b1ce8a3cdbeca50822cab8937db8d4566f
 DIST suhosin-patch-5.2.6-0.9.6.2-r1.patch.gz 22987 RMD160 9c7bc7441e16686382a2b91f68c6e56a84683304 SHA1 0869e555e722615881d6bf1f642d656c53b41bd0 SHA256 40fdd5b92c4e1595250ffc58f317887acd1ef6681e6b6fdca098110c4bfa5bbc
-DIST suhosin-patch-5.2.6-0.9.6.2.patch.gz 22986 RMD160 f5e5e6d88b91506a49988e3b7f371c8a62b657ab SHA1 b19fcb8baa5e30b4533c662950883c29e185c1f5 SHA256 dfdae803778e6ed6854ea3ad2948bbfedbfffc5a32dbc75a657b99092a9cc5e4
 EBUILD php-5.2.5-r1.ebuild 13997 RMD160 e9d8fb469d0e80011f756173029e058279a17bd3 SHA1 225b5ef6e2bb57fe102e6e2e42903913bb3cd898 SHA256 7b05895d96560cdc24b90310169a7da1034d53d8640dd3ba77a07546ae7ea7ab
-EBUILD php-5.2.6-r2.ebuild 15423 RMD160 640e51f190cdfe93ea36f7098b0c25a3e62d3d84 SHA1 d1a773b35c40c6d41a8cf0cd070cfe3febc96f48 SHA256 5c982bf757f54f4342567bca415dbdc571ac125fb99a11414cd4b63a0a30397b
 EBUILD php-5.2.6-r6.ebuild 15511 RMD160 15b73a86cac0bafd5ff4f7726aabfb31a009c660 SHA1 7498ce1432bcd8158a4a95d0c0dc6c9b29bcc3be SHA256 7e681a66bb94d23d723ddc96ffd9edf37333cd6c70f270611a3bb5e235679858
-EBUILD php-5.2.6.ebuild 15292 RMD160 f6157ccdaffbf24252e4d07e26ffa55cb46f3ff9 SHA1 dd479cc008ae5aee86a29e4eeb2297daadb60f3a SHA256 47285d81ade0c4323c862924251b1fdc4b34e29f461759a471494d96c9be422e
-MISC ChangeLog 52225 RMD160 99b510821262157dfa476e60b073125555be2a64 SHA1 460794ec81581b2356a81de3200567b500d92578 SHA256 092e2fcb401bbcae3ae31de996c953450fef64a1dfe65a205c9c580990ffcb2d
+EBUILD php-5.2.6-r7.ebuild 15515 RMD160 464d515a2c97f694ef20f663830fd42efe4f48a1 SHA1 2d5bc14ac2f5c43991a232ec045df4bdc9d34d3f SHA256 5b8c5fbd47383b80fb88b2b6e840e962487711d570006bdb5f14bf482e63bf80
+MISC ChangeLog 52662 RMD160 0d33930a8a25066001f8e6235ed441719d5b1e22 SHA1 85f8734daea4cd90c71127860e0ca3a7f48e6163 SHA256 657331378cca9b67d0d55ad2a0ba0e8a8a6c75534a31793a71c4039b3736412f
 MISC metadata.xml 1474 RMD160 968749dc68a355631d935d56178d35ec4993031e SHA1 927a686ce5ac5be695557cb48e5a506f77e4bda4 SHA256 7829b91b5e61e6c2a03540057b1a4e24b8568f20c9725617197b9a06a708ea2d
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.9 (GNU/Linux)
+
+iEYEARECAAYFAkjC7KoACgkQV6E0EIywUuUvwQCgvt6KPDTWE5U2OPsQCkZs0FAT
+2/oAoOsRGi7IaI+it+Fusm8bMBx1lf/l
+=ba2G
+-----END PGP SIGNATURE-----
diff --git a/dev-lang/php/php-5.2.6-r2.ebuild b/dev-lang/php/php-5.2.6-r7.ebuild
index 552fe83e299b..b2f7154b1052 100644
--- a/dev-lang/php/php-5.2.6-r2.ebuild
+++ b/dev-lang/php/php-5.2.6-r7.ebuild
@@ -1,12 +1,12 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/php/php-5.2.6-r2.ebuild,v 1.9 2008/07/24 20:44:23 hoffie Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/php/php-5.2.6-r7.ebuild,v 1.1 2008/09/06 20:48:36 hoffie 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"
+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
@@ -20,8 +20,8 @@ MY_PHP_P="php-${MY_PHP_PV}"
 PHP_PACKAGE="1"
 
 # php patch settings, general
-PHP_PATCHSET_REV="2"
-SUHOSIN_PATCH="suhosin-patch-5.2.6-0.9.6.2.patch.gz"
+PHP_PATCHSET_REV="8"
+SUHOSIN_PATCH="suhosin-patch-5.2.6-0.9.6.2-r1.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"
@@ -32,6 +32,9 @@ KOLAB_PATCH="${MY_PHP_PV}/opt/kolab-imap-annotations.patch"
 
 inherit versionator php5_2-sapi apache-module
 
+SRC_URI="http://home.hoffie.info/php-patchset-${PV}-r${PHP_PATCHSET_REV}.tar.bz2
+	${SRC_URI}"
+
 # Suhosin patch support
 [[ -n "${SUHOSIN_PATCH}" ]] && SRC_URI="${SRC_URI} suhosin? ( http://gentoo.longitekk.com/${SUHOSIN_PATCH} )"
 
@@ -166,9 +169,6 @@ src_unpack() {
 		ext/standard/tests/file/006_error.phpt \
 		ext/standard/tests/file/touch.phpt
 
-	# Workaround for autoconf-2.62 behaviour change, bug 217392
-	sed -re 's:(#ifdef HAVE_CONFIG_H.*):#define _GNU_SOURCE\n\1:' -i ext/posix/posix.c
-
 	# REMOVING BROKEN TESTS:
 	# removing this test as it has been broken for ages and is not easily
 	# fixable (depends on a lot of factors)
@@ -191,6 +191,9 @@ src_unpack() {
 }
 
 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
diff --git a/dev-lang/php/php-5.2.6.ebuild b/dev-lang/php/php-5.2.6.ebuild
deleted file mode 100644
index 4c231480c3cc..000000000000
--- a/dev-lang/php/php-5.2.6.ebuild
+++ /dev/null
@@ -1,504 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/php/php-5.2.6.ebuild,v 1.2 2008/05/01 16:19:40 hoffie 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="0"
-SUHOSIN_PATCH="suhosin-patch-5.2.5_p20080206-0.9.6.2-gentoo.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"
-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
-
-	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
-
-	# 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
-
-	# Workaround for autoconf-2.62 behaviour change, bug 217392
-	sed -re 's:(#ifdef HAVE_CONFIG_H.*):#define _GNU_SOURCE\n\1:' -i ext/posix/posix.c
-
-	# 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
-
-	# 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
-
-	# these tests behave differently with suhosin enabled, adapting them...
-	use suhosin && sed -e 's:File(\.\./):File(..):g' -i \
-		ext/standard/tests/file/open_basedir*{.inc,.phpt}
-}
-
-src_compile() {
-	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
-
-	# 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
-		# 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" "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 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
-}