Remove older unsecure versions

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

4 files changed, 14 insertions, 1616 deletions

diff --git a/dev-lang/php/ChangeLog b/dev-lang/php/ChangeLog
index 75f7fb77a3c6..a8f75aaf4425 100644
--- a/dev-lang/php/ChangeLog
+++ b/dev-lang/php/ChangeLog
@@ -1,6 +1,10 @@
 # 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.795 2014/02/08 08:55:01 olemarkus Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/php/ChangeLog,v 1.796 2014/02/08 08:57:14 olemarkus Exp $
+
+  08 Feb 2014; Ole Markus With <olemarkus@gentoo.org> -php-5.3.27.ebuild,
+  -php-5.4.17.ebuild:
+  Remove older unsecure versions
 
   08 Feb 2014; Ole Markus With <olemarkus@gentoo.org> php-5.3.27.ebuild,
   php-5.3.28-r1.ebuild, php-5.3.28-r2.ebuild, php-5.3.28.ebuild,
diff --git a/dev-lang/php/Manifest b/dev-lang/php/Manifest
index 77d2cc05d402..71a4cc70dce8 100644
--- a/dev-lang/php/Manifest
+++ b/dev-lang/php/Manifest
@@ -18,9 +18,7 @@ AUX php-fpm_at-simple.service 316 SHA256 c11d3bb213993ad27642abf2fb13ab8d9bd3fd8
 AUX php-fpm_at.service 317 SHA256 6bbbbd7b6501305c17b7290bb2a83b0ebe492d421adaac8f394e387ed52e0d25 SHA512 27982f9e2d958bfa75c89c7d3531e48d17fc388b1cdcbc8e09051b236b1184ee2baabdfcc567c19d9fcd067d4b3b86f171015616d8da42fccdabd89432d865e8 WHIRLPOOL c101ad8eb7446a6fcb3dba6ec6caae12bd6c0a9d251e222c392abb37314fbc252321bdc7db1696480050ce543a154b7257e503d3065d9e238d1c5c76a74d65ff
 AUX php5-ldvs 22 SHA256 b79d0e52b1b3b4543b31ad45525ae1c2814a27ea8e676772ab10bf6fb12dfe79 SHA512 689a0a12b3527741d2e47870c125e93be73a127e5e798c4b685ccb11653be5a8615faf3178c71a6346fe264d3c4ec76601bc05878fef67b9dbd2e45be59a344d WHIRLPOOL b24f193a1067f699c8efb199ba4e3f1fdd22c13dff98655206b30072ce8c8035fb4ed9288f694856f9978bd9935d3a5589cd968316920e712779c45b44897634
 AUX stricter-libc-client-symlink-check.patch 786 SHA256 bc80d286ce3b2805ce41e46580f24c5ba8f613b670757f81e6b2b638aecbf0df SHA512 db94207a3fd883f78b20fd9261720c39ad097566ae4dd913fe33a12adcedaab943ca0975a4f6a4917d40f6fde61e9b5928378ad91f3afe62d84aba3c9351db03 WHIRLPOOL 1ee44c69658d844614b31d09b8ce945075c9491703c04cb57aceec2469a97db65bf80871e4cf2ba6c9d9fe19a4305906e09d0cc474a635c9a1a6001a4d8c982a
-DIST php-5.3.27.tar.bz2 11432791 SHA256 e12db21c623b82a2244c4dd9b06bb75af20868c1b748a105a6829a5acc36b287 SHA512 e6f7f7c3c41d6007494ca8e6aac74dab5accf29c7bd8c2a70b085336fc75aa1dc879dacb6f33c8d42bcfda8e5326fde26c9f13994d740f2492417c904194571e WHIRLPOOL 4d02fb37913538b262796c962aa58cc5e00fd2fad411b6dd872cd10f5e9cdd1c6fc2ee14ef4159ce37d1fe9b6ce977765eb2bd199a45dae3fe2c6591fa9b41fc
 DIST php-5.3.28.tar.bz2 11051714 SHA256 0cac960c651c4fbb3d21cf2f2b279a06e21948fb35a0d1439b97296cac1d8513 SHA512 84b58379ca12748ae2c9ba37de28c80e78bf8e5b96cf9715b1eafd297a3e155089e9560d6fee7b031be0139dcbe954a9c0717b583ff1fb1cd8a89308b5f6dfd3 WHIRLPOOL 6912417784ae11bc3a9134378b5db5d0ee96cdee11e78929162f61f2104870a1d67b559fc3ff3513200a37a1cae0e83e88f1ba0fb5c07f9fb11844e935101dbf
