First beta of php 5.5

Package-Manager: portage-2.1.11.52/cvs/Linux x86_64
Manifest-Sign-Key: 0xC4A92BF5

5 files changed, 842 insertions, 63 deletions

diff --git a/dev-lang/php/ChangeLog b/dev-lang/php/ChangeLog
index c3a74b5eda9f..9475efd8e93a 100644
--- a/dev-lang/php/ChangeLog
+++ b/dev-lang/php/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-lang/php
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/php/ChangeLog,v 1.674 2013/03/15 08:55:15 olemarkus Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/php/ChangeLog,v 1.675 2013/03/21 13:33:45 olemarkus Exp $
+
+*php-5.5.0_beta1 (21 Mar 2013)
+
+  21 Mar 2013; Ole Markus With <olemarkus@gentoo.org> +php-5.5.0_beta1.ebuild,
+  metadata.xml, php-5.5.0_alpha6.ebuild:
+  First beta of php 5.5
 
 *php-5.5.0_alpha6 (15 Mar 2013)
 *php-5.4.13 (15 Mar 2013)
diff --git a/dev-lang/php/Manifest b/dev-lang/php/Manifest
index b670bfd64430..9a403ba9e4dc 100644
--- a/dev-lang/php/Manifest
+++ b/dev-lang/php/Manifest
@@ -32,11 +32,13 @@ DIST php-5.4.8.tar.bz2 11056057 SHA256 d02810b7949938ee7190116e7483e1a06b3fa8373
 DIST php-5.5.0alpha2.tar.bz2 11572909 SHA256 d618f8f570e3d29fff8f581a1e4228e9c0e3e51ecc6a295621863181822d913c SHA512 24dc24998aa8ecd29075f0c7b8f67b732e9b1aa7a36576a0b1536ff479679e8fb8c78681644be42d5ca948b20ec0a58a14c57f30c888a432daf7a0f5ab582e78 WHIRLPOOL e962d168091c65c957fb1df75cd64349a74e9cab7fc66efa2ab514d44b49bd5a7e28152c9c4e189390dfaff0925ab75583cf0c0286aa14397b8dabc1ced75848
 DIST php-5.5.0alpha4.tar.bz2 11998221 SHA256 6e6000343338bda5f759c4745e0326d2495164779d13c86e7eaa43e4e0503837 SHA512 6fe1acdd5e01fb7c1c411a3abc6b2ea2fbaf894c41e3e457aebd2b0047ee9240194fa125f85bb977ddc773fd5c518216f3d40531d5ac05fadea0d0dc2be45288 WHIRLPOOL b5c5931a4cfc10d4be1be70b5042ef860262e1f40d725ceb4ba54613d8a699507cee7768f850cb78eb8ecf055d9a2f7970b30fcf9e12c5781cc89ee5c06cd93a
 DIST php-5.5.0alpha6.tar.bz2 12026187 SHA256 46d233aed0d45d683a7b7f968ba0453de3756040a2594e261301ef6d731ffbb4 SHA512 5e9d871d1b2ae1399ba7f7d62f6815a36631ec56877af697e9d4b393a96f9f8305f4b7070d206917e4b4260d976f21aba24009b6ddc56aef0b343f101e1958be WHIRLPOOL abfe091020c6309decb9df45642adbebfb26cc310ed2098f5811df9d9012cb7c74c5a38d64d9c37c6d5ca27cb5dcd908e8d54df6685da890dfa37eca341f9771
+DIST php-5.5.0beta1.tar.bz2 12126978 SHA256 ae3febb4e44e4d7da68bed83f7f025af69f896e6e04a7913c2ad580241b9c7fa SHA512 b2332d55663c2b645659a8db430c24c9cec4ff82d15ce57d60bcc2009a393010f1204736dcd5f0377073cf829ac20394c1ee9f7dd5ae76e9a35cbae4b1a0eae7 WHIRLPOOL 2333821915da3afda7fb17ba4947bc8011dcc7b9e95af48c3130cb81140c4d33ef2f45af0d126da595c830feb3cf72118f012fae7f1ae80b07f702dbc199cf46
 DIST php-patchset-5.3-r0.tar.bz2 7368 SHA256 1a67b34a681dea33ea38f0ffc32b70a78b4c5dc1c3603d1bba31bb130d803ef7 SHA512 765b0cf56a3e63ded4ad1d1ba67567881ad06bdc2814cc07004fa338f38fd69078819c7463d2c55e00805c8f33fa925b94228bf7bc3d223acc33c6cff540024c WHIRLPOOL 59e18b33e11d968fac2a4571173121bf8141bb2f1eab62192e15bc59e351d3ab973f04343b447681d8a2adddf0844edb8a481d027bfc14c7e1fd8222169094ec
 DIST php-patchset-5.3.18-r0.tar.bz2 7360 SHA256 8e7d449a4ab50dd8da241f2992fdaee012eafe4da6c66609231cff68d84c5c9f SHA512 625f456649964a959c7aa399c6c4fbeff8dd0b45372153819d42b447069e78cce99b4b6c30d89a64b211d230e17ef28e99d5e3b9055dd59e19b8103337de8d09 WHIRLPOOL cb1ae11173fa6d0a0f26a313d036f6f2109bc704531c5db76a584cc243b5f16ccff3c5e0c943196b5f13a7603e222c2f2c0eb393d754faf66fa5d54e5f627fde
 DIST php-patchset-5.4-2.tar.bz2 5824 SHA256 4a47f4d31f50a244f85349486cdb3474cf315562e097ed4c116c2b9b5730ecef SHA512 3c2523458a627373da7acb93fb2cd621f50b19fe2ba1d30beb62eeaaa39045262b917cfd0b631046fec9c8027cfa99bd0426a079ab45eb172b21d25d6e085dde WHIRLPOOL fe4f015e2f0dc66cc23ef16fb5bb33117952593ae0770d4bcd37ecc1c431cbcc7874189d265696305c60b4e395e7ce902667e38203db46867304868271affdea
 DIST php-patchset-5.4-r2.tar.bz2 5824 SHA256 4a47f4d31f50a244f85349486cdb3474cf315562e097ed4c116c2b9b5730ecef SHA512 3c2523458a627373da7acb93fb2cd621f50b19fe2ba1d30beb62eeaaa39045262b917cfd0b631046fec9c8027cfa99bd0426a079ab45eb172b21d25d6e085dde WHIRLPOOL fe4f015e2f0dc66cc23ef16fb5bb33117952593ae0770d4bcd37ecc1c431cbcc7874189d265696305c60b4e395e7ce902667e38203db46867304868271affdea
