Revision bump to fix INI restore issue and other bugs, updates Hardened-PHP.

(Portage version: 2.1.1_rc1-r2)
 (Unsigned Manifest commit)

5 files changed, 22 insertions, 1064 deletions

diff --git a/dev-lang/php/Manifest b/dev-lang/php/Manifest
index 3ab8cdc2a9e4..0a65945ba99d 100644
--- a/dev-lang/php/Manifest
+++ b/dev-lang/php/Manifest
@@ -32,10 +32,10 @@ RMD160 5846dab2745b68a88175dd4e72d0b8cf4756dd46 files/php5-ldvs 22
 SHA256 b79d0e52b1b3b4543b31ad45525ae1c2814a27ea8e676772ab10bf6fb12dfe79 files/php5-ldvs 22
 DIST hardening-patch-4.3.11-0.4.3-gentoo.patch.gz 85180 RMD160 abc0ce0ee3020c9ec67ac595531c0fae13c8d351 SHA1 ef536a5379819f8bd9e11d7c02d1067ce093621b SHA256 103e80cb39fc1a5b6b93e9d5faf9842ea1e1a7847cfc868369325f80421d29c7
 DIST hardening-patch-4.4.3-0.4.13-gentoo.patch.gz 60572 RMD160 bef0106227dd0e23a67e59d9d0a5735478c2dec2 SHA1 d0284ed0f7213e5afb326411cdaf2dfbdd007949 SHA256 4e09cd6cbd00e3a2199e6a68ab58875b133fea685500f2a35a2f7d348eaab44b
-DIST hardening-patch-4.4.4-0.4.14-gentoo.patch.gz 60772 RMD160 9f55babe9a2847f68574f94d9d49bb6eef1960b0 SHA1 6bf249422693c0ed6f1958b11d6594d1ad08e09d SHA256 454b23922ce1cdcb7ac61d02b198a21db08f2069cd9f7b2fb5f46291f0e24989
+DIST hardening-patch-4.4.4-0.4.15-gentoo.patch.gz 61351 RMD160 4c7b02b6a86005136ed6eb751ba549fe1ea275b0 SHA1 895d5b69eed881d11452230e35a76c30d32b6ce0 SHA256 3885d9dba28e8a689d26d1d1889ecd1b8c8289bb25c337d472084c809daba291
 DIST hardening-patch-5.0.5-0.4.8-gentoo.patch.gz 57864 RMD160 f68e2870ef56f005ae062f53053ecffd87b2059d SHA1 3f69694a541c9014c5b52669c4259ce11209da7b SHA256 6d8e61ff1fa10ce238600e936de1eac665c5237482ae6c3b4db05c6b7d684a7c
 DIST hardening-patch-5.1.4-0.4.13-gentoo.patch.gz 59457 RMD160 301592ee7fd7290e1c61d5e90f9a88a683ab8b3b SHA1 14604a1ed1120155f277c5d7dea4828ecac21a77 SHA256 ab3da7f799eaecda3fecf5971ed821ba60a3a8e0f4a931114122791542d95ddc
-DIST hardening-patch-5.1.6-0.4.14-gentoo.patch.gz 60949 RMD160 4636e215cf13d50bcbdd75da45ef624d1c19ed5d SHA1 fa0cd8f4d630222a00c8b51fd566c5de10b6c464 SHA256 515687900f7976872cb14f5b052890b22c4b1cbea1dcfbab852b79dab13831bf
+DIST hardening-patch-5.1.6-0.4.15-gentoo.patch.gz 61484 RMD160 e4a49784b075ffaee56798b9ef086df06e3ea320 SHA1 048020a7a29cef1cca80862db47712c84e8e41fb SHA256 f4fb1944828193e723932ffbebb44ba3ae013171df6d3eb44644c9a4a8610db0
 DIST php-4.3.11.tar.bz2 4012575 RMD160 fe44f6c2783ddd469b94744e440e836cff3329e5 SHA1 617ce50bb125ee841f71e67638c492999cd3bd18 SHA256 6b133db9ac17d4e1f393003683c1b4d15dff3197559c85fd8dd63ba4868a21c5
 DIST php-4.4.3.tar.bz2 4461353 RMD160 36c91930af44e8a1ed59eb159e6131ae8f0c77f0 SHA1 42aec56fec03c13366c0b0aac13169138814a4b5 SHA256 0f57da4b9d94f7febd37c0bc8e608e5aafafe744d094466723e04afb283407f7
 DIST php-4.4.4.tar.bz2 4478698 RMD160 02fd7d5135a9e5ce11d905a4a474a5d42b8441f3 SHA1 05d62910fb5734344db87f0a17b1e8e001b26b05 SHA256 9f0742fce014a255f8453c1264afee5de289a9e9dcd57c448c77b46978f6a76b