-DIST php-5.4.17.tar.bz2 11697434 SHA256 dc49935387a5d1f6ac798a3bb4902ca5020f3aa74117ea848b58d1bb61327eb4 SHA512 b35ab1d815bb56247c5f8842967859bfdf37ede5e4c5da4496e4f1540b2412ecb08028ed29a3cb5b79204cddc8c2f5f50a1a0dd1484ed449503945f2ec3f817a WHIRLPOOL 3fcb8094ef8e2123cb7a620df17d1e900b61765bb8127f93edcc5b124fc4233c02467e8d202bcec9a72b45347597a978b33b5323c3c5666da99987ebe2dc5994
 DIST php-5.4.23.tar.bz2 12251671 SHA256 ae7c070fa9b9e16413ef944d910b68f3ba79192eca4010b0af132b8631bd91cc SHA512 3c306ba40e3649ef79a88534e1a12aa83c01f9edbbe9822a741af03e18c9a4e8587351e0f1760cc539b3b599209d546233e40d4d816f6a49cf81ad2d738486b7 WHIRLPOOL c6a6fc4ecd1a1fca1d4c317b37f5a4461bca580e64a4a3cb48c6efe327972ceccb2d6ecb2d632f945875c3df12dca3d37d6e57bf857fbc3d0a34149df644ea6b
 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
@@ -31,11 +29,9 @@ DIST php-5.5.9.tar.bz2 13019443 SHA256 9d1dea5195e2bcd928416130a6e19173d02bd36fb
 DIST php-5.6.0alpha1.tar.bz2 12989378 SHA256 17123fd1b07aa1cd16eedc9ae653dfbd560e2b7da95961f546334fda14bba804 SHA512 3cfa54c724f41790d2bbef5d9f5552ec17d6d5fdc75356ba41f747e161d5112ce46fc32f7300897227b61a959f6973558f8d67c7eb669d866569c44ad7507140 WHIRLPOOL f3fcfae2782e6de86e84913c2daaeefc03dd39796143c8001753b9e1dbd923c4f28f39beb81c05cca71d0642db283102f1dee3b4788791d6f478010335595a3e
 DIST php-patchset-5.3-r0.tar.bz2 7368 SHA256 1a67b34a681dea33ea38f0ffc32b70a78b4c5dc1c3603d1bba31bb130d803ef7 SHA512 765b0cf56a3e63ded4ad1d1ba67567881ad06bdc2814cc07004fa338f38fd69078819c7463d2c55e00805c8f33fa925b94228bf7bc3d223acc33c6cff540024c WHIRLPOOL 59e18b33e11d968fac2a4571173121bf8141bb2f1eab62192e15bc59e351d3ab973f04343b447681d8a2adddf0844edb8a481d027bfc14c7e1fd8222169094ec
 DIST php-patchset-5.4-r2.tar.bz2 5824 SHA256 4a47f4d31f50a244f85349486cdb3474cf315562e097ed4c116c2b9b5730ecef SHA512 3c2523458a627373da7acb93fb2cd621f50b19fe2ba1d30beb62eeaaa39045262b917cfd0b631046fec9c8027cfa99bd0426a079ab45eb172b21d25d6e085dde WHIRLPOOL fe4f015e2f0dc66cc23ef16fb5bb33117952593ae0770d4bcd37ecc1c431cbcc7874189d265696305c60b4e395e7ce902667e38203db46867304868271affdea