-DIST php-patchset-5.5-r0.tar.bz2 7407 SHA256 8e7f36c6d625b5d66bc9e61ad20abbea0b58470cfac5605704c281947f9d52fd SHA512 8bac862f53a1ba21d5acc3cbe68d11b55cb75eed841e840a49ab5769cbc1595f2f487c9fabb3c1183916b2911ecefe710625aca83382f4871593cac8cbc5301a WHIRLPOOL 9d0b0a4603d46edcd5bbc98a89eb36ed5310e56f97960e1fe4283258c4d3ac2d15b93c2287e351ae2359bf661f2d131d4176e92e7d078582b4bfa1af37a40c81
+DIST php-patchset-5.5-r0.tar.bz2 916 SHA256 a7543e530c2a1ceea4377560781c14012e9d0977235b324316221779bf34dc31 SHA512 9c3ae69ff17e8822e8dd75f5eb312448c89005ca3882d8fa9f948a88a05edb5ade481001e2c462f15ae73d54c8c1c3b0bc7e0f97ba379bcab1830e0c363ee374 WHIRLPOOL 98a2aa8cef8d41e9e01296e9c7cd864583092dbeb4de9868b6a4380dc02829b7c592fbee28e3e6aa5dd516fdfd865fdb229f33fe90ecbcd8cf6126f8b32062d2
+DIST php-patchset-5.5-r1.tar.bz2 916 SHA256 a7543e530c2a1ceea4377560781c14012e9d0977235b324316221779bf34dc31 SHA512 9c3ae69ff17e8822e8dd75f5eb312448c89005ca3882d8fa9f948a88a05edb5ade481001e2c462f15ae73d54c8c1c3b0bc7e0f97ba379bcab1830e0c363ee374 WHIRLPOOL 98a2aa8cef8d41e9e01296e9c7cd864583092dbeb4de9868b6a4380dc02829b7c592fbee28e3e6aa5dd516fdfd865fdb229f33fe90ecbcd8cf6126f8b32062d2
 EBUILD php-5.3.18.ebuild 24974 SHA256 f9f67cd8599e7ab0bd6d229f92bdeb24ae2346081f1447874d8cbc2b60c3cf1e SHA512 3a4bae3c7e3e20a88f84cdcb19ed237671c9b0f1d0e15e00f299191942bd4a9b695d215a107dda2aa5944c67189d501b4eb8a84077ef06a613b3fe6ca3e159bc WHIRLPOOL 73c81f5c655f47b4f41eb93799e7a4d434201887764a36cd502d7cf7cd0364a7a6d77582c47aa109349120b945c8525925e713dc5a68620f81cad5c3e0c02815
 EBUILD php-5.3.20.ebuild 24728 SHA256 92e5d1da715bbce9c15b030729de28f2c233fa8ead2925ea9f75fd90f7b91d83 SHA512 e37b45d64cc493e92495c276bdd4f003257d6caac6af11753351f4b3ca0d68676468eff52d1cb5f23c1c53d48f16050cebadded3abb38d642efa6ada2225af2d WHIRLPOOL 189f0965fa058f12b5e0a8f22c3d28dbc2a526ec02d9ef3acdc6517f812f7228ef10a8d00ca49fa1e64ced0761418bc9fa34e968d6a3b543bb1cafd54a887054
 EBUILD php-5.3.21-r1.ebuild 24733 SHA256 6f37a5f5adbb2a76438983ac780e4fd20469a816921d5caf6010e8906781a581 SHA512 d17a50af9ab58603156b32ed3a270952dfddc14d4c61706556e457b5bb30b5fc29f5e8d50faa85e04304ace3e70bab6f6ca5d7182fe0954c173fd733bb32f83c WHIRLPOOL 09b275574301400f69d530d33230693177818a66ec07df76936c9ca0f1716216060c11b0a7e401e7ea3672fad985f57dc667aad67d2aa2db7bb9885b2452f142
@@ -51,20 +53,21 @@ EBUILD php-5.4.13.ebuild 23971 SHA256 6303f84d99604d5ca1389a0810d2a724104174b08a
 EBUILD php-5.4.8.ebuild 24439 SHA256 aa479fbd46229b6a59941b2e412db808f99946f42e618c782d02b705ec3c389f SHA512 62c30f24f869f38ec8231fef2c1191bc52a463568423c001c454b0e0d3f00732b62d58180d1ef5401d5c88a38e4bda4ff288df7f4f1f8cac1f37e614554870e3 WHIRLPOOL 4032c32caa2d7c8928ff7f66646363a29145fee4ccfe1b096e48317dde450003a779fc06f06cabdb74a46ea2b909f429c2a54ddfd4d8ef0b6826faa63366868b
 EBUILD php-5.5.0_alpha2.ebuild 24482 SHA256 9a4f4cc23469f468d00ac9b9fde0330306033e37695d440b2f5b5070985cff80 SHA512 d050f44deb52664145fc3f5f69bbba9b7dec5aae4478e2762abe5ab433967320634add91ae0b5e3dfdfe9bfbf4e7caeaaab248b4a07b2421df5883c27b7209f0 WHIRLPOOL b85b6eca8ded318c48e218409ec632f8295070947eaf1bf4c8207560b5b5bdbf16c418b95bef42b1f1f1da2d138c114276579f436be57cda4917232a977d450e
 EBUILD php-5.5.0_alpha4.ebuild 24484 SHA256 731d51c274d60b0dbbc9b2686bcabd753b3cca6a2ac02ce256c4342f5d773872 SHA512 6ea9b48ee5e27b5a0d54093a926b5ab26bd08d99bb008dd131803bab672156be6452e2f7b9003b4e4811d5e261df8c53237fc493af67ae420efee6f0b6990ac8 WHIRLPOOL 03ebbefc808a81385bce34a4cc7e78e42d2a87aab58af3ace5b21c9e094eec129544e1cab52bc800831bb31cf55769672681562c40eb449c57b5a1321784a2d3
-EBUILD php-5.5.0_alpha6.ebuild 24284 SHA256 126476867586c6e333073cf7c5b1c2c87e61ce570dbd42e3ee48321f646ec493 SHA512 f4cb6b15bfdae7b7cc8a3dbb69429b17c3825b9490e363358143744741230355fd06347fe223d400ae874e22e412e41224f30c33828d56ddc75cce3778090e48 WHIRLPOOL 3f8fe156185a77ac7eb334cb874e470dbdca8f1bae539908281da5f73881b3bee9c51e5791bb0320167969e526d32e8c3a75c5ad2fe07f17869ed25c19404aff
-MISC ChangeLog 2052 SHA256 de1a319d45c56018a10d22bbac79fff3de2bae5513ab450da3842de1a6e44219 SHA512 79ad43b31675d72aff8c5c37fe7670b8bab4b43d38b8c550afc9c1591c586cad4fb0b5b0af34f3455a17cab9d0f007ab4707ab915414736abdc8df29e781c2e7 WHIRLPOOL 5b1a0e602568db8dbec636b84f6aad7a42aeb95d3323743156146406bf0858941514a22156632156f1074633754503de7526a7b56e44d28b196d0379bbaec313
+EBUILD php-5.5.0_alpha6.ebuild 22896 SHA256 12691d70767e181f6713cae2ea1d01069ee639fa60e44629f05fe20eec17b21d SHA512 8cbbd99f6bf0cd66f0c2900cd7931375b6cb1ed5bfb957447d658299a17238e6cf5dd495a501dcdbdc6cddce2efaa0d304eec967499797eb44a1add58bbf6fd5 WHIRLPOOL 7067bd629feb7cfdc3f935da4bf2e1339593b1e31a912ff8514d64ec193a1537549540ab0aba37f58b173946c0282450563ab2901e19d9dc3066d86bacba71ba
+EBUILD php-5.5.0_beta1.ebuild 22966 SHA256 2a2478a40b970e50b9469e33b57e625e3bbdc2eb08212b2d807d5c884db094c2 SHA512 eb39824c353c310a23ea91739525fed46ff4c1f6838716ccc34e03e68efecd276eb5b919c516cc67826701ab1ed718e77f64a9bd7e1e906f928a81b60676d26e WHIRLPOOL ea4d0e4a75f4894f0d5e6c04749c82fa637a335d3606ed06fa9629b7e48a1300e13073c41ae5b9725f81855ad5d2ffa9b6c11abd85614b0ecf8b8453abc876b6
+MISC ChangeLog 2229 SHA256 f2eee494259c43d3af78ce625b6474f3b6795e750d89cc2d67c50d272a3272af SHA512 f626d7ae3da5c3b4d371c42f9c6ca4a05919ca0288cf8e31c63509e4d96bf40ce0f08dfbccac03fe32fd81d47e2ad247e10c44010ef4a82c1592351e9e799c38 WHIRLPOOL 369fb5659096ed17fc1cb8bc0d847cd23b86b4690caa1b709558b7c4ae0372a572c9b0a69b9b46a1e850ec0fef53cb5ea563060a03c54c25439a35db3c47b619
 MISC ChangeLog-2012 108488 SHA256 c2eea36502d34eadc7995d546f78aaa553ba07beeb51ea738715ad7f2e51b08d SHA512 eb25224993eff1ea42ea133302991a3ffad3adda0bc524cfa4fae49574230a8e65b35b08750d780c11cc9c152435fadbf2c416241fac28dcbb025e060e96cd7a WHIRLPOOL 82f627853fa961f3f3707fb2c8757acbc8fc644e89121d78703b40ff0f668aa7d0f1aa26c77f8f503e4f6da22ed865e4cb7c02d5d112c89488b12aa6b0d80568
