Version bumps

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

4 files changed, 1604 insertions, 6 deletions

diff --git a/dev-lang/php/ChangeLog b/dev-lang/php/ChangeLog
index d1fb52111f42..0897ca907283 100644
--- a/dev-lang/php/ChangeLog
+++ b/dev-lang/php/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for dev-lang/php
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/php/ChangeLog,v 1.822 2014/04/05 07:22:55 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/php/ChangeLog,v 1.823 2014/04/05 08:14:55 olemarkus Exp $
+
+*php-5.5.11 (05 Apr 2014)
+*php-5.4.27 (05 Apr 2014)
+
+  05 Apr 2014; Ole Markus With <olemarkus@gentoo.org> +php-5.4.27.ebuild,
+  +php-5.5.11.ebuild:
+  Version bumps
 
   05 Apr 2014; Pacho Ramos <pacho@gentoo.org> php-5.3.28-r3.ebuild:
   amd64 stable, bug #501376
diff --git a/dev-lang/php/Manifest b/dev-lang/php/Manifest
index b197f7f806b4..90a2fe406379 100644
--- a/dev-lang/php/Manifest
+++ b/dev-lang/php/Manifest
@@ -24,7 +24,9 @@ DIST php-5.4.23.tar.bz2 12251671 SHA256 ae7c070fa9b9e16413ef944d910b68f3ba79192e
 DIST php-5.4.24.tar.bz2 12256796 SHA256 97fe70eddaf5b93969714a551870fe03f6b0a387f85b83a6d63a40a76199a327 SHA512 c4bf209c9da183d0fa4aa96ea1e58e93f8034bd23dbe009dfc15a432416cb9fde441627d0068a9ddbd6e8ca273d97096e169dfe2c1a3cc99e49f2a181b664c6c WHIRLPOOL 9de9648a62a70d715ebe1e561cb9de040e359d7f7f55f5da8c09a596a3abac43d25a04723db472341c98be429bbf4ef94332539749cca871a11bcddeca64d8cc
 DIST php-5.4.25.tar.bz2 11739877 SHA256 b6c18c07c6bf34f75e601b28829d636e44c1c9f4267aac4ed013443c32a2245f SHA512 66694ff2bc6a91a9c702f4741fea1d0ce7e10b91051baedde0022b855c76e93efbde9719e333ffb504a6d801a6956404d606bfd174f46d94e6433d89f4c610db WHIRLPOOL 0683e485b9c043d49ee10d9616304fa73d3a0bbe7b6bfff6723ab857da7a8b37b60dbceecd70db9aff2a38611d768ac1514954de110e915d1ef83ced548454fa
 DIST php-5.4.26.tar.bz2 12270535 SHA256 5053649317b9331df40bd836c976a32b31dbc5c5d68997d3ae01cb90db22d240 SHA512 9ff29943bfe283fc5b925a2d463a4bc6e4bd070909f202ce6e3a45a7281720b550d5569c5ee8e60412342739833d237974442182c392cfa1b2e9d73375f897ef WHIRLPOOL 83095a3ee4e2509c4e03e4ad1a658fe4d98e747193450227656a39368a9127ea56cf876b40384ff64327c19dc5107c99db75742acb14c34cf24adf921b56d598
+DIST php-5.4.27.tar.bz2 12272737 SHA256 09dcc44cded735e1cf1b1b9f2749d1a0fd90e03378b6a70364a662f4740e61e2 SHA512 a3b395d019b801b7280a4ee2816273fe7a3a3f4fc04c73464e93e12a78dfe6e6fd0c0b0ae4f04cc2620a8eb009f018f356f52f1aaf845e9da104084e99ebcd98 WHIRLPOOL 0da13758b9e8ca6a9c9f3f8f74315afcd827be3316383f2b61a451ef0c45c762acdc93961bd9483cd4297e0974fcb577fbda92eee02216dc3ce298ef4a70a77b
 DIST php-5.5.10.tar.bz2 13102742 SHA256 bb34e61f8e6f56c612867bfe85d144d5045cd5e44497539bc126a4e8c6795419 SHA512 75d4a5b72c6a467030fe670af9ce162916c3bbd527499c8af08de38fde5d8ea6132de3a4f4ff685e8e0bd38b74acc763efe5accb0a7af222d1e33a46974866a6 WHIRLPOOL 26a44a881bcb3887383e7006eaf41c9364e23ae4727a7ad764dd3ca765d5bcb286c61831dfd7c62ab01250844401cc078bb1270183bf6da9f74178b5c55cad64