-EBUILD php-5.3.27.ebuild 21918 SHA256 5e2ca23b364d3e1b66e6f94b3aad66a43477ed8b22d7b4c6edb6310cb38d4056 SHA512 c9af2e2f8acd494434867f3245d371b6f028b80e5a112d0872436a99f7d800b030610ca5b7d1fd15563662b8ee21c0b382edeb179802bc3cdc5fa70c5d31e16b WHIRLPOOL cf5e8c1e777d3ac7ed7e143974f893f3af0bbc86eb12ee1d2d46b14ab60e58f0362dba4237e46d0d9a4b633e3b42324628abb8ead7685a7c18e169f3ef348bf4
 EBUILD php-5.3.28-r1.ebuild 22060 SHA256 7cb375d199bbff7e4081c8d4a2f388f5500cf70d8f3a6db126edd4327c83696b SHA512 6cfe268a2f121f0be36ce3cea5432ea95c66a833c55a7ff30ddf27d5bd6d33d686e05a67e4950b45eec3901f63671677e25dc1a9b6549f8ae9fdf06e976d5f20 WHIRLPOOL 1d908f220780636cb7df5b2e51b756d75327bb29da09b1cceff3b4ff6c03a7d75b7c1c70009758f307438286c405399bc7e3da3a2ed17a34d17728c6c7ce56e7
 EBUILD php-5.3.28-r2.ebuild 22168 SHA256 38b4270a53b7f46532063ba0d8ad8abf7a0e75b461bfb23fde8468c09d2b2018 SHA512 120b66550d3724cce47651e6cda5e05d74eb1ffb384e9cc6f81697f00a902cf6b4ec2d91647bb21c2cf40d23b4601cac67aef43590c4384240aa59d7815db62b WHIRLPOOL a6b7a97b65a28e958c52c7a1ab8f96b1c431514685ca7f3b9859c4a7a6dc9a1fc9f11e7fb381ee1f396bccb7c0e6c96136a38e1e92fbef176cb247351a43164e
 EBUILD php-5.3.28.ebuild 21921 SHA256 1fb033c6a44bebf63cd5fd85c9e7ba38bbc49391a244f1af418bb8bdade6c44d SHA512 a369e1c3786ed127efbcd05534cc3c5d34d64cae74b203e2be062fde61178b9bc36d6a7e0e68fe7321cf43ab273a35e4f821951ee8a99e0057103616a352f9b6 WHIRLPOOL 9efab1fc07bd37250465e7cf4073eef1b70c3b0f9bba5ca953967341c75563f02db80e08b7c457940ac40c59f4cf82804b43f1894d2c76d090190476d086e234
-EBUILD php-5.4.17.ebuild 22201 SHA256 7d70ddfd644e785d43d4a551d56b6012be178dc7cd6aa5622bd69deceb505b07 SHA512 7ac9ee53399eea90e589fe2495490a9ba93f58021df592482df5e824cb3cfd35b8ae299753a374e4e2dfec105700734bf021416cd342c2b8a4153a4a6242cd6a WHIRLPOOL fba17079d0fa049418762abaf2f6c3f67e0b0f200372f9b591c22efcde1332df14e063be9440bdcf9c9a3a6716ef5d2581e06e3136e20c0a886738244b6a325a
 EBUILD php-5.4.23.ebuild 22002 SHA256 917bf1d53c5cfb53f1b980abd2b9aef448a23978c5c8f9f7de43aee75af78d1f SHA512 de3d68c7248b919bc17f5a75a762088534372226532cd09446cfa9d117e269841d99f78f2e23642d237299290eaf349e1c17b8c906a487841249a4abd07c715e WHIRLPOOL efc3790e227f0acab8ebea248261c49278507edb7fa0d93705a550ff5246e279d8383b43f9c39592cefb830ac3db9df910eb26e8c6f453f5346c71df1d35fdf1
 EBUILD php-5.4.24-r1.ebuild 22322 SHA256 ca0a083dfef8ee834adfd846188524f0d22733f31ac03cb881b095609c23ab27 SHA512 d2bdc12062008e00bf83d0ab0c03a141ffae6d9c08cf26bdb5ce3e3573a8e8929167693dca20f4806ecb6d7cf673093222eb799441a06d84aad1c119bd4ea578 WHIRLPOOL 562dee9088023e76bca0d7f2c0b7c3012fd7bdef6c2ddb564ed87405db362cc7f9767a04bd11e3d30e1960533b5093bc7058004d4541fbacce0a6e93ddcf5b50
 EBUILD php-5.4.24.ebuild 22010 SHA256 16a5e1d0f359a47f4c4ebb733d70cb857edaca253379da2a4f513b50a922b29c SHA512 a4ce7a9d86f6934a9d9bf754dd18859a2ae7d75224f33068dafc5d0467e48d31ffb0a5b33b580bb1657e460c92af6dfcd588dfa090b0d427d4f060ce37900d02 WHIRLPOOL 37146d81328e8138e4689c33b626fa6028b7d4d0eb3e36168e8730caca27b3b3ff34b6dbe2b3b18ca54db7c486d77038f2b3cb406c0ca179458b9d96f809f380