@@ -44,10 +44,10 @@ DIST php-5.1.4.tar.bz2 6356171 RMD160 d4ab11884a3a899f21eef777767a553cf81584ce S
 DIST php-5.1.6.tar.bz2 6454408 RMD160 7ac52f4674532397c982f6ced594b70dd17522af SHA1 a20b946f1de0a8a35a8a6bf437adbba4e5448d27 SHA256 3e9510ce715f28b7e6b803fcdadb73b37c83792c0b5e1e9bcb066ab972649996
 DIST php-patchset-4.3.11-r3.tar.bz2 27977 RMD160 a99c2eecca8e6e51cdb2f66e7da2d0a446fb8d50 SHA1 9c229a70b52db40e752be8f0557865d8ec602f40 SHA256 4b93cdebc3034e81d9c589e90fdf93e84ea67712a56afaad5b0b299edfe6d76b
 DIST php-patchset-4.4.3-r3.tar.bz2 22764 RMD160 e9ec6ffcdebb696f13c177e57ad8d78763df439a SHA1 6e2961f3743f9b1d6fdd333639342287cba24bf8 SHA256 457f003521d930be27068cce80f4adfdedcb715789e1677b47b4dfbb86559819
-DIST php-patchset-4.4.4-r1.tar.bz2 19969 RMD160 e420d6b849c115ea987791875e019420292be9fd SHA1 ade335e6fbf04e15f510e1cc78163dcc7c989545 SHA256 5d739336ef5dfabe5dd884f06e2261e1014ae7e0126369aef547b61fc6d8ee92
+DIST php-patchset-4.4.4-r2.tar.bz2 20349 RMD160 3449835b81db81a99d2046d6933ae6ac51c3eb47 SHA1 4c59ac9c6834e221cc1384b7548d71a63bc42089 SHA256 360fd167822644e9a84baeea04b34f92ea5a96f678c5616d4889541503eecc5d
 DIST php-patchset-5.0.5-r3.tar.bz2 20910 RMD160 0f78808e3fe15568d5670ad852ed218589949aea SHA1 54d9edc8e8becc1b0822f30b784f029eb5417db3 SHA256 b4df50e7a857eea4072c0b7cde1585409eaebec8f64474d6c1611c5b9869c7f2
 DIST php-patchset-5.1.4-r6.tar.bz2 29925 RMD160 06e4cc0d2937786ac64446db9954897af2bd15c6 SHA1 e5b9f97e80c798078f7e39a05af2c50e4ace1bd9 SHA256 9a29de8dba649f91057d7c2f1b853dc81228936c78d0fb787287531eaf316b39
-DIST php-patchset-5.1.6-r1.tar.bz2 22390 RMD160 9bb28e7b2c247e890e386e89a820dc89a5ae3f05 SHA1 53d4d5b7400f814adba4c69b3258d0678fc7c1d3 SHA256 a3d1fb8926c8fd4a545559c859a2787ba08d94f60fd352512d8c5b2a3d98c14c
+DIST php-patchset-5.1.6-r2.tar.bz2 22693 RMD160 aebcfb0cd1685512dd86e1a92d77ff91ca5b83f7 SHA1 694a2adb9c69c75f00656f37a071637580fd6564 SHA256 06e6526388464c1f2e1b953e49b0463c6dfdda461fed889cb632aef855cd49cb
 DIST php-pcrelib-new-secpatch.tar.bz2 357619 RMD160 1748ef9837f3f5ce7ad81f0dd751b430c8c2c6f6 SHA1 040bf3344d68fff3eb1829a2a02586499de5c2ee SHA256 7c49aa2c6be704b576720673fa123febdddc541d8152ccacea5cb2c9d1560a19
 EBUILD php-4.3.11-r5.ebuild 14932 RMD160 496b57fd984931f17edb7c00521988fd0b04c893 SHA1 1097ac9cdfd25179203032ed482574bf6021b773 SHA256 a48ab17f67dfbb3c4a598a02ef059a5320c15063fa2863c16f23e1ac936176c0
 MD5 73dadb37690226c70f1f1be9eec1e3b5 php-4.3.11-r5.ebuild 14932