+DIST php-5.5.11.tar.bz2 13207627 SHA256 60e14c255f2a461a7a26639b84a2fc448cc2f91c8dead0e9fd00cd8ba27a2e96 SHA512 4fd93b22bb3bdaa1b5f5d53fab33896720434cc15e786109dc5a7503da9409efeb810f63e89a21049b28df938b7592d57bdaae603ce5509fdd963f513781a35d WHIRLPOOL d4d8381f3443e55971ed16647370fa9b14ad6a0715579fcc627a43de85097ed3c4af0cfa7fb1b4d9324eb941f270962759b8e4b3c4f7abfe5819b9023e879c21
 DIST php-5.5.7.tar.bz2 12991330 SHA256 2cb9425ef514b984dd233097d82a66f4623b9bf48f2ef265bc7ba25d697d6008 SHA512 0300f0a8b30fd83e80e8ff5fbb3008203e67fc7f740d18c265c9350c60839067996f57b7fe4758d2903f2844dee98303d6c373d4801724a8c38c1150d6479282 WHIRLPOOL ef83e902fccd307eb4f11c85eb8cd33363b3f0e4a8ab1f97b3131123848ab942ad71e337a5e8308b7f6ac03834f37cbfa42b5ba3cd9e0cb0a90133dca8ce600b
 DIST php-5.5.8.tar.bz2 13005675 SHA256 6d5f45659d13383fc8429f185cc9da0b30c7bb72dcae9baf568f0511eb7f8b68 SHA512 19749ee988d24838dd7b9de825ec839cc0125d2ee55f063504a75216503ec1fd3bf7cc3da5cd40140c826fe2ca9a734d7f7f5320fb2a2a8d78231a61178a7e22 WHIRLPOOL f79c5b08c420febfc4689ce6b460a8cf2d966abaee6ed2b3be329f4fd3261d0757da505c73c29bf2235ec792eee550f402415520a266d9b4da82a5827e77bdc6
 DIST php-5.5.9.tar.bz2 13019443 SHA256 9d1dea5195e2bcd928416130a6e19173d02bd36fb76c382522bf145c458fbed3 SHA512 fc2b9f89412aecb2715fd1500f932e0e0c2ee1d2759351b71e07687716fc7df4a864cd3a970fd51056bc0988ab87a7221f787f6ecc90a94f9528bb993abc404b WHIRLPOOL 73c025aa0f7b998c695ae2d0617d828c2b03c8597462333eec1d4980e7a3a85ef97fffefb928fd65cc136cf67e01a37226a22003bc352853608a9b9f338e6409