@@ -47,19 +43,19 @@ EBUILD php-5.5.8.ebuild 21858 SHA256 814fa2fdad7d2a6cb06b4ee2bf76d4e07086f6ea79a
 EBUILD php-5.5.9.ebuild 22167 SHA256 a97421e439c343b03666ad3c80b92a09b7e536d731eace0a76f083e6853af761 SHA512 dae4cde050eb4f2c8d7f25d1203a4bba87401da03da88967893f03fd352fb1c2f2331bd94c6bd515c166432da94dd5cf638eed635f9dfd75fab6b97e3f607fd1 WHIRLPOOL 9e5fe05f42419fa0dab39cd4afb6bfa7eaa12df0bc4e73860636a881acf618f5b00736cfd25b883fc282063130834b8d8e05e5078b5724ec314affffa94b3e5d
 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 20460 SHA256 2a79b1742a0560a650edf8a535c039c80c343d102cece5155985bd991e9ca980 SHA512 e19a8cdf6517fa47de3fcbbb12f9f61a9935243fb2f2a4843f85306badd11eaf350c4072463e3653947dc447c0c374acb59aa536569aa96637d798531863a3bb WHIRLPOOL c302477f9bcf53d76bcd6b3f40439470cc52c0ce16d58341b234966b8cb224b1a403377c6f9411e90920ffeaae413d11f5c3172eba788c19b925659c649e9e98
+MISC ChangeLog 20590 SHA256 c40b6b5ec25c1f0289a3c368b11350bbb8de74793de80a19d7eac1faf6bd53ec SHA512 df49754d6d15daa778b09c49d4d002ec0b4874a40a5617e6cebf810a643ac186af19eafc3fb6d4d5a8947c7fe3665704ca71afb1bdde6c0a43c8eb072cc26ba7 WHIRLPOOL 3ff84b6619faeee55d41d49287792a42bfeaa548ef87e9787466a75a524f2abd4b427c025dee965e73d05a18c0a3e779b981e4eff4f8fa057caa5e772faa33fa
 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.20 (GNU/Linux)
 
-iQF8BAEBCABmBQJS9fDvXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+iQF8BAEBCABmBQJS9fFrXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
 ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQyOEZEMjNGNzBENkE5N0Q2Q0ZFMkFDNDA2
-QkFCNEFFNUM0QTkyQkY1AAoJEGurSuXEqSv1i34IAIHdh+4l1yxmH0PkZue8MOGA
-VGlazN8dCiY16kmWzsQrb7AU2CP0RnIdk8fpPfpQ0748ddpm1SPuVRJ0NqSLLTsP
-cac9Rp9nP6bzrxdKhKpNt4Tp+BxCmA0MKGjRsWo4L+2fTrRRXLQnfykr5SUzkqOc
-S5U0TuGPa69VJrHUoedPconbRdKVLtH9rRnQEqoVIrmoFo0JBgrWOKET99c/cLlC
-JeS1X6slRTLE+3VDa2K/S+Enzg4if7cKfnBcQAigxCjr4X4LqoQyHTCKYO3lVfbj
-VHC+jOQuQBeHLHd9Yh2K642bX7VsDhyrVEpbZTddYNmcqVIamc/R3SCg/36o9RI=
-=s2HJ
+QkFCNEFFNUM0QTkyQkY1AAoJEGurSuXEqSv17koH/1gNT319ylejjvvNOt6gPBDE
+Meo/3SU1A6MHGfQlfuY0Y2Gi/+Dbp8Fx+rCw+nl00YmOceCrPjHjrtrlw36zTOIF
+gXvvJk3nDrFHdFzDUIF/ikHGbv0MKqwRPwI8YZsV9EpvGWkLdRVcFL/fpOyg0XzK
+FJfMyl1yzmY/F6CeLerFx+1yj0BXy8qOqR3ZTlMfOjEQdLwZM1hYzDUMl0b7gwgJ
+YrOuiN6XYNkuDMn2UeLIGxzJodWV+zLfwUrGjssr2b8l8uDtAZHa3P1nUMfiIJsr
+gURG/hcYYCZKCuW8sIKxBww2c33+W2kQpz/oCdiTKKNre4Py3CJJ00w3ONh5/H8=
+=EHfC
 -----END PGP SIGNATURE-----