@@ -57,10 +57,10 @@ EBUILD php-4.4.3-r1.ebuild 15379 RMD160 01ad55d5d45ac497e281ac31f62be1216843beb5
 MD5 9625cbb42214d401fd4ea5c6fcfc7731 php-4.4.3-r1.ebuild 15379
 RMD160 01ad55d5d45ac497e281ac31f62be1216843beb5 php-4.4.3-r1.ebuild 15379
 SHA256 5d45be298fa71fdd89d58cc73991b77f9894cedb9d53f373d11a23bd1f8fc83a php-4.4.3-r1.ebuild 15379
-EBUILD php-4.4.4-r2.ebuild 15389 RMD160 aeaeaf8f861f7423757fd00e6f8170df7a1e1ff7 SHA1 a7e0d368c5e0c91b7bdde684ad37b1d84fcf4c26 SHA256 58666f253007879ea03f2dbb01e8cc1126da3c07ae57db73146723177580a712
-MD5 2c49edf925c76aed4e37d25fe5e45355 php-4.4.4-r2.ebuild 15389
-RMD160 aeaeaf8f861f7423757fd00e6f8170df7a1e1ff7 php-4.4.4-r2.ebuild 15389
-SHA256 58666f253007879ea03f2dbb01e8cc1126da3c07ae57db73146723177580a712 php-4.4.4-r2.ebuild 15389
+EBUILD php-4.4.4-r4.ebuild 15389 RMD160 53b73cd53f352c63a938dda669fbb98f51170f87 SHA1 bcca1c6ce25bd5d160bb14de4858a70015f7ebc3 SHA256 0638e0af877ecdd7e4c4d481c9258186569f9a4e4808c42de8c43d2eea8ae2a7
+MD5 d77519618175afa03cfcae3df76df57a php-4.4.4-r4.ebuild 15389
+RMD160 53b73cd53f352c63a938dda669fbb98f51170f87 php-4.4.4-r4.ebuild 15389
+SHA256 0638e0af877ecdd7e4c4d481c9258186569f9a4e4808c42de8c43d2eea8ae2a7 php-4.4.4-r4.ebuild 15389
 EBUILD php-5.0.5-r5.ebuild 10457 RMD160 d862476c6c06944317cc3f417005f93a652c8996 SHA1 1d0b97da8e1cdeefacffd9e68dec94a94eb040db SHA256 d7a9d73e51e332e8d78624072a1e8972554a8789a0ed7112760ea2b9625b6bbb
 MD5 a78424ab5677e3d6ec0588295fd480b7 php-5.0.5-r5.ebuild 10457
 RMD160 d862476c6c06944317cc3f417005f93a652c8996 php-5.0.5-r5.ebuild 10457
@@ -69,14 +69,14 @@ EBUILD php-5.1.4-r6.ebuild 15386 RMD160 e5e1721339ac6cedd4a6bc0af5151670038dc044
 MD5 c622e9b69242bf90ec5cfcdc62833d73 php-5.1.4-r6.ebuild 15386
 RMD160 e5e1721339ac6cedd4a6bc0af5151670038dc044 php-5.1.4-r6.ebuild 15386
 SHA256 f61d0b649adc0097f809b138546ae5fbbe759ba24ae6d585675892a4a7e09060 php-5.1.4-r6.ebuild 15386