-MISC metadata.xml 1628 SHA256 e828635c903aec3fdb71705b49a1f95da4bdb6b7109a032fbf2a92960b6814b5 SHA512 c2559714ff99860cd9e1c0381632fc7920866722ee0f1dbae9ea4b167b8e0e08ab1ac33662d9bdbcf47117bb7e78c21adeddf49839c64b9aa20403688db2ac40 WHIRLPOOL 3dcd68f57cc2c72535940cf87ac124de2227bfdf8696bbd28c39233bede8335da55080d51711be0d7d2b71e5a32c41c40b32bc68e50bb8ca25eedf1599d5cc77
+MISC metadata.xml 1714 SHA256 49f68143adccf975df6aa88986dc8d069e4f94f9c39535306d6349af958438dd SHA512 d005f5abc21fd833fa824072af98704e7813465f204d279e53390d171f3996b7c0f60b8210092583e1b6ea5a66b78a65188e0c31d7103b579bba3ccea2bd04fd WHIRLPOOL 63343bde5cfc6f447f77807c3a330d711fcbb618f6eeb2c171bda4e762ab96082be6a19e585d42280ac1359a08a8d22a40ececde9ef40e44c9fc075ab7fa1a08
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iQF8BAEBCABmBQJRQuH5XxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+iQF8BAEBCABmBQJRSww9XxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
 ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQyOEZEMjNGNzBENkE5N0Q2Q0ZFMkFDNDA2
-QkFCNEFFNUM0QTkyQkY1AAoJEGurSuXEqSv1XWAH/0rkh5bIqUZt+fvcL+TrEsPS
-3Oa31rPU5rE3WtRuBcvC5+9Gmlu2eKOyYVozq6RQYHH348KGpq0IQGZcJMZeFcfe
-pdPpOrLRGY6H0Mdt2tUC3Ec/k0B8vyvqQOm9FRa8VBkahKU4nwTx8W+ZpOHX86/s
-8LflSjWgyBY/t3fMZ1cpeZpILCLJeVYA1ZHGa1cqpXpVHftFh895WAXTQ7oPMkpq
-578emKO4YnECTmJ32my65lEY5hYRJri96QiQ6MryPOXHiHyCpOi/XQyH9IcYIfI4
-scmt8Hj898wT37mG999agJptPQvOsJ5DpkHpqE8y1nLFU0bhcf80J1ySF3WeMCM=
-=3OLY
+QkFCNEFFNUM0QTkyQkY1AAoJEGurSuXEqSv1J30H/3ujXuMYR6DY10egj/XC6/wU
+eemIUPErAYfRxMYnuUFzLRDLDqBK/DelW/RW6ORmLfVcAe/yEjxglUW1XZNFQATw
+oCV1gdozLKnuYhLbztGwCKpZRRfVrBfApSC5Iyl50XVuq44ub99YNbX1HT9ndwZP
+GzKZmVLsUo81oFDZlOLg9QUEu87bTy8Q87AMhQKXI4MvMzf8MOiPu/3GlifOxLmy
++LtqdwbY3xGUNLWVley17J4dc82gl6iARPuzRDqFxdDHxV5cb0mSK7JfJJmw9AFA
+9mNtPb4kzIdF8QGCHzd+9Jcfm5Lc7sl2Y7g5lnEo/23wpyGYufsezj94RzNU9go=
+=3bSe
 -----END PGP SIGNATURE-----
diff --git a/dev-lang/php/metadata.xml b/dev-lang/php/metadata.xml
index 06fabeb12ffd..1dd81184f696 100644
--- a/dev-lang/php/metadata.xml
+++ b/dev-lang/php/metadata.xml
@@ -15,6 +15,7 @@
 		<flag name='ldap-sasl'>Add SASL support for the PHP LDAP extension</flag>
 		<flag name='mysqlnd'>Use native driver for mysql, mysqli, PDO_Mysql</flag>
 		<flag name='intl'>Enables the intl extension for extended internalization support</flag>
+		<flag name='opcache'>Enables built-in opcode cache, replacing pecl-apc et.al</flag>
 		<flag name='pic'>Force shared modules to build as PIC on x86 (speed tradeoff with memory usage)</flag>
 		<flag name='pdo'>Enable the bundled PDO extensions</flag>
 		<flag name='phar'>Enables the phar extension to provide phar archive support</flag>
diff --git a/dev-lang/php/php-5.5.0_alpha6.ebuild b/dev-lang/php/php-5.5.0_alpha6.ebuild
index e73fe70f1589..8e13e956dac0 100644
--- a/dev-lang/php/php-5.5.0_alpha6.ebuild
+++ b/dev-lang/php/php-5.5.0_alpha6.ebuild
@@ -1,12 +1,11 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/php/php-5.5.0_alpha6.ebuild,v 1.1 2013/03/15 08:55:15 olemarkus Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/php/php-5.5.0_alpha6.ebuild,v 1.2 2013/03/21 13:33:45 olemarkus Exp $
 
 EAPI=5
 
 inherit eutils autotools flag-o-matic versionator depend.apache apache-module db-use libtool
 
-SUHOSIN_VERSION=""
 FPM_VERSION="builtin"
 EXPECTED_TEST_FAILURES=""
 
@@ -21,9 +20,6 @@ function php_get_uri ()
 		"php")
 			echo "http://www.php.net/distributions/${2}"
 		;;
-		"suhosin")
-			echo "http://download.suhosin.org/${2}"
-		;;
 		"olemarkus")
 			echo "http://dev.gentoo.org/~olemarkus/php/${2}"
 		;;
@@ -60,28 +56,10 @@ PHP_PATCHSET_URI="
 PHP_FPM_INIT_VER="4"
 PHP_FPM_CONF_VER="1"
 
-if [[ ${SUHOSIN_VERSION} == *-gentoo ]]; then
-	# in some cases we use our own suhosin patch (very recent version,
-	# patch conflicts, etc.)
-	SUHOSIN_TYPE="olemarkus"
-else
-	SUHOSIN_TYPE="suhosin"
-fi
-
-if [[ -n ${SUHOSIN_VERSION} ]]; then
-	SUHOSIN_PATCH="suhosin-patch-${SUHOSIN_VERSION}.patch";
-	SUHOSIN_URI="$(php_get_uri ${SUHOSIN_TYPE} ${SUHOSIN_PATCH}.gz )"
-fi
-
 SRC_URI="
 	${PHP_SRC_URI}
 	${PHP_PATCHSET_URI}"
 