diff --git a/dev-lang/php/php-5.3.27.ebuild b/dev-lang/php/php-5.3.27.ebuild
deleted file mode 100644
index 62b381b60e3f..000000000000
--- a/dev-lang/php/php-5.3.27.ebuild
+++ /dev/null
@@ -1,808 +0,0 @@
-# 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.3.27.ebuild,v 1.11 2014/02/08 08:55:01 olemarkus Exp $
-
-EAPI=5
-
-inherit eutils autotools flag-o-matic versionator depend.apache apache-module db-use libtool
-
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd"
-
-function php_get_uri ()
-{
-	case "${1}" in
-		"php-pre")
-			echo "http://downloads.php.net/johannes/${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="0"
-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 sqlite2 sqlite ssl
-	sybase-ct sysvipc tidy +tokenizer truetype unicode wddx
-	+xml xmlreader xmlwriter xmlrpc xpm xslt zip zlib"
-
-DEPEND="
-	>=app-admin/eselect-php-0.7.0[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 )
-	sqlite2? ( =dev-db/sqlite-2* )
-	sqlite? ( >=dev-db/sqlite-3.7.7.1 )
-	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 ) )"
-
-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
-	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
-
-	#Fix bug 463498
-	epatch "${FILESDIR}/fix-libstdc++-underlinking.patch"
-
-	# Patch for pkg-config-0.28 (Bug 455040)
-	epatch "${FILESDIR}"/missing-openssl-include.patch
-
-	# 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
-
-	# work around divert() issues with newer autoconf, bug #281697
-	if has_version '>=sys-devel/autoconf-2.64' ; then
-		sed -i -r \
-			-e 's:^((m4_)?divert)[(]([0-9]*)[)]:\1(600\3):' \
-			$(grep -l divert $(find . -name '*.m4') configure.in) || die
-	fi
-	eautoreconf --force -W no-cross
-}
-
-src_configure() {
-	addpredict /usr/share/snmp/mibs/.index
-	addpredict /var/lib/net-snmp/mib_indexes
-
-	PHP_DESTDIR="/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 )
-	$(use_enable calendar calendar )
-	$(use_enable ctype ctype )
-	$(use_with curl curl )
-	$(use_with curlwrappers curlwrappers )
-	$(use_enable xml dom )
-	$(use_with enchant enchant /usr)
-	$(use_enable exif exif )
-	$(use_enable fileinfo fileinfo )
-	$(use_enable filter filter )
-	$(use_enable ftp ftp )
-	$(use_with nls gettext )
-	$(use_with gmp gmp )
-	$(use_enable hash hash )
-	$(use_with mhash mhash )
-	$(use_with iconv iconv )
-	$(use_enable intl intl )
-	$(use_enable ipv6 ipv6 )
-	$(use_enable json json )
-	$(use_with kerberos kerberos /usr)
-	$(use_enable xml libxml )
-	$(use_enable unicode mbstring )
-	$(use_with crypt mcrypt )
-	$(use_with mssql mssql )
-	$(use_with unicode onig /usr)
-	$(use_with ssl openssl )
-	$(use_with ssl openssl-dir /usr)
-	$(use_enable pcntl pcntl )
-	$(use_enable phar phar )
-	$(use_enable pdo pdo )
-	$(use_with postgres pgsql )
-	$(use_enable posix posix )
-	$(use_with spell pspell )
-	$(use_with recode recode )
-	$(use_enable simplexml simplexml )
-	$(use_enable sharedmem shmop )
-	$(use_with snmp snmp )
-	$(use_enable soap soap )
-	$(use_enable sockets sockets )"
-	if version_is_at_least 5.3.16-r2; then
-		my_conf+=" $(use_with sqlite2 sqlite /usr) "
-		use sqlite2 && my_conf+=" $(use_enable unicode sqlite-utf8)"
-	else
-		my_conf+=" $(use_with sqlite sqlite /usr) "
-		use sqlite && my_conf+=" $(use_enable unicode sqlite-utf8)"
-	fi
-	my_conf+="
-	$(use_with sqlite sqlite3 /usr)
-	$(use_with sybase-ct sybase-ct /usr)
-	$(use_enable sysvipc sysvmsg )
-	$(use_enable sysvipc sysvsem )
-	$(use_enable sysvipc sysvshm )
-	$(use_with tidy tidy )
-	$(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 )
-	$(use_enable zip zip )
-	$(use_with zlib zlib )
-	$(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 )
-	$(use_enable flatfile flatfile )
-	$(use_with gdbm gdbm )
-	$(use_enable inifile inifile )
-	$(use_with qdbm qdbm )"
-
-	# Support for the GD graphics library
-	my_conf+="
-	$(use_with truetype freetype-dir /usr)
-	$(use_with truetype t1lib /usr)
-	$(use_enable cjk gd-jis-conv )
-	$(use_with gd jpeg-dir /usr)
-	$(use_with gd png-dir /usr)
-	$(use_with xpm xpm-dir /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 )
-		$(use_with ssl imap-ssl )"
-	fi
-
-	# Interbase/firebird support
-
-	if use firebird ; then
-		my_conf+="
-		$(use_with firebird interbase /usr)"
-	fi
-
-	# LDAP support
-	if use ldap ; then
-		my_conf+="
-		$(use_with ldap ldap )
-		$(use_with ldap-sasl ldap-sasl )"
-	fi
-
-	# MySQL support
-	if use mysql ; then
-		if use mysqlnd ; then
-			my_conf+="
-			$(use_with mysqlnd mysql mysqlnd)"
-		else
-			my_conf+="
-			$(use_with mysql mysql /usr)"
-		fi
-		my_conf+="
-		$(use_with mysql mysql-sock /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 /usr/bin/mysql_config)"
-	fi
-
-	# ODBC support
-	if use odbc ; then
-		my_conf+="
-		$(use_with odbc unixODBC /usr)"
-	fi
-
-	if use iodbc ; then
-		my_conf+="
-		$(use_with iodbc iodbc /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 /usr)"
-		fi
-		my_conf+="
-		$(use_with postgres pdo-pgsql )
-		$(use_with sqlite pdo-sqlite /usr)
-		$(use_with odbc pdo-odbc unixODBC,/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 )
-	$(use_with libedit libedit )"
-
-	# Session support
-	if use session ; then
-		my_conf+="
-		$(use_with sharedmem mm )"
-	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=/usr --with-pcre-dir=/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=/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"
-}
-
-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 /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 /etc/make.conf"
-	ewarn "Both versions of php.ini can be found in /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.4.17.ebuild b/dev-lang/php/php-5.4.17.ebuild
deleted file mode 100644
index ae6500b85c42..000000000000
--- a/dev-lang/php/php-5.4.17.ebuild
+++ /dev/null
@@ -1,794 +0,0 @@
-# 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.17.ebuild,v 1.15 2014/02/08 08:55:01 olemarkus Exp $
-
-EAPI=5
-
-inherit eutils autotools flag-o-matic versionator depend.apache apache-module db-use libtool
-
-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 tidy +tokenizer truetype unicode wddx
-	+xml xmlreader xmlwriter xmlrpc xpm xslt zip zlib"
-
-DEPEND="
-	>=app-admin/eselect-php-0.7.0[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 ) )"
-
-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"
-
-	# 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 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 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"
-}
-
-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
-}