-EBUILD php-5.1.6-r2.ebuild 15397 RMD160 562f3b1c791e78a5138a906ae888bcd1ee3a2b33 SHA1 e59fd36464dff02b7389dbb330dc09bb1ec68f2b SHA256 51ee3ee52dc72ace26eeba435b3a304504aec2808a6f586d27c978c45bce9c93
-MD5 72beb5fd0d866ea6cc9fcb3b25452f17 php-5.1.6-r2.ebuild 15397
-RMD160 562f3b1c791e78a5138a906ae888bcd1ee3a2b33 php-5.1.6-r2.ebuild 15397
-SHA256 51ee3ee52dc72ace26eeba435b3a304504aec2808a6f586d27c978c45bce9c93 php-5.1.6-r2.ebuild 15397
-MISC ChangeLog 27169 RMD160 78adba5cbad9d4789d028659cc257bd6f8b2c669 SHA1 b47e0deeb4866a064c55d69d2b44c8fa0543dd0a SHA256 e48f43c034764b072c7b84f9de659ceaf4b23bc987f8ee67deccb70ca539ff2b
-MD5 4ce3ccdedbdb4049fab44a2f85a9f6fe ChangeLog 27169
-RMD160 78adba5cbad9d4789d028659cc257bd6f8b2c669 ChangeLog 27169
-SHA256 e48f43c034764b072c7b84f9de659ceaf4b23bc987f8ee67deccb70ca539ff2b ChangeLog 27169
+EBUILD php-5.1.6-r4.ebuild 15397 RMD160 bfdf7d05c894e9366328defbc2b26a86f789613f SHA1 e820d505ab839a4924094915ec1424310ec46858 SHA256 0b9a7a6f690b0e3862e1f80afb938d9838210f2b5d76b1d5dacc9452e859990f
+MD5 4aef0b9ec71080fe72a1cc58a92101db php-5.1.6-r4.ebuild 15397
+RMD160 bfdf7d05c894e9366328defbc2b26a86f789613f php-5.1.6-r4.ebuild 15397
+SHA256 0b9a7a6f690b0e3862e1f80afb938d9838210f2b5d76b1d5dacc9452e859990f php-5.1.6-r4.ebuild 15397
+MISC ChangeLog 27481 RMD160 270f48e1a9a49443bd9281c8d33e707a50f0a622 SHA1 5f1136199d9c6cbdf1cdf31fd1b0b3e414f2df52 SHA256 d4de722c05c688172f60b50bda67e83dba531e0c2d0a38bf59b5e44e57056b97
+MD5 75ea8f64ea55c86655d76800c5287bfe ChangeLog 27481
+RMD160 270f48e1a9a49443bd9281c8d33e707a50f0a622 ChangeLog 27481
+SHA256 d4de722c05c688172f60b50bda67e83dba531e0c2d0a38bf59b5e44e57056b97 ChangeLog 27481
 MISC metadata.xml 157 RMD160 a98db3a086fae3c09a903dadbc05f60443ec4b1a SHA1 ddaa23cc35eb917bf8962b652442bebb1ce0f440 SHA256 54f8878ca0228e380abbaa4b529806b5533a6b9b51b3b16c0909e906586a91a1
 MD5 c58d07ca1c1235bbad9bccaec96fc062 metadata.xml 157
 RMD160 a98db3a086fae3c09a903dadbc05f60443ec4b1a metadata.xml 157
@@ -87,15 +87,15 @@ SHA256 31fd63a83313d40e97257630acac6f0b2a1c910bab39076b1a851c9b6fe84802 files/di
 MD5 563df2b6bd1f3d690facae31d1c957d3 files/digest-php-4.4.3-r1 810
 RMD160 db0c4236e1ecda59859891ebc4d515864751c636 files/digest-php-4.4.3-r1 810
 SHA256 9df4508e85d305e439f9169b0b9e5adef1b9d454279f510fcab777426f1d7271 files/digest-php-4.4.3-r1 810