@@ -40,20 +42,28 @@ EBUILD php-5.4.24-r1.ebuild 22322 SHA256 ca0a083dfef8ee834adfd846188524f0d22733f
 EBUILD php-5.4.24.ebuild 22010 SHA256 16a5e1d0f359a47f4c4ebb733d70cb857edaca253379da2a4f513b50a922b29c SHA512 a4ce7a9d86f6934a9d9bf754dd18859a2ae7d75224f33068dafc5d0467e48d31ffb0a5b33b580bb1657e460c92af6dfcd588dfa090b0d427d4f060ce37900d02 WHIRLPOOL 37146d81328e8138e4689c33b626fa6028b7d4d0eb3e36168e8730caca27b3b3ff34b6dbe2b3b18ca54db7c486d77038f2b3cb406c0ca179458b9d96f809f380
 EBUILD php-5.4.25.ebuild 22319 SHA256 f3680add91942ee42643cb5cfcc926b7f7919f1d1265f4483e51efb5692c4aab SHA512 44916c850898c77ab6e48e2647feef1dcd654aad032316cf8fd3353869d2e8ce3310b75bc5ceaa499af7db8da505fc77bd0a2e04e268b336d343628537a7b7bc WHIRLPOOL bbbd026ae5fa00c3bab9d8c0c0c7ba21e96946eb7965509f08690ffdd8e6fc2aa7a1ebcfad405b8b617a6d34ad60a1b67b01dcec077a1cdb46e0c05ebe9ee0e8
 EBUILD php-5.4.26.ebuild 22305 SHA256 45f12c8c817bffd354874250769799a4cc752f0922b5d36fc4978320f3ddbcec SHA512 b3e7794ca7047b88f10b889aa44888ae3c89ab68e8f94eb39719e9123933ef83942306bcb192ed850bcaf894489af83bd4b4f3687d0d3f84adc7af55369c3da5 WHIRLPOOL d4ded6da703c048c390120b24cf3b1a2f3fc6d6b9b88840bf31e80b211fe90e415c1baf30fe81ceb02daacdc895d377b9240fa67dc1b1042506c9aea41e4701e
+EBUILD php-5.4.27.ebuild 22319 SHA256 46dc08191ac62fde34fb5d91d1c3db85799f44d939cb843f03b7713cb96ecdeb SHA512 74d26dc59c2f4914d55ae723c27dccf9279acf7da9e2f635305c879c0aaa9c10b59c46b0245a47f59909c6cd4856383a0f6ba484b35a2a6dcfff6800674341ef WHIRLPOOL fcc4c4bf74a2daa33ac93c94786dce6dec2c432975782761f3b1383a942b735f0287c766aa0a6c48ef3e5745f33dbf431a73aa686622c2591608f4942af7cbb2
 EBUILD php-5.5.10.ebuild 22154 SHA256 b1f6bea1b4afb4447f75bbf92ee2e0a0c177448c60c8c1fdd8c6395519df6bb0 SHA512 bbe5b164cb08a0f6983989b505cf05589beef56ed4d729562e2e17ae72b517abf670ec6993c946cecd93ce44a5a1c8899a5e706c05ba70efbc6da7c0cf6bca00 WHIRLPOOL aee3fdb5b0e2190eb1470988772a8876d5ed0ca737e22296c099ca19bfe2a62846005d13d6cb8689206d80bbbbccfc7f6e88f9ba764531e69de671bfa4a378ac