-if [[ -n ${SUHOSIN_VERSION} ]]; then
-	SRC_URI="${SRC_URI}
-		suhosin? ( ${SUHOSIN_URI} )"
-fi
-
 DESCRIPTION="The PHP language runtime engine: CLI, CGI, FPM/FastCGI, Apache2 and embed SAPIs."
 HOMEPAGE="http://php.net/"
 LICENSE="PHP-3"
@@ -108,9 +86,6 @@ IUSE="${IUSE} bcmath berkdb bzip2 calendar cdb cjk
 	sybase-ct sysvipc tidy +tokenizer truetype unicode wddx
 	+xml xmlreader xmlwriter xmlrpc xpm xsl zip zlib"
 
-# Enable suhosin if available
-[[ -n $SUHOSIN_VERSION ]] && IUSE="${IUSE} suhosin"
-
 DEPEND="
 	>=app-admin/eselect-php-0.6.2
 	>=dev-libs/libpcre-8.32[unicode]
@@ -220,9 +195,6 @@ REQUIRED_USE="
 
 RDEPEND="${DEPEND}"
 
-[[ -n $SUHOSIN_VERSION ]] && RDEPEND="${RDEPEND} suhosin? (
-=${CATEGORY}/${PN}-${SLOT}*[unicode] )"
-
 RDEPEND="${RDEPEND} fpm? ( selinux? ( sec-policy/selinux-phpfpm ) )"
 
 DEPEND="${DEPEND}
@@ -233,10 +205,6 @@ DEPEND="${DEPEND}
 # They are in PDEPEND because we need PHP installed first!
 PDEPEND="doc? ( app-doc/php-docs )"
 
-# No longer depend on the extension. The suhosin USE flag only installs the
-# patch
-#[[ -n $SUHOSIN_VERSION ]] && PDEPEND="${PDEPEND} suhosin? ( dev-php${PHP_MV}/suhosin )"
-
 # Allow users to install production version if they want to
 
 case "${PHP_INI_VERSION}" in