-MD5 c0ffcb25438c3ee1944fb8181e21967a files/digest-php-4.4.4-r2 810
-RMD160 b20502f546f8c2788f54a36695c4d15b944623a4 files/digest-php-4.4.4-r2 810
-SHA256 3db950a751ed3604c160e9f8e16bc36afd35f508ed9da858486e20d16c32795f files/digest-php-4.4.4-r2 810
+MD5 c6068124c19b2a97a6749013ebc02c9b files/digest-php-4.4.4-r4 810
+RMD160 3c49151530848e5c7372d11bd7e6fc18c66334a6 files/digest-php-4.4.4-r4 810
+SHA256 1726a087810ecd1e432e190b3ad83d0f330a7dfbb4d4ef9bbccfb55365f62019 files/digest-php-4.4.4-r4 810
 MD5 049755680b7454329c4332c92e1aa83e files/digest-php-5.0.5-r5 807
 RMD160 351460cebfa761c8570dfa2b8e3d096c6d0c6df9 files/digest-php-5.0.5-r5 807
 SHA256 f647a2e0bc16efd18e6f216a0abd64b2b47a4bb95159a2199255d104a2720a9b files/digest-php-5.0.5-r5 807
 MD5 e2701fcf4348406615cae33fd3cfed04 files/digest-php-5.1.4-r6 810
 RMD160 562ec3d2dfb41b85785155e09a3d9f7a26fe0213 files/digest-php-5.1.4-r6 810
 SHA256 d52a40e6f7f350a5ac2baa46095fb8e71e062d7b3cab3d890bc2c6a29c3ef91d files/digest-php-5.1.4-r6 810