+EBUILD php-5.5.11.ebuild 22168 SHA256 119c039540862e50620d535103a4c55c63bc3044470487303792f97561a0cb87 SHA512 76297a0ce5846cb8fe6405c1d18a3de28bb17a591261a2fa9e2aab6685b51f285107419ba1ea53262931f64a7d710d187485bf6f78e193625626f7e9389e9e92 WHIRLPOOL de8cd270ce76cf7259ad689f4ece7381fb3d9d0fab21785ff9be984a4b10e0daf6136fdb3a821dfe04f0a57e28722030ff9e4bd418541caed0db628d71ae870e
 EBUILD php-5.5.7.ebuild 21850 SHA256 5dc5b76ac1b49fe81b56daa0243afd3bda108d002564f105f3510ffebbb05f93 SHA512 1062485865773b2f4eac485997a85e1c042555e42260656011bdd2fdb81c3ad824a3ebb5581f6fdf598595cae557e26e97dd829dd50bca3518a37f082c415753 WHIRLPOOL cd5da586eefcee2985d9c1ce53dc790e24707b614640e59f341908779819f3e61420cfe94a1bd476ba516f1ba87639e96ada939d1f84dd9f385dbb10909d52a1
 EBUILD php-5.5.8-r1.ebuild 22166 SHA256 eeb3f293dd9f4f519207b3c9bd96e3acc75d535501c38a1cdffbe05c06427a04 SHA512 be9ba08d662061e9f81b367ee101b6dfaf979ff51e28fc7a421a39b56ed324b540af7214a33caf92e67beb50a37f2ab2a765ec936ab2bd15a8486b0bc08ccaa9 WHIRLPOOL 4e5b42413b052454bc3f8eab35a136a82bfde54e8b6b3f91c2b5ac32e021dc8ed2c50e162ef8edb9ce21a325d63ce195bc6ff4f13132b5234a4e17374280071a
 EBUILD php-5.5.8.ebuild 21858 SHA256 814fa2fdad7d2a6cb06b4ee2bf76d4e07086f6ea79a7313aa53181c39d8ea02e SHA512 4a48f213d4d91dc40a88f4d89fb052102c75c0fcaa74cdd27b6a82fefa66230655c8d4b55aa5aae20625dcebc63c90c5a0ed63944a931dcce0796c034ecc81b5 WHIRLPOOL 06315659fcc192fab80b71c144bcbb5287d1dff04bc250e6fc846fd9e3cf33fa395184878c1428f132f872057d39e25ccea0ffd47cdd0459018fd3faf6d5c6ce
 EBUILD php-5.5.9.ebuild 22153 SHA256 5204e7e76d7ed5be2dddc5a009e7e0c10f97317f4ec50584818f2815a1e44234 SHA512 aac8d3f25912cede211df52edbfedce4e8d14599cd93351b70f9c6155d44ad486eb685ac60600d9b9b4f7c82b0dd679cc7cab606d7b518b1761e151250823c55 WHIRLPOOL 0467a213dfa6014fd9cf5621a706e0b7dded804b2d8a1811efcef79ca6771949e5abbae4c7ce0015d2f00e62d64a18a5d778631919be9f892ed6251e1146da86
 EBUILD php-5.6.0_alpha1-r1.ebuild 22176 SHA256 ad003ce3372deecf2931c767a3731b7ada756a8d900b45b08d5853a743b893a7 SHA512 f6b04f59440c3aa3b20fff6353729cd89d6c85a2d2cd0b519edfff04898538dc7b52b522a2f603ae141a23771f75e3b5b493fbe973e974982304d9776cc293e7 WHIRLPOOL 39126034861474c12c16abe21d53668c63efd6773fc344698359bf044cbf975f3f0beffc3950bec41fc732459f7b6d87ee180962322410b23f6e9beabdba2585
 EBUILD php-5.6.0_alpha1.ebuild 21868 SHA256 1fe0d8f58096ade80ef7ab6bfae4a9a8eded7ea9880e49e4f6a4111d0effb40d SHA512 e0758a27128c4f49d3d108a5dd3256e1ccc154cf978e8cb987595e438367bd52522b4fab832be6aad9e421bc4ba33af458efb118484f60c69636e204de1e3356 WHIRLPOOL 81c632ac2f31a3c9d46a304794cbdb29671ef1de244b6918c70a55db13cd7043f4d619f59c01659f2e8978128d08d84264ff2b8c6a82ef34a5e3fad4930cfc7f