@@ -369,15 +337,6 @@ src_prepare() {
 			|| die "Failed to fix heimdal crypt library reference"
 	fi
 
-	# Suhosin support
-	if [[ -n $SUHOSIN_VERSION ]] ; then
-		if use suhosin ; then
-			epatch "${WORKDIR}/${SUHOSIN_PATCH}"
-		fi
-	else
-		ewarn "Please note that this version of PHP does not yet come with a suhosin patch"
-	fi
-
 	#Add user patches #357637
 	epatch_user
 
@@ -842,14 +801,6 @@ pkg_postinst() {
 	elog "For more details on how minor version slotting works (PHP_TARGETS) please read the upgrade guide:"
 	elog "http://www.gentoo.org/proj/en/php/php-upgrading.xml"
 	elog
-
-	if ( [[ -z SUHOSIN_VERSION ]] && use suhosin && version_is_at_least 5.3.6_rc1 ) ; then
-		ewarn
-		ewarn "The suhosin USE flag now only installs the suhosin patch!"
-		ewarn "If you want the suhosin extension, make sure you install"
-		ewarn " dev-php/suhosin"
-		ewarn
-	fi
 }
 
 pkg_prerm() {
diff --git a/dev-lang/php/php-5.5.0_beta1.ebuild b/dev-lang/php/php-5.5.0_beta1.ebuild
new file mode 100644
index 000000000000..d853c576a716
--- /dev/null
+++ b/dev-lang/php/php-5.5.0_beta1.ebuild
@@ -0,0 +1,818 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/php/php-5.5.0_beta1.ebuild,v 1.1 2013/03/21 13:33:45 olemarkus Exp $
+
+EAPI=5
+
+inherit eutils autotools flag-o-matic versionator depend.apache apache-module db-use libtool
+
+EXPECTED_TEST_FAILURES=""
+
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-freebsd ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+
+function php_get_uri ()
+{
+	case "${1}" in
+		"php-pre")
+			echo "http://downloads.php.net/dsp/${2}"
+		;;
+		"php")
+			echo "http://www.php.net/distributions/${2}"
+		;;
+		"olemarkus")
+			echo "http://dev.gentoo.org/~olemarkus/php/${2}"
+		;;
+		"gentoo")
+			echo "mirror://gentoo/${2}"
+		;;
+		*)
+			die "unhandled case in php_get_uri"
+		;;
+	esac
+}
+
+PHP_MV="$(get_major_version)"
+SLOT="$(get_version_component_range 1-2)"
+
+# alias, so we can handle different types of releases (finals, rcs, alphas,
+# betas, ...) w/o changing the whole ebuild
+PHP_PV="${PV/_rc/RC}"
+PHP_PV="${PHP_PV/_alpha/alpha}"
+PHP_PV="${PHP_PV/_beta/beta}"
+PHP_RELEASE="php"
+[[ ${PV} == ${PV/_alpha/} ]] || PHP_RELEASE="php-pre"
+[[ ${PV} == ${PV/_beta/} ]] || PHP_RELEASE="php-pre"
+[[ ${PV} == ${PV/_rc/} ]] || PHP_RELEASE="php-pre"
+PHP_P="${PN}-${PHP_PV}"
+
+PHP_PATCHSET_LOC="olemarkus"
+
+PHP_SRC_URI="$(php_get_uri "${PHP_RELEASE}" "${PHP_P}.tar.bz2")"
+
+PHP_PATCHSET="1"
+PHP_PATCHSET_URI="
+	$(php_get_uri "${PHP_PATCHSET_LOC}" "php-patchset-${SLOT}-r${PHP_PATCHSET}.tar.bz2")"
+
+PHP_FPM_INIT_VER="4"
+PHP_FPM_CONF_VER="1"
+
+SRC_URI="
+	${PHP_SRC_URI}
+	${PHP_PATCHSET_URI}"
+
+DESCRIPTION="The PHP language runtime engine: CLI, CGI, FPM/FastCGI, Apache2 and embed SAPIs."
+HOMEPAGE="http://php.net/"
+LICENSE="PHP-3"
+
+S="${WORKDIR}/${PHP_P}"
+
+# We can build the following SAPIs in the given order
+SAPIS="embed cli cgi fpm apache2"
+
+# SAPIs and SAPI-specific USE flags (cli SAPI is default on):
+IUSE="${IUSE}
+	${SAPIS/cli/+cli}
+	threads"
+
+IUSE="${IUSE} bcmath berkdb bzip2 calendar cdb cjk
+	crypt +ctype curl curlwrappers debug doc
+	enchant exif frontbase +fileinfo +filter firebird
+	flatfile ftp gd gdbm gmp +hash +iconv imap inifile
+	intl iodbc ipv6 +json kerberos ldap ldap-sasl libedit mhash
+	mssql mysql mysqlnd mysqli nls
+	oci8-instant-client odbc opcache pcntl pdo +phar +posix postgres qdbm
+	readline recode selinux +session sharedmem
+	+simplexml snmp soap sockets spell sqlite ssl
+	sybase-ct sysvipc tidy +tokenizer truetype unicode wddx
+	+xml xmlreader xmlwriter xmlrpc xpm xsl zip zlib"
+
+DEPEND="
+	>=app-admin/eselect-php-0.6.2
+	>=dev-libs/libpcre-8.32[unicode]
+	apache2? ( www-servers/apache[threads=] )
+	berkdb? ( =sys-libs/db-4* )
+	bzip2? ( app-arch/bzip2 )
+	cdb? ( || ( dev-db/cdb dev-db/tinycdb ) )
+	cjk? ( !gd? (
+		virtual/jpeg
+		media-libs/libpng
+		sys-libs/zlib
+	) )
+	crypt? ( >=dev-libs/libmcrypt-2.4 )
+	curl? ( >=net-misc/curl-7.10.5 )
+	enchant? ( app-text/enchant )
+	exif? ( !gd? (
+		virtual/jpeg
+		media-libs/libpng
+		sys-libs/zlib
+	) )
+	firebird? ( dev-db/firebird )
+	gd? ( virtual/jpeg media-libs/libpng sys-libs/zlib )
+	gdbm? ( >=sys-libs/gdbm-1.8.0 )
+	gmp? ( >=dev-libs/gmp-4.1.2 )
+	iconv? ( virtual/libiconv )
+	imap? ( virtual/imap-c-client[ssl=] )
+	intl? ( dev-libs/icu:= )
+	iodbc? ( dev-db/libiodbc )
+	kerberos? ( virtual/krb5 )
+	ldap? ( >=net-nds/openldap-1.2.11 )
+	ldap-sasl? ( dev-libs/cyrus-sasl >=net-nds/openldap-1.2.11 )
+	libedit? ( || ( sys-freebsd/freebsd-lib dev-libs/libedit ) )
+	mssql? ( dev-db/freetds[mssql] )
+	!mysqlnd? (
+		mysql? ( virtual/mysql )
+		mysqli? ( >=virtual/mysql-4.1 )
+	)
+	nls? ( sys-devel/gettext )
+	oci8-instant-client? ( dev-db/oracle-instantclient-basic )
+	odbc? ( >=dev-db/unixODBC-1.8.13 )
+	postgres? ( dev-db/postgresql-base )
+	qdbm? ( dev-db/qdbm )
+	readline? ( sys-libs/readline )
+	recode? ( app-text/recode )
+	sharedmem? ( dev-libs/mm )
+	simplexml? ( >=dev-libs/libxml2-2.6.8 )
+	snmp? ( >=net-analyzer/net-snmp-5.2 )
+	soap? ( >=dev-libs/libxml2-2.6.8 )
+	spell? ( >=app-text/aspell-0.50 )
+	sqlite? ( >=dev-db/sqlite-3.7.6.3 )
+	ssl? ( >=dev-libs/openssl-0.9.7 )
+	sybase-ct? ( dev-db/freetds )
+	tidy? ( app-text/htmltidy )
+	truetype? (
+		=media-libs/freetype-2*
+		>=media-libs/t1lib-5.0.0
+		!gd? (
+			virtual/jpeg media-libs/libpng sys-libs/zlib )
+	)
+	unicode? ( dev-libs/oniguruma )
+	wddx? ( >=dev-libs/libxml2-2.6.8 )
+	xml? ( >=dev-libs/libxml2-2.6.8 )
+	xmlrpc? ( >=dev-libs/libxml2-2.6.8 virtual/libiconv )
+	xmlreader? ( >=dev-libs/libxml2-2.6.8 )
+	xmlwriter? ( >=dev-libs/libxml2-2.6.8 )
+	xpm? (
+		x11-libs/libXpm
+		virtual/jpeg
+		media-libs/libpng sys-libs/zlib
+	)
+	xsl? ( dev-libs/libxslt >=dev-libs/libxml2-2.6.8 )
+	zip? ( sys-libs/zlib )
+	zlib? ( sys-libs/zlib )
+	virtual/mta
+"
+
+php="=${CATEGORY}/${PF}"
+
+REQUIRED_USE="
+	truetype? ( gd )
+	cjk? ( gd )
+	exif? ( gd )
+
+	xpm? ( gd )
+	gd? ( zlib )
+	simplexml? ( xml )
+	soap? ( xml )
+	wddx? ( xml )
+	xmlrpc? ( || ( xml iconv ) )
+	xmlreader? ( xml )
+	xsl? ( xml )
+	ldap-sasl? ( ldap )
+	mhash? ( hash )
+	phar? ( hash )
+	mysqlnd? ( || (
+		mysql
+		mysqli
+		pdo
+	) )
+
+	qdbm? ( !gdbm )
+	readline? ( !libedit )
+	recode? ( !imap !mysql !mysqli )
+	sharedmem? ( !threads )
+
+	!cli? ( !cgi? ( !fpm? ( !apache2? ( !embed? ( cli ) ) ) ) )"
+
+RDEPEND="${DEPEND}"
+
+RDEPEND="${RDEPEND} fpm? ( selinux? ( sec-policy/selinux-phpfpm ) )"
+
+DEPEND="${DEPEND}
+	sys-devel/flex
+	>=sys-devel/m4-1.4.3
+	>=sys-devel/libtool-1.5.18"
+
+# They are in PDEPEND because we need PHP installed first!
+PDEPEND="doc? ( app-doc/php-docs )"
+
+# Allow users to install production version if they want to
+
+case "${PHP_INI_VERSION}" in
+	production|development)
+		;;
+	*)
+		PHP_INI_VERSION="development"
+		;;
+esac
+
+PHP_INI_UPSTREAM="php.ini-${PHP_INI_VERSION}"
+PHP_INI_FILE="php.ini"
+
+want_apache
+
+pkg_setup() {
+	depend.apache_pkg_setup
+}
+
+php_install_ini() {
+	local phpsapi="${1}"
+
+	# work out where we are installing the ini file
+	php_set_ini_dir "${phpsapi}"
+
+	local phpinisrc="${PHP_INI_UPSTREAM}-${phpsapi}"
+	cp "${PHP_INI_UPSTREAM}" "${phpinisrc}"
+
+	# default to /tmp for save_path, bug #282768
+	sed -e 's|^;session.save_path .*$|session.save_path = "'"${EPREFIX}"'/tmp"|g' -i "${phpinisrc}"
+
+	# Set the extension dir
+	sed -e "s|^extension_dir .*$|extension_dir = ${extension_dir}|g" -i "${phpinisrc}"
+
+	# Set the include path to point to where we want to find PEAR packages
+	sed -e 's|^;include_path = ".:/php/includes".*|include_path = ".:'"${EPREFIX}"'/usr/share/php'${PHP_MV}':'"${EPREFIX}"'/usr/share/php"|' -i "${phpinisrc}"
+
+	dodir "${PHP_INI_DIR#${EPREFIX}}"
+	insinto "${PHP_INI_DIR#${EPREFIX}}"
+	newins "${phpinisrc}" "${PHP_INI_FILE}"
+
+	elog "Installing php.ini for ${phpsapi} into ${PHP_INI_DIR#${EPREFIX}}"
+	elog
+
+	dodir "${PHP_EXT_INI_DIR#${EPREFIX}}"
+	dodir "${PHP_EXT_INI_DIR_ACTIVE#${EPREFIX}}"
+
+	# SAPI-specific handling
+	if [[ "${sapi}" == "apache2" ]] ; then
+		insinto "${APACHE_MODULES_CONFDIR#${EPREFIX}}"
+		newins "${FILESDIR}/70_mod_php${PHP_MV}.conf-apache2" \
+			"70_mod_php${PHP_MV}.conf"
+	fi
+
+	if [[ "${sapi}" == "fpm" ]] ; then
+        [[ -z ${PHP_FPM_INIT_VER} ]] && PHP_FPM_INIT_VER=3
+        [[ -z ${PHP_FPM_CONF_VER} ]] && PHP_FPM_CONF_VER=0
+		einfo "Installing FPM CGI config file php-fpm.conf"
+		insinto "${PHP_INI_DIR#${EPREFIX}}"
+		newins "${FILESDIR}/php-fpm-r${PHP_FPM_CONF_VER}.conf" php-fpm.conf
+		dodir "/etc/init.d"
+		insinto "/etc/init.d"
+		newinitd "${FILESDIR}/php-fpm-r${PHP_FPM_INIT_VER}.init" "php-fpm"
+		# dosym "${PHP_DESTDIR#${EPREFIX}}/bin/php-fpm" "/usr/bin/php-fpm"
+
+		# Remove bogus /etc/php-fpm.conf.default (bug 359906)
+		[[ -f "${ED}/etc/php-fpm.conf.default" ]] && rm "${ED}/etc/php-fpm.conf.default"
+	fi
+
+  # Install PHP ini files into /usr/share/php
+	if [[ ${SLOT} == '5.2' ]]; then
+		newdoc php.ini-dist php.ini-development
+		newdoc php.ini-recommended php.ini-production
+	fi
+
+	if [[ ${SLOT} == '5.3' ]]; then
+		dodoc php.ini-development
+		dodoc php.ini-production
+	fi
+
+	if [[ ${SLOT} == '5.4' ]]; then
+		dodoc php.ini-development
+		dodoc php.ini-production
+	fi
+
+}
+
+php_set_ini_dir() {
+        PHP_INI_DIR="${EPREFIX}/etc/php/${1}-php${SLOT}"
+        PHP_EXT_INI_DIR="${PHP_INI_DIR}/ext"
+        PHP_EXT_INI_DIR_ACTIVE="${PHP_INI_DIR}/ext-active"
+}
+
+src_prepare() {
+	# USE=sharedmem (session/mod_mm to be exact) tries to mmap() this path
+	# ([empty session.save_path]/session_mm_[sapi][gid].sem)
+	# there is no easy way to circumvent that, all php calls during
+	# install use -n, so no php.ini file will be used.
+	# As such, this is the easiest way to get around
+	addpredict /session_mm_cli250.sem
+	addpredict /session_mm_cli0.sem
+
+	# Change PHP branding
+	# Get the alpha/beta/rc version
+	local ver=$(get_version_component_range 3)
+	sed -re	"s|^(PHP_EXTRA_VERSION=\").*(\")|\1-pl${PR/r/}-gentoo\2|g" \
+		-i configure.in || die "Unable to change PHP branding"
+
+	# Apply generic PHP patches
+		EPATCH_SOURCE="${WORKDIR}/patches/generic" EPATCH_SUFFIX="patch" \
+		EPATCH_FORCE="yes" \
+		EPATCH_MULTI_MSG="Applying generic patches and fixes from upstream..." epatch
+
+	# Patch PHP to show Gentoo as the server platform
+	sed -e 's/PHP_UNAME=`uname -a | xargs`/PHP_UNAME=`uname -s -n -r -v | xargs`/g' \
+		-i configure.in || die "Failed to fix server platform name"
+
+	# Prevent PHP from activating the Apache config,
+	# as we will do that ourselves
+	sed -i \
+		-e "s,-i -a -n php${PHP_MV},-i -n php${PHP_MV},g" \
+		-e "s,-i -A -n php${PHP_MV},-i -n php${PHP_MV},g" \
+	configure sapi/apache2filter/config.m4 sapi/apache2handler/config.m4
+
+	# Patch PHP to support heimdal instead of mit-krb5
+	if has_version "app-crypt/heimdal" ; then
+		sed -e 's|gssapi_krb5|gssapi|g' -i acinclude.m4 \
+			|| die "Failed to fix heimdal libname"
+		sed -e 's|PHP_ADD_LIBRARY(k5crypto, 1, $1)||g' -i acinclude.m4 \
+			|| die "Failed to fix heimdal crypt library reference"
+	fi
+
+	#Add user patches #357637
+	epatch_user
+
+	#force rebuilding aclocal.m4
+	rm aclocal.m4
+	eautoreconf
+
+	if [[ ${CHOST} == *-darwin* ]] ; then
+		# http://bugs.php.net/bug.php?id=48795, bug #343481
+		sed -i -e '/BUILD_CGI="\\$(CC)/s/CC/CXX/' configure || die
+	fi
+}
+
+src_configure() {
+	addpredict /usr/share/snmp/mibs/.index
+	addpredict /var/lib/net-snmp/mib_indexes
+
+	PHP_DESTDIR="${EPREFIX}/usr/$(get_libdir)/php${SLOT}"
+
+	# This is a global variable and should be in caps. It isn't because the
+	# phpconfutils eclass relies on exactly this name...
+	# for --with-libdir see bug #327025
+	my_conf="
+		--prefix="${PHP_DESTDIR}"
+		--mandir="${PHP_DESTDIR}"/man
+		--infodir="${PHP_DESTDIR}"/info
+		--libdir="${PHP_DESTDIR}"/lib
+		--with-libdir=$(get_libdir)
+		--without-pear
+		$(use_enable threads maintainer-zts)"
+
+	#                             extension	      USE flag        shared
+	my_conf+="
+	$(use_enable bcmath bcmath )
+	$(use_with bzip2 bz2 "${EPREFIX}"/usr)
+	$(use_enable calendar calendar )
+	$(use_enable ctype ctype )
+	$(use_with curl curl "${EPREFIX}"/usr)
+	$(use_with curlwrappers curlwrappers "${EPREFIX}"/usr)
+	$(use_enable xml dom )
+	$(use_with enchant enchant "${EPREFIX}"/usr)
+	$(use_enable exif exif )
+	$(use_enable fileinfo fileinfo )
+	$(use_enable filter filter )
+	$(use_enable ftp ftp )
+	$(use_with nls gettext "${EPREFIX}"/usr)
+	$(use_with gmp gmp "${EPREFIX}"/usr)
+	$(use_enable hash hash )
+	$(use_with mhash mhash "${EPREFIX}"/usr)
+	$(use_with iconv iconv )
+	$(use_enable intl intl )
+	$(use_enable ipv6 ipv6 )
+	$(use_enable json json )
+	$(use_with kerberos kerberos "${EPREFIX}"/usr)
+	$(use_enable xml libxml )
+	$(use_with xml libxml-dir "${EPREFIX}"/usr)
+	$(use_enable unicode mbstring )
+	$(use_with crypt mcrypt "${EPREFIX}"/usr)
+	$(use_with mssql mssql "${EPREFIX}"/usr)
+	$(use_with unicode onig "${EPREFIX}"/usr)
+	$(use_with ssl openssl "${EPREFIX}"/usr)
+	$(use_with ssl openssl-dir "${EPREFIX}"/usr)
+	$(use_enable pcntl pcntl )
+	$(use_enable phar phar )
+	$(use_enable pdo pdo )
+	$(use_enable opcache opcache )
+	$(use_with postgres pgsql "${EPREFIX}"/usr)
+	$(use_enable posix posix )
+	$(use_with spell pspell "${EPREFIX}"/usr)
+	$(use_with recode recode "${EPREFIX}"/usr)
+	$(use_enable simplexml simplexml )
+	$(use_enable sharedmem shmop )
+	$(use_with snmp snmp "${EPREFIX}"/usr)
+	$(use_enable soap soap )
+	$(use_enable sockets sockets )
+	$(use_with sqlite sqlite3 "${EPREFIX}"/usr)
+	$(use_with sybase-ct sybase-ct "${EPREFIX}"/usr)
+	$(use_enable sysvipc sysvmsg )
+	$(use_enable sysvipc sysvsem )
+	$(use_enable sysvipc sysvshm )
+	$(use_with tidy tidy "${EPREFIX}"/usr)
+	$(use_enable tokenizer tokenizer )
+	$(use_enable wddx wddx )
+	$(use_enable xml xml )
+	$(use_enable xmlreader xmlreader )
+	$(use_enable xmlwriter xmlwriter )
+	$(use_with xmlrpc xmlrpc)
+	$(use_with xsl xsl "${EPREFIX}"/usr)
+	$(use_enable zip zip )
+	$(use_with zlib zlib "${EPREFIX}"/usr)
+	$(use_enable debug debug )"
+
+	# DBA support
+	if use cdb || use berkdb || use flatfile || use gdbm || use inifile \
+		|| use qdbm ; then
+		my_conf="${my_conf} --enable-dba${shared}"
+	fi
+
+	# DBA drivers support
+	my_conf+="
+	$(use_with cdb cdb)
+	$(use_with berkdb db4 ${EPREFIX}/usr)
+	$(use_enable flatfile flatfile )
+	$(use_with gdbm gdbm ${EPREFIX}/usr)
+	$(use_enable inifile inifile )
+	$(use_with qdbm qdbm ${EPREFIX}/usr)"
+
+	# Support for the GD graphics library
+	my_conf+="
+	$(use_with truetype freetype-dir ${EPREFIX}/usr)
+	$(use_with truetype t1lib ${EPREFIX}/usr)
+	$(use_enable cjk gd-jis-conv )
+	$(use_with gd jpeg-dir ${EPREFIX}/usr)
+	$(use_with gd png-dir ${EPREFIX}/usr)
+	$(use_with xpm xpm-dir ${EPREFIX}/usr)"
+	# enable gd last, so configure can pick up the previous settings
+	my_conf+="
+	$(use_with gd gd)"
+
+	# IMAP support
+	if use imap ; then
+	    my_conf+="
+		$(use_with imap imap ${EPREFIX}/usr)
+		$(use_with ssl imap-ssl ${EPREFIX}/usr)"
+	fi
+
+	# Interbase/firebird support
+
+	if use firebird ; then
+	    my_conf+="
+		$(use_with firebird interbase ${EPREFIX}/usr)"
+	fi
+
+	# LDAP support
+	if use ldap ; then
+	    my_conf+="
+		$(use_with ldap ldap ${EPREFIX}/usr)
+		$(use_with ldap-sasl ldap-sasl ${EPREFIX}/usr)"
+	fi
+
+	# MySQL support
+	if use mysql ; then
+		if use mysqlnd ; then
+	        my_conf+="
+			$(use_with mysql mysql mysqlnd)"
+		else
+	        my_conf+="
+			$(use_with mysql mysql ${EPREFIX}/usr)"
+		fi
+	    my_conf+="
+		$(use_with mysql mysql-sock ${EPREFIX}/var/run/mysqld/mysqld.sock)"
+	fi
+
+	# MySQLi support
+	if use mysqlnd ; then
+	    my_conf+="
+		$(use_with mysqli mysqli mysqlnd)"
+	else
+	    my_conf+="
+		$(use_with mysqli mysqli ${EPREFIX}/usr/bin/mysql_config)"
+	fi
+
+	# ODBC support
+	if use odbc ; then
+	    my_conf+="
+		$(use_with odbc unixODBC ${EPREFIX}/usr)"
+	fi
+
+	if use iodbc ; then
+	    my_conf+="
+		$(use_with iodbc iodbc ${EPREFIX}/usr)"
+	fi
+
+	# Oracle support
+	if use oci8-instant-client ; then
+	    my_conf+="
+		$(use_with oci8-instant-client oci8)"
+	fi
+
+	# PDO support
+	if use pdo ; then
+	    my_conf+="
+		$(use_with mssql pdo-dblib )"
+		if use mysqlnd ; then
+	        my_conf+="
+			$(use_with mysql pdo-mysql mysqlnd)"
+		else
+	        my_conf+="
+			$(use_with mysql pdo-mysql ${EPREFIX}/usr)"
+		fi
+	    my_conf+="
+		$(use_with postgres pdo-pgsql )
+		$(use_with sqlite pdo-sqlite ${EPREFIX}/usr)
+		$(use_with odbc pdo-odbc unixODBC,${EPREFIX}/usr)"
+		if use oci8-instant-client ; then
+	        my_conf+="
+			$(use_with oci8-instant-client pdo-oci)"
+		fi
+	fi
+
+	# readline/libedit support
+	my_conf+="
+	$(use_with readline readline ${EPREFIX}/usr)
+	$(use_with libedit libedit ${EPREFIX}/usr)"
+
+	# Session support
+	if use session ; then
+	    my_conf+="
+		$(use_with sharedmem mm ${EPREFIX}/usr)"
+	else
+	    my_conf+="
+		$(use_enable session session )"
+	fi
+
+	#Build shared modules such as libphp5.so with pic support
+	my_conf="${my_conf} --with-pic"
+
+	# we use the system copy of pcre
+	# --with-pcre-regex affects ext/pcre
+	# --with-pcre-dir affects ext/filter and ext/zip
+	my_conf="${my_conf} --with-pcre-regex=${EPREFIX}/usr --with-pcre-dir=${EPREFIX}/usr"
+
+	# Catch CFLAGS problems
+    # Fixes bug #14067.
+    # Changed order to run it in reverse for bug #32022 and #12021.
+    replace-cpu-flags "k6*" "i586"
+
+	# Support user-passed configuration parameters
+	my_conf="${my_conf} ${EXTRA_ECONF:-}"
+
+	# Support the Apache2 extras, they must be set globally for all
+	# SAPIs to work correctly, especially for external PHP extensions
+
+	mkdir -p "${WORKDIR}/sapis-build"
+	for one_sapi in $SAPIS ; do
+		use "${one_sapi}" || continue
+		php_set_ini_dir "${one_sapi}"
+
+		cp -r "${S}" "${WORKDIR}/sapis-build/${one_sapi}"
+		cd "${WORKDIR}/sapis-build/${one_sapi}"
+
+		sapi_conf="${my_conf} --with-config-file-path=${PHP_INI_DIR}
+			--with-config-file-scan-dir=${PHP_EXT_INI_DIR_ACTIVE}"
+
+		for sapi in $SAPIS ; do
+			case "$sapi" in
+				cli|cgi|embed|fpm)
+					if [[ "${one_sapi}" == "${sapi}" ]] ; then
+						sapi_conf="${sapi_conf} --enable-${sapi}"
+					else
+						sapi_conf="${sapi_conf} --disable-${sapi}"
+					fi
+					;;
+
+				apache2)
+					if [[ "${one_sapi}" == "${sapi}" ]] ; then
+						sapi_conf="${sapi_conf} --with-apxs2=${EPREFIX}/usr/sbin/apxs"
+					else
+						sapi_conf="${sapi_conf} --without-apxs2"
+					fi
+					;;
+			esac
+		done
+
+		econf ${sapi_conf}
+	done
+}
+
+src_compile() {
+	# snmp seems to run during src_compile, too (bug #324739)
+	addpredict /usr/share/snmp/mibs/.index
+	addpredict /var/lib/net-snmp/mib_indexes
+
+	for sapi in ${SAPIS} ; do
+		if use "${sapi}"; then
+			cd "${WORKDIR}/sapis-build/$sapi" || "Failed to change dir to ${WORKDIR}/sapis-build/$1"
+			emake || die "emake failed"
+		fi
+	done
+}
+
+src_install() {
+	# see bug #324739 for what happens when we don't have that
+	addpredict /usr/share/snmp/mibs/.index
+
+	# grab the first SAPI that got built and install common files from there
+	local first_sapi=""
+	for sapi in $SAPIS ; do
+		if use $sapi ; then
+			first_sapi=$sapi
+			break
+		fi
+	done
+
+	# Makefile forgets to create this before trying to write to it...
+	dodir "${PHP_DESTDIR#${EPREFIX}}/bin"
+
+	# Install php environment (without any sapis)
+	cd "${WORKDIR}/sapis-build/$first_sapi"
+	emake INSTALL_ROOT="${D}" \
+		install-build install-headers install-programs \
+		|| die "emake install failed"
+
+	local extension_dir="$("${ED}/${PHP_DESTDIR#${EPREFIX}}/bin/php-config" --extension-dir)"
+
+	# Create the directory where we'll put version-specific php scripts
+	keepdir /usr/share/php${PHP_MV}
+
+	local sapi="", file=""
+	local sapi_list=""
+
+	for sapi in ${SAPIS}; do
+		if use "${sapi}" ; then
+			einfo "Installing SAPI: ${sapi}"
+			cd "${WORKDIR}/sapis-build/${sapi}"
+
+			if [[ "${sapi}" == "apache2" ]] ; then
+				# We're specifically not using emake install-sapi as libtool
+				# may cause unnecessary relink failures (see bug #351266)
+				insinto "${PHP_DESTDIR#${EPREFIX}}/apache2/"
+				newins ".libs/libphp5$(get_libname)" "libphp${PHP_MV}$(get_libname)"
+				keepdir "/usr/$(get_libdir)/apache2/modules"
+			else
+				# needed each time, php_install_ini would reset it
+				into "${PHP_DESTDIR#${EPREFIX}}"
+			    case "$sapi" in
+					cli)
+						source="sapi/cli/php"
+						;;
+					cgi)
+						source="sapi/cgi/php-cgi"
+						;;
+					fpm)
+						source="sapi/fpm/php-fpm"
+						;;
+					embed)
+						source="libs/libphp${PHP_MV}$(get_libname)"
+						;;
+					*)
+						die "unhandled sapi in src_install"
+						;;
+				esac
+
+				if [[ "${source}" == *"$(get_libname)" ]]; then
+					dolib.so "${source}" || die "Unable to install ${sapi} sapi"
+				else
+					dobin "${source}" || die "Unable to install ${sapi} sapi"
+				fi
+			fi
+
+			php_install_ini "${sapi}"
+
+			# construct correct SAPI string for php-config
+			# thanks to ferringb for the bash voodoo
+			if [[ "${sapi}" == "apache2" ]]; then
+				sapi_list="${sapi_list:+${sapi_list} }apache2handler"
+			else
+				sapi_list="${sapi_list:+${sapi_list} }${sapi}"
+			fi
+		fi
+	done
+
+	# Install env.d files
+	newenvd "${FILESDIR}/20php5-envd" \
+		"20php${SLOT}"
+	sed -e "s|/lib/|/$(get_libdir)/|g" -i \
+		"${ED}/etc/env.d/20php${SLOT}"
+	sed -e "s|php5|php${SLOT}|g" -i \
+		"${ED}/etc/env.d/20php${SLOT}"
+
+	# set php-config variable correctly (bug #278439)
+	sed -e "s:^\(php_sapis=\)\".*\"$:\1\"${sapi_list}\":" -i \
+		"${ED}/usr/$(get_libdir)/php${SLOT}/bin/php-config"
+}
+
+src_test() {
+	echo ">>> Test phase [test]: ${CATEGORY}/${PF}"
+	PHP_BIN="${WORKDIR}/sapis-build/cli/sapi/cli/php"
+	if [[ ! -x "${PHP_BIN}" ]] ; then
+		ewarn "Test phase requires USE=cli, skipping"
+		return
+	else
+		export TEST_PHP_EXECUTABLE="${PHP_BIN}"
+	fi
+
+	if [[ -x "${WORKDIR}/sapis/cgi/php-cgi" ]] ; then
+		export TEST_PHP_CGI_EXECUTABLE="${WORKDIR}/sapis/cgi/php-cgi"
+	fi
+
+	REPORT_EXIT_STATUS=1 "${TEST_PHP_EXECUTABLE}" -n  -d "session.save_path=${T}" \
+		"${WORKDIR}/sapis-build/cli/run-tests.php" -n -q -d "session.save_path=${T}"
+
+	for name in ${EXPECTED_TEST_FAILURES}; do
+		mv "${name}.out" "${name}.out.orig" 2>/dev/null
+	done
+
+	local failed="$(find -name '*.out')"
+	if [[ ${failed} != "" ]] ; then
+		ewarn "The following test cases failed unexpectedly:"
+		for name in ${failed}; do
+			ewarn "  ${name/.out/}"
+		done
+	else
+		einfo "No unexpected test failures, all fine"
+	fi
+
+	if [[ ${PHP_SHOW_UNEXPECTED_TEST_PASS} == "1" ]] ; then
+		local passed=""
+		for name in ${EXPECTED_TEST_FAILURES}; do
+			[[ -f "${name}.diff" ]] && continue
+			passed="${passed} ${name}"
+		done
+		if [[ ${passed} != "" ]] ; then
+			einfo "The following test cases passed unexpectedly:"
+			for name in ${passed}; do
+				ewarn "  ${passed}"
+			done
+		else
+			einfo "None of the known-to-fail tests passed, all fine"
+		fi
+	fi
+}
+
+pkg_postinst() {
+	# Output some general info to the user
+	if use apache2 ; then
+		APACHE2_MOD_DEFINE="PHP5"
+		APACHE2_MOD_CONF="70_mod_php5"
+		apache-module_pkg_postinst
+	fi
+
+	# Create the symlinks for php
+	for m in ${SAPIS}; do
+		[[ ${m} == 'embed' ]] && continue;
+		if use $m ; then
+			local ci=$(eselect php show $m)
+			if [[ -z $ci ]]; then
+				eselect php set $m php${SLOT}
+				einfo "Switched ${m} to use php:${SLOT}"
+				einfo
+			elif [[ $ci != "php${SLOT}" ]] ; then
+				elog "To switch $m to use php:${SLOT}, run"
+				elog "    eselect php set $m php${SLOT}"
+				elog
+			fi
+		fi
+	done
+
+	elog "Make sure that PHP_TARGETS in ${EPREFIX}/etc/make.conf includes php${SLOT/./-} in order"
+	elog "to compile extensions for the ${SLOT} ABI"
+	elog
+	if ! use readline && use cli ; then
+		ewarn "Note that in order to use php interactivly, you need to enable"
+		ewarn "the readline USE flag or php -a will hang"
+	fi
+	elog
+	elog "This ebuild installed a version of php.ini based on php.ini-${PHP_INI_VERSION} version."
+	elog "You can chose which version of php.ini to install by default by setting PHP_INI_VERSION to either"
+	elog "'production' or 'development' in ${EPREFIX}/etc/make.conf"
+	elog "Both versions of php.ini can be found in ${EPREFIX}/usr/share/doc/${PF}"
+
+	elog
+	elog "For more details on how minor version slotting works (PHP_TARGETS) please read the upgrade guide:"
+	elog "http://www.gentoo.org/proj/en/php/php-upgrading.xml"
+	elog
+}
+
+pkg_prerm() {
+	local sapi
+	local slot
+	for sapi in ${SAPIS}; do
+		slot=$(eselect php show $sapi 2> /dev/null)
+		slot=${slot/php/}
+		if [[ $slot == $SLOT ]]; then
+			ewarn "You have removed the active version of the $sapi SAPI"
+			ewarn "Fix the issue using \`eselect php\`"
+		fi
+	done
+}