-MD5 078b8ef702553d5b502297c10f021119 files/digest-php-5.1.6-r2 810
-RMD160 275ad8deed6c6756a4a35e860f840fdeac685aac files/digest-php-5.1.6-r2 810
-SHA256 16b18d40cb7d9b74a331890f2c3e1590438fb814d1bf46a331c5b104b2641aab files/digest-php-5.1.6-r2 810
+MD5 829f853f83f1f849726c8178a60988b1 files/digest-php-5.1.6-r4 810
+RMD160 2a3ee52f3e8938f031dd7f2e99ad46e2e42e4581 files/digest-php-5.1.6-r4 810
+SHA256 b98ac6c203fd363ab5f759f970d1d301e8ef014f88d7868a9d8f232ddda6a5d9 files/digest-php-5.1.6-r4 810
diff --git a/dev-lang/php/files/digest-php-4.4.4-r2 b/dev-lang/php/files/digest-php-4.4.4-r2
deleted file mode 100644
index 6ab9203d07c4..000000000000
--- a/dev-lang/php/files/digest-php-4.4.4-r2
+++ /dev/null
@@ -1,9 +0,0 @@
-MD5 603410dabb06b7252c2bcc1143dad813 hardening-patch-4.4.4-0.4.14-gentoo.patch.gz 60772
-RMD160 9f55babe9a2847f68574f94d9d49bb6eef1960b0 hardening-patch-4.4.4-0.4.14-gentoo.patch.gz 60772
-SHA256 454b23922ce1cdcb7ac61d02b198a21db08f2069cd9f7b2fb5f46291f0e24989 hardening-patch-4.4.4-0.4.14-gentoo.patch.gz 60772
-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 677975c1e10ebd9ee17112b4ca0f21af php-patchset-4.4.4-r1.tar.bz2 19969
-RMD160 e420d6b849c115ea987791875e019420292be9fd php-patchset-4.4.4-r1.tar.bz2 19969
-SHA256 5d739336ef5dfabe5dd884f06e2261e1014ae7e0126369aef547b61fc6d8ee92 php-patchset-4.4.4-r1.tar.bz2 19969
diff --git a/dev-lang/php/files/digest-php-5.1.6-r2 b/dev-lang/php/files/digest-php-5.1.6-r2
deleted file mode 100644
index acd78834cb0b..000000000000
--- a/dev-lang/php/files/digest-php-5.1.6-r2
+++ /dev/null
@@ -1,9 +0,0 @@
-MD5 48c310f69eff54f6f851a7bf1d1b2359 hardening-patch-5.1.6-0.4.14-gentoo.patch.gz 60949
-RMD160 4636e215cf13d50bcbdd75da45ef624d1c19ed5d hardening-patch-5.1.6-0.4.14-gentoo.patch.gz 60949
-SHA256 515687900f7976872cb14f5b052890b22c4b1cbea1dcfbab852b79dab13831bf hardening-patch-5.1.6-0.4.14-gentoo.patch.gz 60949
-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 290a83a8f87414830d705ac720b84336 php-patchset-5.1.6-r1.tar.bz2 22390
-RMD160 9bb28e7b2c247e890e386e89a820dc89a5ae3f05 php-patchset-5.1.6-r1.tar.bz2 22390
-SHA256 a3d1fb8926c8fd4a545559c859a2787ba08d94f60fd352512d8c5b2a3d98c14c php-patchset-5.1.6-r1.tar.bz2 22390
diff --git a/dev-lang/php/php-4.4.4-r2.ebuild b/dev-lang/php/php-4.4.4-r2.ebuild
deleted file mode 100644
index 727ff29db6e9..000000000000
--- a/dev-lang/php/php-4.4.4-r2.ebuild
+++ /dev/null
@@ -1,512 +0,0 @@
-# Copyright 1999-2006 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-r2.ebuild,v 1.1 2006/08/30 11:17:26 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="4"
-MY_PHP_PV="${PV}"
-MY_PHP_P="php-${MY_PHP_PV}"
-PHP_PACKAGE="1"
-
-# php patch settings, general
-PHP_PATCHSET_REV="1"
-HARDENEDPHP_PATCH="hardening-patch-${MY_PHP_PV}-0.4.14-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 php4_4-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
-
-	php4_4-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
-	php4_4-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-experimental-zts"
-			ewarn "Enabling ZTS for Apache2 MPM"
-		fi
-
-		# Concurrent PHP Apache2 modules support
-		if useq concurrentmodphp ; then
-			append-ldflags "-Wl,--version-script=${FILESDIR}/php4-ldvs"
-		fi
-	fi
-
-	# Now we know what we are building, build it
-	php4_4-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-php4"|g;' -i main/build-defs.h
-		sed -e 's|^#define PHP_CONFIG_FILE_SCAN_DIR.*|#define PHP_CONFIG_FILE_SCAN_DIR "/etc/php/cli-php4/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-php4"|g;' -i main/build-defs.h
-		sed -e 's|^#define PHP_CONFIG_FILE_SCAN_DIR.*|#define PHP_CONFIG_FILE_SCAN_DIR "/etc/php/cgi-php4/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}-php4\"|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}-php4/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}/php4-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-experimental-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"
-				php4_4-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
-				php4_4-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"
-				php4_4-sapi_src_compile
-				;;
-			apache2)
-				my_conf="${my_conf} --disable-cli --with-apxs2=/usr/sbin/apxs2"
-				php4_4-sapi_src_compile
-				;;
-		esac
-
-		CLEAN_REQUIRED=1
-		my_conf=""
-	done
-}
-
-src_install() {
-	php_determine_sapis
-
-	destdir=/usr/$(get_libdir)/php4
-
-	# Let the eclass do the common work
-	php4_4-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"
-				php4_4-sapi_install_ini
-				;;
-			cgi)
-				einfo "Installing CGI SAPI"
-				into ${destdir}
-				dobin php-cgi || die "Unable to install ${x} sapi"
-				php4_4-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 PHP4 (70_mod_php.conf)"
-				insinto ${APACHE_MODULES_CONFDIR}
-				newins "${FILESDIR}/70_mod_php.conf-apache1" "70_mod_php.conf"
-				php4_4-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 PHP4-concurrent (70_mod_php_concurr.conf)"
-					insinto ${APACHE_MODULES_CONFDIR}
-					newins "${FILESDIR}/70_mod_php_concurr.conf-apache2" "70_mod_php_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}/php4-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 PHP4 (70_mod_php.conf)"
-					insinto ${APACHE_MODULES_CONFDIR}
-					newins "${FILESDIR}/70_mod_php.conf-apache2" "70_mod_php.conf"
-				fi
-				php4_4-sapi_install_ini
-				;;
-		esac
-	done
-}
-
-pkg_postinst() {
-	# Output some general info to the user
-	if useq apache || useq apache2 ; then
-		APACHE1_MOD_DEFINE="PHP4"
-		APACHE1_MOD_CONF="70_mod_php"
-		APACHE2_MOD_DEFINE="PHP4"
-		if useq concurrentmodphp ; then
-			APACHE2_MOD_CONF="70_mod_php_concurr"
-		else
-			APACHE2_MOD_CONF="70_mod_php"
-		fi
-		apache-module_pkg_postinst
-	fi
-
-	# Update Apache1 to use mod_php
-	if useq apache ; then
-		"${ROOT}/usr/sbin/php-select" -t apache1 php4 > /dev/null 2>&1
-		exitStatus=$?
-		if [[ ${exitStatus} == 2 ]] ; then
-			php-select apache1 php4
-		elif [[ ${exitStatus} == 4 ]] ; then
-			ewarn
-			ewarn "Apache1 is configured to load a different version of PHP."
-			ewarn "To make Apache1 use PHP v4, use php-select:"
-			ewarn
-			ewarn "    php-select apache1 php4"
-			ewarn
-		fi
-	fi
-
-	# Update Apache2 to use mod_php
-	if useq apache2 ; then
-		"${ROOT}/usr/sbin/php-select" -t apache2 php4 > /dev/null 2>&1
-		exitStatus=$?
-		if [[ ${exitStatus} == 2 ]] ; then
-			php-select apache2 php4
-		elif [[ ${exitStatus} == 4 ]] ; then
-			ewarn
-			ewarn "Apache2 is configured to load a different version of PHP."
-			ewarn "To make Apache2 use PHP v4, use php-select:"
-			ewarn
-			ewarn "    php-select apache2 php4"
-			ewarn
-		fi
-	fi
-
-	# Create the symlinks for php-cli
-	if useq cli || phpconfutils_usecheck cli ; then
-		"${ROOT}/usr/sbin/php-select" -t php php4 > /dev/null 2>&1
-		exitStatus=$?
-		if [[ ${exitStatus} == 5 ]] ; then
-			php-select php php4
-		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 v4, use php-select:"
-			ewarn
-			ewarn "    php-select php php4"
-			ewarn
-		fi
-	fi
-
-	# Create the symlinks for php-cgi
-	if useq cgi ; then
-		"${ROOT}/usr/sbin/php-select" -t php-cgi php4 > /dev/null 2>&1
-		exitStatus=$?
-		if [[ ${exitStatus} == 5 ]] ; then
-			php-select php-cgi php4
-		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 v4, use php-select:"
-			ewarn
-			ewarn "    php-select php-cgi php4"
-			ewarn
-		fi
-	fi
-
-	# Create the symlinks for php-devel
-	"${ROOT}/usr/sbin/php-select" -t php-devel php4 > /dev/null 2>&1
-	exitStatus=$?
-	if [[ $exitStatus == 5 ]] ; then
-		php-select php-devel php4
-	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 v4, use"
-		ewarn "php-select:"
-		ewarn
-		ewarn "    php-select php-devel php4"
-		ewarn
-	fi
-
-	php4_4-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
-}
diff --git a/dev-lang/php/php-5.1.6-r2.ebuild b/dev-lang/php/php-5.1.6-r2.ebuild
deleted file mode 100644
index 160f715cc153..000000000000
--- a/dev-lang/php/php-5.1.6-r2.ebuild
+++ /dev/null
@@ -1,512 +0,0 @@
-# Copyright 1999-2006 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-r2.ebuild,v 1.1 2006/08/30 11:17:26 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="1"
-HARDENEDPHP_PATCH="hardening-patch-${MY_PHP_PV}-0.4.14-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_1-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_1-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_1-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_1-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_1-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_1-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_1-sapi_src_compile
-				;;
-			apache2)
-				my_conf="${my_conf} --disable-cli --with-apxs2=/usr/sbin/apxs2"
-				php5_1-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_1-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_1-sapi_install_ini
-				;;
-			cgi)
-				einfo "Installing CGI SAPI"
-				into ${destdir}
-				dobin php-cgi || die "Unable to install ${x} sapi"
-				php5_1-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_1-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_1-sapi_install_ini
-				;;
-		esac
-	done
-}
-
-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_1-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
-}