-MISC ChangeLog 23548 SHA256 f57cb8a4495ccd40c00a3bddb5e95c45509deecb7031ce646ce453a600e530f5 SHA512 5f31a9c60a9464722b01284b2e4fa1abbab471fc7fe827f532035a202a6359c5435b876f5ac438b84c638a9a50e9be272afa5d6e8377da44e4c1716377225a15 WHIRLPOOL 8d74da54708f19ef083c8172fff980c8e5bdf79c8a29bbfdd907faa9128216c17ce40e072cec359cc51acf3ec07856ed9bbd4d863f21a2c2b454360e26d5d753
+MISC ChangeLog 23718 SHA256 5f31d07c2033224c3bd0c4a65b3b7f6aaaf48df9807e310d4d707d2722befcde SHA512 09dca620c620728c6bc790cea89e8e7da03dbb116ffe9d6e35d6c907841c2471b5c152586c172289b4659109f03adbef6ad2ec5b02e7b32799da65a13029780d WHIRLPOOL 7459102e01b73051ea1ea3f140eb578b330d6cd49762dad7e305e5c1c70ae3d47ae04ba9cfbd0a1b88cae378bb918de812f84552ce570305b3959cdce715dc3c
 MISC ChangeLog-2012 108488 SHA256 c2eea36502d34eadc7995d546f78aaa553ba07beeb51ea738715ad7f2e51b08d SHA512 eb25224993eff1ea42ea133302991a3ffad3adda0bc524cfa4fae49574230a8e65b35b08750d780c11cc9c152435fadbf2c416241fac28dcbb025e060e96cd7a WHIRLPOOL 82f627853fa961f3f3707fb2c8757acbc8fc644e89121d78703b40ff0f668aa7d0f1aa26c77f8f503e4f6da22ed865e4cb7c02d5d112c89488b12aa6b0d80568
 MISC metadata.xml 1547 SHA256 2ce287830b8238e330c0585ef3023f86a9e5d46204619c92588244c5d7fa2f77 SHA512 a3a1c2dfddb4d0d92eafa33d74dc0bb90f1a9976e1d2fe0d3717a0d94149d3023dfdc9e68d42d440873561b2e6c34969ae86cec24ac0f0bddcf9ba14103ba450 WHIRLPOOL d9d877b3ae1b304ff89f7b0dd3a1f23d78062280ee935eaaa02c44e8e1dc2fd78bf2c6336cfebb2d9e8dddc03414a7744114ecebee6e364e962c49ff5e2bdf57
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.22 (GNU/Linux)
+Version: GnuPG v2.0.20 (GNU/Linux)
 
-iEYEAREIAAYFAlM/r1AACgkQCaWpQKGI+9QNcQCdHQGRdtoLFUCJiuZS+8+pTDVL
-trUAniBNsy80hLRcCA9ZnxdiCslard6D
-=0OzN
+iQF8BAEBCABmBQJTP7uFXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQyOEZEMjNGNzBENkE5N0Q2Q0ZFMkFDNDA2
+QkFCNEFFNUM0QTkyQkY1AAoJEGurSuXEqSv1thAIALyy/HCLYidCOPYDWJrpLs0S
+3J99+198IXN7yZw8W6qMX/lA8ky2AMvoPoSTjQzDTaHUsVHcbvgdrOgytqPn+fiB
+FJ/nkOXs91Bc8hoMJicZzsWJgtg4svFRLHP6QP3T65xlJbFBx9z1fni86w2oWJPw
+fAjjR7BUuck4pb+Kdw339KFGOjCc+fMQKDFQFH5H4pAMie0Swd4HMgjBcKuXgL5I
+CfCezhJL0EP4sBU+6f0qf8kqODa9ywPK/g+kP4qpld08ZSMAaKF3Ou1Ur+MLCAF4
+CZqurDS5wEzjspR4ogxuvvmj5idIy09jzfk2FNoUKm6YIlSl/I77QRaOzwW/ItI=
+=sgv3
 -----END PGP SIGNATURE-----
diff --git a/dev-lang/php/php-5.4.27.ebuild b/dev-lang/php/php-5.4.27.ebuild
new file mode 100644
index 000000000000..b8144080e40d
--- /dev/null
+++ b/dev-lang/php/php-5.4.27.ebuild
@@ -0,0 +1,801 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/php/php-5.4.27.ebuild,v 1.1 2014/04/05 08:14:55 olemarkus Exp $
+
+EAPI=5
+
+inherit eutils autotools flag-o-matic versionator depend.apache apache-module db-use libtool systemd
+
+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/stas/${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="2"
+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
+	enchant exif +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 pcntl pdo +phar +posix postgres qdbm
+	readline recode selinux +session sharedmem
+	+simplexml snmp soap sockets spell sqlite ssl
+	sybase-ct sysvipc systemd tidy +tokenizer truetype unicode wddx
+	+xml xmlreader xmlwriter xmlrpc xpm xslt zip zlib"
+
+DEPEND="
+	>=app-admin/eselect-php-0.7.1-r3[apache2?,fpm?]
+	>=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:0
+		media-libs/libpng:0=
+		sys-libs/zlib
+	) )
+	crypt? ( >=dev-libs/libmcrypt-2.4 )
+	curl? ( >=net-misc/curl-7.10.5 )
+	enchant? ( app-text/enchant )
+	exif? ( !gd? (
+		virtual/jpeg:0
+		media-libs/libpng:0=
+		sys-libs/zlib
+	) )
+	firebird? ( dev-db/firebird )
+	gd? ( virtual/jpeg:0 media-libs/libpng:0= 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:0 media-libs/libpng:0= 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:0
+		media-libs/libpng:0= sys-libs/zlib
+	)
+	xslt? ( 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 )
+	xslt? ( 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 )
+		systemd? ( sys-apps/systemd ) )"
+
+DEPEND="${DEPEND}
+	sys-devel/flex
+	>=sys-devel/m4-1.4.3
+	>=sys-devel/libtool-1.5.18"
+
+# 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}"
+
+	if use_if_iuse opcache; then
+		elog "Adding opcache to ${phpinisrc}"
+		echo "zend_extension=${PHP_DESTDIR}/$(get_libdir)/opcache.so" >> ${phpinisrc}
+	fi
+
+	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}" == "fpm" ]] ; then
+		[[ -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
+
+		# 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
+
+	dodoc php.ini-development
+	dodoc php.ini-production
+
+}
+
+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
+	sed -re	"s|^(PHP_EXTRA_VERSION=\").*(\")|\1-pl${PR/r/}-gentoo\2|g" \
+		-i configure.in || die "Unable to change PHP branding"
+
+	# 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 elibc_glibc || echo "${EPREFIX}"/usr))
+	$(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_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 systemd fpm-systemd)
+	$(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 xslt 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 mysqlnd 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
+
+	# Use pic for shared modules such as apache2's mod_php
+	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
+				local dest="${PHP_DESTDIR#${EPREFIX}}"
+				into "${dest}"
+				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"
+					local name="$(basename ${source})"
+					dosym "${dest}/bin/${name}" "/usr/bin/${name}${SLOT}"
+				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
+
+	# Installing opcache module
+	if use_if_iuse opcache ; then
+		dolib.so "modules/opcache$(get_libname)" || die "Unable to install opcache module"
+	fi
+
+	# 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"
+
+	if use fpm ; then
+		if use systemd; then
+			systemd_newunit "${FILESDIR}/php-fpm_at.service" "php-fpm@${SLOT}.service"
+		else
+			systemd_newunit "${FILESDIR}/php-fpm_at-simple.service" "php-fpm@${SLOT}.service"
+		fi
+	fi
+}
+
+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() {
+	eselect php cleanup
+}
diff --git a/dev-lang/php/php-5.5.11.ebuild b/dev-lang/php/php-5.5.11.ebuild
new file mode 100644
index 000000000000..bd83d9065668
--- /dev/null
+++ b/dev-lang/php/php-5.5.11.ebuild
@@ -0,0 +1,780 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/php/php-5.5.11.ebuild,v 1.1 2014/04/05 08:14:55 olemarkus Exp $
+
+EAPI=5
+
+inherit eutils autotools flag-o-matic versionator depend.apache apache-module db-use libtool systemd
+
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-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_SRC_URI="$(php_get_uri "${PHP_RELEASE}" "${PHP_P}.tar.bz2")"
+
+PHP_FPM_CONF_VER="1"
+
+SRC_URI="${PHP_SRC_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 debug
+	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 libmysqlclient 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 systemd tidy +tokenizer truetype unicode wddx
+	+xml xmlreader xmlwriter xmlrpc xpm xslt zip zlib"
+
+DEPEND="
+	>=app-admin/eselect-php-0.7.1-r3[apache2?,fpm?]
+	>=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:0
+		media-libs/libpng:0=
+		sys-libs/zlib
+	) )
+	crypt? ( >=dev-libs/libmcrypt-2.4 )
+	curl? ( >=net-misc/curl-7.10.5 )
+	enchant? ( app-text/enchant )
+	exif? ( !gd? (
+		virtual/jpeg:0
+		media-libs/libpng:0=
+		sys-libs/zlib
+	) )
+	firebird? ( dev-db/firebird )
+	gd? ( virtual/jpeg:0 media-libs/libpng:0= 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] )
+	libmysqlclient? (
+		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:0 media-libs/libpng:0= 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:0
+		media-libs/libpng:0= sys-libs/zlib
+	)
+	xslt? ( 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 )
+	xslt? ( xml )
+	ldap-sasl? ( ldap )
+	mhash? ( hash )
+	phar? ( hash )
+	libmysqlclient? ( || (
+		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 )
+		systemd? ( sys-apps/systemd ) )"
+
+DEPEND="${DEPEND}
+	sys-devel/flex
+	>=sys-devel/m4-1.4.3
+	>=sys-devel/libtool-1.5.18"
+
+# 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}}"
+
+	if use_if_iuse opcache; then
+		elog "Adding opcache to $PHP_EXT_INI_DIR"
+		echo "zend_extension=${PHP_DESTDIR}/$(get_libdir)/opcache.so" >> "${D}/${PHP_EXT_INI_DIR}"/opcache.ini
+		dosym "${PHP_EXT_INI_DIR#${EPREFIX}}/opcache.ini" "${PHP_EXT_INI_DIR_ACTIVE#${EPREFIX}}/opcache.ini"
+	fi
+
+	# SAPI-specific handling
+
+	if [[ "${sapi}" == "fpm" ]] ; then
+		[[ -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
+
+		# 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
+
+	dodoc php.ini-development
+	dodoc php.ini-production
+
+}
+
+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
+	sed -re	"s|^(PHP_EXTRA_VERSION=\").*(\")|\1-pl${PR/r/}-gentoo\2|g" \
+		-i configure.in || die "Unable to change PHP branding"
+
+	# 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_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 elibc_glibc || echo "${EPREFIX}"/usr))
+	$(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 systemd fpm-systemd)
+	$(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 xslt 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
+	local mysqllib="mysqlnd"
+	local mysqlilib="mysqlnd"
+	use libmysqlclient && mysqllib="${EPREFIX}/usr"
+	use libmysqlclient && mysqlilib="${EPREFIX}/usr/bin/mysql_config"
+
+	my_conf+=" $(use_with mysql mysql $mysqllib)"
+	my_conf+=" $(use_with mysqli mysqli $mysqlilib)"
+
+	local mysqlsock=" $(use_with mysql mysql-sock ${EPREFIX}/var/run/mysqld/mysqld.sock)"
+	if use mysql ; then
+		my_conf+="${mysqlsock}"
+	elif use mysqli ; then
+		my_conf+="${mysqlsock}"
+	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 )
+		$(use_with mysql pdo-mysql ${mysqllib})
+		$(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
+
+	# Use pic for shared modules such as apache2's mod_php
+	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
+				local dest="${PHP_DESTDIR#${EPREFIX}}"
+				into "${dest}"
+				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"
+					local name="$(basename ${source})"
+					dosym "${dest}/bin/${name}" "/usr/bin/${name}${SLOT}"
+				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
+
+	# Installing opcache module
+	if use_if_iuse opcache ; then
+		dolib.so "modules/opcache$(get_libname)" || die "Unable to install opcache module"
+	fi
+
+	# 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"
+
+	if use fpm ; then
+		if use systemd; then
+			systemd_newunit "${FILESDIR}/php-fpm_at.service" "php-fpm@${SLOT}.service"
+		else
+			systemd_newunit "${FILESDIR}/php-fpm_at-simple.service" "php-fpm@${SLOT}.service"
+		fi
+	fi
+}
+
+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() {
+	eselect php cleanup
+}