Update PHP ebuilds, fix various (security) issues.

(Portage version: 2.1.1_pre2-r6)
 (Unsigned Manifest commit)

5 files changed, 66 insertions, 648 deletions

diff --git a/dev-lang/php/Manifest b/dev-lang/php/Manifest
index 0ded33a17cff..7cc269b8c324 100644
--- a/dev-lang/php/Manifest
+++ b/dev-lang/php/Manifest
@@ -14,79 +14,95 @@ AUX 70_mod_php5.conf-apache2 494 RMD160 52b3137709eaa38a5a024d8d76f9970ca49b5485
 MD5 acdac68b3a1afd99aaf37e818bc921e3 files/70_mod_php5.conf-apache2 494
 RMD160 52b3137709eaa38a5a024d8d76f9970ca49b5485 files/70_mod_php5.conf-apache2 494
 SHA256 d6755b60c2d22b315e3affe501a5c4883180736d3b46839b89334a1123ecfe52 files/70_mod_php5.conf-apache2 494
+AUX 70_mod_php5_concurr.conf-apache2 418 RMD160 ac51fe704fa914f5cf393ec0c03983b17f1518c9 SHA1 3dfd5ff01a696514474c606ab497f5f889253160 SHA256 930ddc687ba2a6d6780c0b1bae0c6a1396a28ec24ad24325b008a25c40417f12
+MD5 46c230279f07151d87ac86a7cad00db9 files/70_mod_php5_concurr.conf-apache2 418
+RMD160 ac51fe704fa914f5cf393ec0c03983b17f1518c9 files/70_mod_php5_concurr.conf-apache2 418
+SHA256 930ddc687ba2a6d6780c0b1bae0c6a1396a28ec24ad24325b008a25c40417f12 files/70_mod_php5_concurr.conf-apache2 418
+AUX 70_mod_php_concurr.conf-apache2 333 RMD160 d424ee9529e4e34b841aad66138c2513592c8fe0 SHA1 1f7a50895a3d1c3c69012475a8cd261c40517b63 SHA256 a0af540e445efc72cf09d8937f17fbd84559dadf54f2bfc6ed1fd01e46d29269
+MD5 8806daf703ac88d66ae6b1a3eeb97096 files/70_mod_php_concurr.conf-apache2 333
+RMD160 d424ee9529e4e34b841aad66138c2513592c8fe0 files/70_mod_php_concurr.conf-apache2 333
+SHA256 a0af540e445efc72cf09d8937f17fbd84559dadf54f2bfc6ed1fd01e46d29269 files/70_mod_php_concurr.conf-apache2 333
+AUX php4-ldvs 22 RMD160 e70c565b3930d9d9e3253062b7c633346cb99a63 SHA1 8c66355dfb80e2ecc6ee6faae30bf7dbb1727651 SHA256 4aee18478b09cda7e925ccde157db6099ea0122b5c4efb0868e3761b65688dde
+MD5 abaacd6115552db702b3a8df140d107d files/php4-ldvs 22
+RMD160 e70c565b3930d9d9e3253062b7c633346cb99a63 files/php4-ldvs 22
+SHA256 4aee18478b09cda7e925ccde157db6099ea0122b5c4efb0868e3761b65688dde files/php4-ldvs 22
+AUX php5-ldvs 22 RMD160 5846dab2745b68a88175dd4e72d0b8cf4756dd46 SHA1 592398c92575adb14ec972847ce2aca28a7b9c2c SHA256 b79d0e52b1b3b4543b31ad45525ae1c2814a27ea8e676772ab10bf6fb12dfe79
+MD5 9b26422d0bda7252a77a81d1b734e1bd files/php5-ldvs 22
+RMD160 5846dab2745b68a88175dd4e72d0b8cf4756dd46 files/php5-ldvs 22
+SHA256 b79d0e52b1b3b4543b31ad45525ae1c2814a27ea8e676772ab10bf6fb12dfe79 files/php5-ldvs 22
 DIST hardening-patch-4.3.11-0.4.3-gentoo.patch.gz 85180 RMD160 abc0ce0ee3020c9ec67ac595531c0fae13c8d351 SHA1 ef536a5379819f8bd9e11d7c02d1067ce093621b SHA256 103e80cb39fc1a5b6b93e9d5faf9842ea1e1a7847cfc868369325f80421d29c7
-DIST hardening-patch-4.4.2-0.4.11-gentoo.patch.gz 59715 RMD160 bc1131fbb8d9e53fe8ced94ff32aa3f7399bcfd0 SHA1 a41033e521bf724b69eabff57d0ffb428dc627fc SHA256 c3b440478724e2798e18c4082d95c0b2b48203c7ebe2fd483cf2f24f9317d1b7
+DIST hardening-patch-4.4.2-0.4.11-gentoo-r1.patch.gz 59709 RMD160 6bd005bda596ff2690f5ee2563b2708671948c7c SHA1 2817cf27bc35abe5b5c02f277c2910282ae74c9c SHA256 3e938f8f62322b061acbcc6f900c249b0dee0a8672557c7cbce3513c44f4dc04
 DIST hardening-patch-4.4.2-0.4.8-gentoo.patch.gz 59792 RMD160 87c5234a6e70b3f24b20227e891e4f878b9e55a8 SHA1 96e2b44f98b178e991bb42f145230c6ac925efed SHA256 31a8aec0f46cd34079179a32e1b8033891d9cb0e5cbd53ef9d56848b48c1f1f9
 DIST hardening-patch-4.4.2-0.4.9-gentoo.patch.gz 59219 RMD160 6802aa02189489cf1e713dfde02039f888992507 SHA1 82c98c98536ba0e5a6c8de085de39b20c9e5adc9 SHA256 1a1affd04f234567cf049265fe62e9a2c3bde99193e6e17d5f8c010b04075760
 DIST hardening-patch-5.0.5-0.4.8-gentoo.patch.gz 57864 RMD160 f68e2870ef56f005ae062f53053ecffd87b2059d SHA1 3f69694a541c9014c5b52669c4259ce11209da7b SHA256 6d8e61ff1fa10ce238600e936de1eac665c5237482ae6c3b4db05c6b7d684a7c
-DIST hardening-patch-5.1.4-0.4.11-gentoo.patch.gz 58174 RMD160 afabbf21c5d82a9ead56b1718b4e7e6eda5eb6b6 SHA1 392d6150ae4823977763b43d954f01355c9975ff SHA256 4f0bdc6de6b00333c7678b4bebeb1a9de7f6987413707956b6a7e099ebe1089e
+DIST hardening-patch-5.1.4-0.4.11-gentoo-r1.patch.gz 58168 RMD160 8fe4085261c939944567a796e4be8d0af9fc4a66 SHA1 3b99af61fccc566e4a8170198900012f4524b74a SHA256 fd07ac145966e931f961c392ca087a2a7e93ba9c6bcc0ff382ca80d5019480d6
 DIST hardening-patch-5.1.4-0.4.9-gentoo.patch.gz 57671 RMD160 c9e16019388d55a17d1c198f24492d7d07d68847 SHA1 260a47db36bdab64f122d6fa67234110047b9341 SHA256 f877989c03d13bb3b51e9af4e9a67d535da35784ceabd19dcd85be64ff6b9efa
 DIST php-4.3.11.tar.bz2 4012575 RMD160 fe44f6c2783ddd469b94744e440e836cff3329e5 SHA1 617ce50bb125ee841f71e67638c492999cd3bd18 SHA256 6b133db9ac17d4e1f393003683c1b4d15dff3197559c85fd8dd63ba4868a21c5
 DIST php-4.4.2.tar.bz2 4371185 RMD160 cbef0fa4e233529422bc0944dcfb79d866013f5e SHA1 88f2e9efff0add8d8e3034d4ce3a948429b88756 SHA256 a2024d665125a41611eb64451648d37a81e3579594c8810bb41ac8b2b63f81eb
 DIST php-5.0.5.tar.bz2 4895556 RMD160 6a9a892affba229770154407860cd1c2a098eaf9 SHA1 ffcc050f879265eb96f2c8dc79fa895047da9d4a SHA256 aa63e769059d2452b153db6d4e6b421228d0606cbe8b11ace00e4c1b5c2cdc4f
 DIST php-5.1.4.tar.bz2 6356171 RMD160 d4ab11884a3a899f21eef777767a553cf81584ce SHA1 83d4c5a4a3e8f3bcb0da841edd8d55893dbf5394 SHA256 b55253e9557eceb901d83217ec192da22c28c7b2fdf714d3f151f1db663b5a32
-DIST php-patchset-4.3.11-r2.tar.bz2 27051 RMD160 0c0fa32570cd79eb0ce59b308fdb38c68c58280a SHA1 bff2ed9d03fa257253449d6a7e7d0d8a3bd99fb5 SHA256 4235ac9ac8104fdcd39d11774de6c24493e6e94df7f840f69925430fec3b0d39
+DIST php-patchset-4.3.11-r3.tar.bz2 27977 RMD160 a99c2eecca8e6e51cdb2f66e7da2d0a446fb8d50 SHA1 9c229a70b52db40e752be8f0557865d8ec602f40 SHA256 4b93cdebc3034e81d9c589e90fdf93e84ea67712a56afaad5b0b299edfe6d76b
 DIST php-patchset-4.4.2-r1.tar.bz2 13774 RMD160 95db8755a8d5d8972bc8bf5ecaf8740663f910d5 SHA1 23c63e357ce9e3d5015430da288ce805bff5bee5 SHA256 8106995c3243c604434cb4b4fdafc04db0e3604eccb7ba487724f44b892252e4
 DIST php-patchset-4.4.2-r3.tar.bz2 18063 RMD160 d7a06bb5cc4cff88e943c85f73adea92ed7eb4a7 SHA1 855351e32fc972a5585d913e37d98a5a2c653ec4 SHA256 203918cf6e984266196748342cdeaa1d30e1ecb971376e0a5d2aff09428538ac
-DIST php-patchset-4.4.2-r6.tar.bz2 20884 RMD160 c8376d9736edb3a59a525022eee9c0a7a5f2a359 SHA1 55571c284015964b80d6d6116e65c7558d91f97b SHA256 4a422da2b609819a8d95b11e2245e9bfa1440d25e481d4808bfc7d270382480e
-DIST php-patchset-5.0.5-r2.tar.bz2 20314 RMD160 2a929a6eb9f5e8a9e01c26b6304f7c60e4c1bf7d SHA1 fcd5149a826a04f1df85e2689745a02aa161c350 SHA256 46bfe8d324b28dbfc8c9399bf6c1f2ef3e44cca7b97e08a9083f986002482309
+DIST php-patchset-4.4.2-r7.tar.bz2 24079 RMD160 9bd72618cb3ac7584bcbf5f41c7c7926590bc85b SHA1 3a1704b7c374ca79a9ba14f7287e8c1122380037 SHA256 44c976ee3df7b99ed014a1579264cdd069e9bd57efa2757ee4e06112d073fc5b
+DIST php-patchset-5.0.5-r3.tar.bz2 20910 RMD160 0f78808e3fe15568d5670ad852ed218589949aea SHA1 54d9edc8e8becc1b0822f30b784f029eb5417db3 SHA256 b4df50e7a857eea4072c0b7cde1585409eaebec8f64474d6c1611c5b9869c7f2
 DIST php-patchset-5.1.4-r1.tar.bz2 7330 RMD160 ed33ee236286539a0614709d944ac636b84bca45 SHA1 acf60f1f750cb8c2a42d0b5478cf295c2c5a37ea SHA256 5a780b331343fa1fb6c3c4a76bf87e24e586ca2f41c5cd3824291f1b0037e961
-DIST php-patchset-5.1.4-r4.tar.bz2 13600 RMD160 2e47fb1a0d587c3b70f30d44f00ca122a58e1bb9 SHA1 9fad1b706ccf1cbc624594827fdd7a05b3369718 SHA256 4aa7df8cec6067a42a595600f3cef5b82e2bc1c7ab5999f9bca65d37ea1934a9
+DIST php-patchset-5.1.4-r5.tar.bz2 21025 RMD160 ebe867eff66440c1714ac2cb87c11ee17f15d8ea SHA1 c0d23e0437878a54c8c06790cfe71de940ca2fa8 SHA256 8d682d0b26dcbd5ee420bc2c2e1483a68a34ede6eecf7ae83f1ea9ca36a6c57f
 DIST php-pcrelib-new-secpatch.tar.bz2 357619 RMD160 1748ef9837f3f5ce7ad81f0dd751b430c8c2c6f6 SHA1 040bf3344d68fff3eb1829a2a02586499de5c2ee SHA256 7c49aa2c6be704b576720673fa123febdddc541d8152ccacea5cb2c9d1560a19
-EBUILD php-4.3.11-r5.ebuild 8652 RMD160 e6558c2497d4b1f445cd2f7b89a5478ff2f9e8c3 SHA1 f31934e18afa6592edcd85b049eb619f8a3c6e22 SHA256 c905511bc92efa27b7ab8a90e12afb6b9805535886e3d98ef60ce4b630d333c3
-MD5 3e824764c60fef03dbed55f3ca841099 php-4.3.11-r5.ebuild 8652
-RMD160 e6558c2497d4b1f445cd2f7b89a5478ff2f9e8c3 php-4.3.11-r5.ebuild 8652
-SHA256 c905511bc92efa27b7ab8a90e12afb6b9805535886e3d98ef60ce4b630d333c3 php-4.3.11-r5.ebuild 8652
-EBUILD php-4.4.2-r2.ebuild 7949 RMD160 c54b056709e6a71d8f51f234be13744237e6a9e9 SHA1 354e64cd559994960084db95116c410a93f956d6 SHA256 eb92d5e667057607d01766e1def4b8f9110653ba25349a943e66b4bce5cdff43
-MD5 bdf0d2a2b1efc3b3713dc1616d986f7b php-4.4.2-r2.ebuild 7949
-RMD160 c54b056709e6a71d8f51f234be13744237e6a9e9 php-4.4.2-r2.ebuild 7949
-SHA256 eb92d5e667057607d01766e1def4b8f9110653ba25349a943e66b4bce5cdff43 php-4.4.2-r2.ebuild 7949
-EBUILD php-4.4.2-r5.ebuild 8089 RMD160 9baf6828a166248412d31119d90add70ea81c497 SHA1 199a36d82f1db3bb3c98c0f0b1683cb2370ebc7a SHA256 f8c831f72b962efce3edf174ad45f7eb1ade9f564b43d26e18405427809f6c76
-MD5 fa7939e94d9f416cf39e509632919a64 php-4.4.2-r5.ebuild 8089
-RMD160 9baf6828a166248412d31119d90add70ea81c497 php-4.4.2-r5.ebuild 8089
-SHA256 f8c831f72b962efce3edf174ad45f7eb1ade9f564b43d26e18405427809f6c76 php-4.4.2-r5.ebuild 8089
-EBUILD php-4.4.2.ebuild 7933 RMD160 9d30635459a6a92fd23004a199af951b60f55ee7 SHA1 db47b8992cc9fa7a7faff253a901505feea7b060 SHA256 df5e713f9b0594e3eb502b35f8e9a1dacaaa8f57ae283d6e501cba402e698688
-MD5 9e8c6aef09379d067a45c2789144d2b3 php-4.4.2.ebuild 7933
-RMD160 9d30635459a6a92fd23004a199af951b60f55ee7 php-4.4.2.ebuild 7933
-SHA256 df5e713f9b0594e3eb502b35f8e9a1dacaaa8f57ae283d6e501cba402e698688 php-4.4.2.ebuild 7933
-EBUILD php-5.0.5-r5.ebuild 4749 RMD160 aa88aa4ab830a5020e0768e3dfd78655c44acc56 SHA1 6f5cd04de2982a7271ee65f67bd95d3236c98d65 SHA256 c585546685722ce6c76d1257cf8fb5a066c04f8d7d3e88382d78d9c3d754bc3c
-MD5 46a04ed25ecd9fd3893a08b42c11a04f php-5.0.5-r5.ebuild 4749
-RMD160 aa88aa4ab830a5020e0768e3dfd78655c44acc56 php-5.0.5-r5.ebuild 4749
-SHA256 c585546685722ce6c76d1257cf8fb5a066c04f8d7d3e88382d78d9c3d754bc3c php-5.0.5-r5.ebuild 4749
-EBUILD php-5.1.4-r3.ebuild 8097 RMD160 00926fc15145e37168f0a139e67e89b3d947adab SHA1 61c44856411bd06fe153d57a0136c2eb982f5944 SHA256 83559613bbb95752d6123c900622cabe5c11d854734f7ab3d93f9ab6f8e1016c
-MD5 1600ad9936c253d9184a100bf8fe7ece php-5.1.4-r3.ebuild 8097
-RMD160 00926fc15145e37168f0a139e67e89b3d947adab php-5.1.4-r3.ebuild 8097
-SHA256 83559613bbb95752d6123c900622cabe5c11d854734f7ab3d93f9ab6f8e1016c php-5.1.4-r3.ebuild 8097
-EBUILD php-5.1.4.ebuild 7951 RMD160 10922d2e8ce9c7811f466d39dd88ae0f858917b4 SHA1 dd2d74a2a140e1ed2a88c8f907e65f5e02afab9c SHA256 2b4f88fd08a27b43487983988ca2dd2d920afa2e893c517a368b621877e4be2a
-MD5 5b77b677d05490e25b33227632a1df9b php-5.1.4.ebuild 7951
-RMD160 10922d2e8ce9c7811f466d39dd88ae0f858917b4 php-5.1.4.ebuild 7951
-SHA256 2b4f88fd08a27b43487983988ca2dd2d920afa2e893c517a368b621877e4be2a php-5.1.4.ebuild 7951
-MISC ChangeLog 22316 RMD160 30072b9638678bde22b9dc6227ace29b4db384b4 SHA1 a1c6cc191257c89c41f00b24711ecf8964900ebb SHA256 683456130c1752d28c5567f1662b9cd2c84e7b956caea1e30fc074ff1a9acc1d
-MD5 959da530119a0f9605f0c3b15212f969 ChangeLog 22316
-RMD160 30072b9638678bde22b9dc6227ace29b4db384b4 ChangeLog 22316
-SHA256 683456130c1752d28c5567f1662b9cd2c84e7b956caea1e30fc074ff1a9acc1d ChangeLog 22316
+EBUILD php-4.3.11-r5.ebuild 14932 RMD160 3e16bd4b3dddb7604c580c732c5404501dfa386d SHA1 b379fb23c05bd696cea5b4c0f0bd062bc510e092 SHA256 13f0d92a69d193a7b818f017f08b2afaa13562188ad699bd372f456b57f7ea00
+MD5 c58e7cbb6eeebb0ba7490051f415adcf php-4.3.11-r5.ebuild 14932
+RMD160 3e16bd4b3dddb7604c580c732c5404501dfa386d php-4.3.11-r5.ebuild 14932
+SHA256 13f0d92a69d193a7b818f017f08b2afaa13562188ad699bd372f456b57f7ea00 php-4.3.11-r5.ebuild 14932
+EBUILD php-4.4.2-r2.ebuild 14573 RMD160 e446613c7105b01f561ae21f3aa8976541e7c34d SHA1 36ef0a3de0a67f2d5d7403d8a189ef543cfa42f8 SHA256 9e5f1a0b2488e632aa6215d7fa9fcf609e058c13b50ffd5490d0838eb520b95f
+MD5 dca718cf80b3f6983ce283c9ccadf597 php-4.4.2-r2.ebuild 14573
+RMD160 e446613c7105b01f561ae21f3aa8976541e7c34d php-4.4.2-r2.ebuild 14573
+SHA256 9e5f1a0b2488e632aa6215d7fa9fcf609e058c13b50ffd5490d0838eb520b95f php-4.4.2-r2.ebuild 14573
+EBUILD php-4.4.2-r6.ebuild 14584 RMD160 fe275251d7d69f348cea8aecee367dd6c7639562 SHA1 ddaa2914df5d423708cd54f9d9c4b5471c9f705c SHA256 1d92ac656663d17d82daa54bc5530b878a61e6947ba47783d2f45c10eee05f6d
+MD5 b0d11682c1b2c17328cd93a46de89352 php-4.4.2-r6.ebuild 14584
+RMD160 fe275251d7d69f348cea8aecee367dd6c7639562 php-4.4.2-r6.ebuild 14584
+SHA256 1d92ac656663d17d82daa54bc5530b878a61e6947ba47783d2f45c10eee05f6d php-4.4.2-r6.ebuild 14584
+EBUILD php-4.4.2.ebuild 14557 RMD160 656544e23793a24bf5e1c0e34ae0f24f3dba4943 SHA1 d9a0e2bea5ef0d64b1afca77d37a3dfe1daba18c SHA256 4c28ffa8191833bce49ce34326ada3a7f546ff8cbb22d1eaf34126ff4edadacc
+MD5 3df04e0d18d67b67873ecfa96bf98c23 php-4.4.2.ebuild 14557
+RMD160 656544e23793a24bf5e1c0e34ae0f24f3dba4943 php-4.4.2.ebuild 14557
+SHA256 4c28ffa8191833bce49ce34326ada3a7f546ff8cbb22d1eaf34126ff4edadacc php-4.4.2.ebuild 14557
+EBUILD php-5.0.5-r5.ebuild 10457 RMD160 1de8d8592ff54acb7f7dda7fe0787313269b7a8e SHA1 0aa0a4020aebb385416121c8a1f76648fdb399ee SHA256 bfd45e6bcc1953f14417708964f6c4658e025723242119d4d97d1fd25267b12a
+MD5 24659d9e0a293e8c5d9f348a7b5e9bcf php-5.0.5-r5.ebuild 10457
+RMD160 1de8d8592ff54acb7f7dda7fe0787313269b7a8e php-5.0.5-r5.ebuild 10457
+SHA256 bfd45e6bcc1953f14417708964f6c4658e025723242119d4d97d1fd25267b12a php-5.0.5-r5.ebuild 10457
+EBUILD php-5.1.4-r4.ebuild 14592 RMD160 e451531b84d2ebd0cf10d1a83c3c1bd469a5a46f SHA1 86d4f3f2de53a65938dbb1f0c0bf22cafd0a47bd SHA256 193b5d1d094b0bebec31a559a39579a3aa000ee37cd6070b3a143ea60dc3dfc5
+MD5 48571274839f8318a4f33bcd1e1cb02b php-5.1.4-r4.ebuild 14592
+RMD160 e451531b84d2ebd0cf10d1a83c3c1bd469a5a46f php-5.1.4-r4.ebuild 14592
+SHA256 193b5d1d094b0bebec31a559a39579a3aa000ee37cd6070b3a143ea60dc3dfc5 php-5.1.4-r4.ebuild 14592
+EBUILD php-5.1.4.ebuild 14575 RMD160 5dbfcc9c82324f918d1ba4ccee423a22d447b8ef SHA1 efe7877584e1cf9dc958f6a474ebf7c5a31fead0 SHA256 774134b6262e999a01ed4067a21d3b315c0efa03d3838d9440dfc19c76def26b
+MD5 57fe11eb4ede6ef93cd0cdc385f50717 php-5.1.4.ebuild 14575
+RMD160 5dbfcc9c82324f918d1ba4ccee423a22d447b8ef php-5.1.4.ebuild 14575
+SHA256 774134b6262e999a01ed4067a21d3b315c0efa03d3838d9440dfc19c76def26b php-5.1.4.ebuild 14575
+MISC ChangeLog 22988 RMD160 5ecf11e2af978004f73ab5f53974cf14a508b6e1 SHA1 8ec26328fe0f8518def6aaccbe53fbd5a052187c SHA256 718980fb773c15553da124e57e63611dd287bd40112322bdd552fb0a5c9ce33f
+MD5 31401ccce8cfab2d508ee70771873f99 ChangeLog 22988
+RMD160 5ecf11e2af978004f73ab5f53974cf14a508b6e1 ChangeLog 22988
+SHA256 718980fb773c15553da124e57e63611dd287bd40112322bdd552fb0a5c9ce33f ChangeLog 22988
 MISC metadata.xml 157 RMD160 a98db3a086fae3c09a903dadbc05f60443ec4b1a SHA1 ddaa23cc35eb917bf8962b652442bebb1ce0f440 SHA256 54f8878ca0228e380abbaa4b529806b5533a6b9b51b3b16c0909e906586a91a1
 MD5 c58d07ca1c1235bbad9bccaec96fc062 metadata.xml 157
 RMD160 a98db3a086fae3c09a903dadbc05f60443ec4b1a metadata.xml 157
 SHA256 54f8878ca0228e380abbaa4b529806b5533a6b9b51b3b16c0909e906586a91a1 metadata.xml 157
-MD5 7ac3f86eb868abf5bcb23a3a758d82dc files/digest-php-4.3.11-r5 1093
-RMD160 4de7599dea4b17a9eaee8987512ca0d2ed596c69 files/digest-php-4.3.11-r5 1093
-SHA256 9476ccfbeb934abc7dc1973013e0dc5f185246168dbd6d668c88eb6bb5365494 files/digest-php-4.3.11-r5 1093
+MD5 3abb0ee76aef69f19eb158a70fcd5be9 files/digest-php-4.3.11-r5 1093
+RMD160 e0ccf11112d9a0a198e102e5c2747e72c75a1658 files/digest-php-4.3.11-r5 1093
+SHA256 31fd63a83313d40e97257630acac6f0b2a1c910bab39076b1a851c9b6fe84802 files/digest-php-4.3.11-r5 1093
 MD5 a7ac0298702473c115fd1bd2410f0152 files/digest-php-4.4.2 807
 RMD160 e0111c53e805340c3b9e4243edd537652a2b2b9d files/digest-php-4.4.2 807
 SHA256 c6eaf4c85fa86b3254f0f61c8127956d0b8ab0c8d6292ae9cab3ebbc03f832b3 files/digest-php-4.4.2 807
 MD5 381566572947ff532f3a6434ef1a9c18 files/digest-php-4.4.2-r2 807
 RMD160 4ec2179cfbfeeee605cc0cbe58c16822a099d73f files/digest-php-4.4.2-r2 807
 SHA256 28d155fc949f922e9742f9ffa9800fe0efbcc22aa0729a93cd77c56fcfbf1f34 files/digest-php-4.4.2-r2 807
-MD5 38209bd449f610239932cc86e01f6269 files/digest-php-4.4.2-r5 810
-RMD160 a377fceab58add18e7183ddc60e416137151c63e files/digest-php-4.4.2-r5 810
-SHA256 d11aabd0fcd9a7a4b2a0682b6a44f43a4773fb9affbc05206fe35e0793928031 files/digest-php-4.4.2-r5 810
-MD5 deaf81609cd783b916a274c8d9e2c8d9 files/digest-php-5.0.5-r5 807
-RMD160 903c019620d92706e67f94a9fa313bfcdbd0c89f files/digest-php-5.0.5-r5 807
-SHA256 0581c6a261821444df13abb32b05a42a3de01bb45d8d51a4c8f12cc0f4fd0551 files/digest-php-5.0.5-r5 807
+MD5 d96dcb6c36a8d907794c8ea3008a613c files/digest-php-4.4.2-r6 819
+RMD160 0e0e73675ef2c0ac4a18d6f3e7248498303a8e3d files/digest-php-4.4.2-r6 819
+SHA256 12b893a3916430a02e6be38716485318febe1c72c9f84aca741cbefa9d3183cf files/digest-php-4.4.2-r6 819
+MD5 049755680b7454329c4332c92e1aa83e files/digest-php-5.0.5-r5 807
+RMD160 351460cebfa761c8570dfa2b8e3d096c6d0c6df9 files/digest-php-5.0.5-r5 807
+SHA256 f647a2e0bc16efd18e6f216a0abd64b2b47a4bb95159a2199255d104a2720a9b files/digest-php-5.0.5-r5 807
 MD5 78fdb982f372be33b5285f276e01f126 files/digest-php-5.1.4 804
 RMD160 f37e782353d9fa85c24e11abdd9e476c3327cd24 files/digest-php-5.1.4 804
 SHA256 5d45c4a6e90865308f6b39b50351c7c216bc961aaa19ed1b448ac193c2fe7104 files/digest-php-5.1.4 804
-MD5 abc000c4d4d1c1a44ef51d2b73a76e12 files/digest-php-5.1.4-r3 810
-RMD160 8096efc6d349c4c45836cf211be223a21404502b files/digest-php-5.1.4-r3 810
-SHA256 9b640470dedff35ff74a8b40122ae33b7a35463e5f046109b3584f11199ae6d0 files/digest-php-5.1.4-r3 810
+MD5 bdc8da5df48bab5c218ee207a4be22ee files/digest-php-5.1.4-r4 819
+RMD160 41661c49b35a90af46c63e867c2b0a82da6beff1 files/digest-php-5.1.4-r4 819
+SHA256 027d2b030bf9fa6d73c254dffb37ca42c4c1bd511c03c4b7e6271c16434a1b88 files/digest-php-5.1.4-r4 819
diff --git a/dev-lang/php/files/digest-php-4.4.2-r5 b/dev-lang/php/files/digest-php-4.4.2-r5
deleted file mode 100644
index 691148643b6f..000000000000
--- a/dev-lang/php/files/digest-php-4.4.2-r5
+++ /dev/null
@@ -1,9 +0,0 @@
-MD5 e9c07b67ddd1f068aa1bbe8021f2a83d hardening-patch-4.4.2-0.4.11-gentoo.patch.gz 59715
-RMD160 bc1131fbb8d9e53fe8ced94ff32aa3f7399bcfd0 hardening-patch-4.4.2-0.4.11-gentoo.patch.gz 59715
-SHA256 c3b440478724e2798e18c4082d95c0b2b48203c7ebe2fd483cf2f24f9317d1b7 hardening-patch-4.4.2-0.4.11-gentoo.patch.gz 59715
-MD5 28051cd9ef43490dd9727a4d442011b5 php-4.4.2.tar.bz2 4371185
-RMD160 cbef0fa4e233529422bc0944dcfb79d866013f5e php-4.4.2.tar.bz2 4371185
-SHA256 a2024d665125a41611eb64451648d37a81e3579594c8810bb41ac8b2b63f81eb php-4.4.2.tar.bz2 4371185
-MD5 a0919ddd76f6d7e7b05639755125af82 php-patchset-4.4.2-r6.tar.bz2 20884
-RMD160 c8376d9736edb3a59a525022eee9c0a7a5f2a359 php-patchset-4.4.2-r6.tar.bz2 20884
-SHA256 4a422da2b609819a8d95b11e2245e9bfa1440d25e481d4808bfc7d270382480e php-patchset-4.4.2-r6.tar.bz2 20884
diff --git a/dev-lang/php/files/digest-php-5.1.4-r3 b/dev-lang/php/files/digest-php-5.1.4-r3
deleted file mode 100644
index ed82c021e20d..000000000000
--- a/dev-lang/php/files/digest-php-5.1.4-r3
+++ /dev/null
@@ -1,9 +0,0 @@
-MD5 aad3814b698d1e2ade853fe5c68db7e5 hardening-patch-5.1.4-0.4.11-gentoo.patch.gz 58174
-RMD160 afabbf21c5d82a9ead56b1718b4e7e6eda5eb6b6 hardening-patch-5.1.4-0.4.11-gentoo.patch.gz 58174
-SHA256 4f0bdc6de6b00333c7678b4bebeb1a9de7f6987413707956b6a7e099ebe1089e hardening-patch-5.1.4-0.4.11-gentoo.patch.gz 58174
-MD5 66a806161d4a2d3b5153ebe4cd0f2e1c php-5.1.4.tar.bz2 6356171
-RMD160 d4ab11884a3a899f21eef777767a553cf81584ce php-5.1.4.tar.bz2 6356171
-SHA256 b55253e9557eceb901d83217ec192da22c28c7b2fdf714d3f151f1db663b5a32 php-5.1.4.tar.bz2 6356171
-MD5 2c4239724b3875f7629d54650e775aac php-patchset-5.1.4-r4.tar.bz2 13600
-RMD160 2e47fb1a0d587c3b70f30d44f00ca122a58e1bb9 php-patchset-5.1.4-r4.tar.bz2 13600
-SHA256 4aa7df8cec6067a42a595600f3cef5b82e2bc1c7ab5999f9bca65d37ea1934a9 php-patchset-5.1.4-r4.tar.bz2 13600
diff --git a/dev-lang/php/php-4.4.2-r5.ebuild b/dev-lang/php/php-4.4.2-r5.ebuild
deleted file mode 100644
index 1d45db465125..000000000000
--- a/dev-lang/php/php-4.4.2-r5.ebuild
+++ /dev/null
@@ -1,290 +0,0 @@
-# Copyright 1999-2006 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/php/php-4.4.2-r5.ebuild,v 1.1 2006/06/20 20:38:58 chtekk Exp $
-
-IUSE="cgi cli discard-path force-cgi-redirect"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd"
-
-# NOTE: Portage doesn't support setting PROVIDE based on the USE flags
-#		that have been enabled, so we have to PROVIDE everything for now
-#		and hope for the best
-PROVIDE="virtual/php virtual/httpd-php"
-
-# php package settings
-SLOT="4"
-MY_PHP_PV="${PV}"
-MY_PHP_P="php-${MY_PHP_PV}"
-PHP_PACKAGE=1
-
-# php patch settings
-PHP_PATCHSET_REV="6"
-HARDENEDPHP_PATCH="hardening-patch-${MY_PHP_PV}-0.4.11-gentoo.patch.gz"
-MULTILIB_PATCH="${MY_PHP_PV}/opt/php${MY_PHP_PV}-multilib-search-path.patch"
-FASTBUILD_PATCH="${MY_PHP_PV}/opt/php${MY_PHP_PV}-fastbuild.patch"
-
-inherit php4_4-sapi apache-module
-
-want_apache
-
-DESCRIPTION="The PHP language runtime engine."
-
-DEPEND="${DEPEND} app-admin/php-toolkit"
-RDEPEND="${RDEPEND} app-admin/php-toolkit"
-
-# PHP patchsets
-SRC_URI="${SRC_URI} http://gentoo.longitekk.com/php-patchset-${MY_PHP_PV}-r${PHP_PATCHSET_REV}.tar.bz2"
-
-# Hardened-PHP patch
-[[ -n "${HARDENEDPHP_PATCH}" ]] && SRC_URI="${SRC_URI} hardenedphp? ( http://gentoo.longitekk.com/${HARDENEDPHP_PATCH} )"
-
-pkg_setup() {
-	PHPCONFUTILS_AUTO_USE=""
-
-	# make sure the user has specified a SAPI
-	einfo "Determining SAPI(s) to build"
-	phpconfutils_require_any "  Enabled  SAPI:" "  Disabled SAPI:" cli cgi apache apache2
-
-	if useq apache2 ; then
-		if [[ "${APACHE_VERSION}" != "0" ]] ; then
-			if ! useq threads ; then
-				APACHE2_SAFE_MPMS="peruser prefork"
-			else
-				APACHE2_SAFE_MPMS="event leader metuxmpm perchild threadpool worker"
-			fi
-
-			ewarn
-			ewarn "If this package fails with a fatal error about Apache2 not having"
-			ewarn "been compiled with a compatible MPM, this is normally because you"
-			ewarn "need to toggle the 'threads' USE flag."
-			ewarn
-			ewarn "If 'threads' is off, try switching it on."
-			ewarn "If 'threads' is on, try switching it off."
-			ewarn
-
-			apache-module_pkg_setup
-		fi
-	fi
-
-	if useq fastbuild ; then
-		ewarn
-		ewarn "'fastbuild' attempts to build all SAPIs in a single pass."
-		ewarn "This is an experimental feature, so please rebuild PHP"
-		ewarn "without the 'fastbuild' USE flag if you experience"
-		ewarn "any problems, and then reproduce any bugs before filing"
-		ewarn "them in Gentoo's Bugzilla or bugs.php.net."
-		ewarn "If you have conclusive evidence that a bug directly"
-		ewarn "derives from 'fastbuild', please file a bug in"
-		ewarn "Gentoo's Bugzilla only."
-		ewarn
-	fi
-
-	php4_4-sapi_pkg_setup
-}
-
-php_determine_sapis() {
-	# holds the list of sapis that we want to build
-	PHPSAPIS=
-
-	if useq cli || phpconfutils_usecheck cli ; then
-		PHPSAPIS="${PHPSAPIS} cli"
-	fi
-
-	if useq cgi ; then
-		PHPSAPIS="${PHPSAPIS} cgi"
-	fi
-
-	# note - we can only build one apache sapi for now
-	# note - apache SAPI comes after the simpler cli/cgi sapis
-	if useq apache || useq apache2 ; then
-		if [[ "${APACHE_VERSION}" != "0" ]] ; then
-			PHPSAPIS="${PHPSAPIS} apache${APACHE_VERSION}"
-		fi
-	fi
-}
-
-src_compile() {
-	if useq fastbuild && [[ -n "${FASTBUILD_PATCH}" ]] ; then
-		src_compile_fastbuild
-	else
-		src_compile_normal
-	fi
-}
-
-src_compile_fastbuild() {
-	php_determine_sapis
-
-	build_cli=0
-	build_cgi=0
-	build_apache=0
-
-	for x in ${PHPSAPIS} ; do
-		case ${x} in
-			cli)
-				build_cli=1
-				;;
-			cgi)
-				build_cgi=1
-				;;
-			apache*)
-				build_apache=1
-				;;
-		esac
-	done
-
-	if [[ ${build_cli} = 1 ]] ; then
-		my_conf="${my_conf} --enable-cli"
-	else
-		my_conf="${my_conf} --disable-cli"
-	fi
-
-	if [[ ${build_cgi} = 1 ]] ; then
-		my_conf="${my_conf} --enable-cgi --enable-fastcgi"
-		phpconfutils_extension_enable "discard-path" "discard-path" 0
-		phpconfutils_extension_enable "force-cgi-redirect" "force-cgi-redirect" 0
-	else
-		my_conf="${my_conf} --disable-cgi"
-	fi
-
-	if [[ ${build_apache} = 1 ]] ; then
-		my_conf="${my_conf} --with-apxs${USE_APACHE2}=/usr/sbin/apxs${USE_APACHE2}"
-	fi
-
-	# now we know what we are building, build it
-	php4_4-sapi_src_compile
-
-	# to keep the separate php.ini files for each SAPI, we change the
-	# build-defs.h and recompile
-
-	if [[ ${build_cli} = 1 ]] ; then
-		einfo
-		einfo "Building CLI SAPI"
-		einfo
-
-		sed -e 's|^#define PHP_CONFIG_FILE_PATH.*|#define PHP_CONFIG_FILE_PATH "/etc/php/cli-php4"|g;' -i main/build-defs.h
-		sed -e 's|^#define PHP_CONFIG_FILE_SCAN_DIR.*|#define PHP_CONFIG_FILE_SCAN_DIR "/etc/php/cli-php4/ext-active"|g;' -i main/build-defs.h
-		for x in main/main.o main/main.lo main/php_ini.o main/php_ini.lo ; do
-			[[ -f ${x} ]] && rm -f ${x}
-		done
-		make sapi/cli/php || die "Unable to make CLI SAPI"
-		cp sapi/cli/php php-cli || die "Unable to copy CLI SAPI"
-	fi
-
-	if [[ ${build_cgi} = 1 ]] ; then
-		einfo
-		einfo "Building CGI SAPI"
-		einfo
-
-		sed -e 's|^#define PHP_CONFIG_FILE_PATH.*|#define PHP_CONFIG_FILE_PATH "/etc/php/cgi-php4"|g;' -i main/build-defs.h
-		sed -e 's|^#define PHP_CONFIG_FILE_SCAN_DIR.*|#define PHP_CONFIG_FILE_SCAN_DIR "/etc/php/cgi-php4/ext-active"|g;' -i main/build-defs.h
-		for x in main/main.o main/main.lo main/php_ini.o main/php_ini.lo ; do
-			[[ -f ${x} ]] && rm -f ${x}
-		done
-		make sapi/cgi/php || die "Unable to make CGI SAPI"
-		cp sapi/cgi/php php-cgi || die "Unable to copy CGI SAPI"
-	fi
-
-	if [[ ${build_apache} = 1 ]] ; then
-		einfo
-		einfo "Building apache${USE_APACHE2} SAPI"
-		einfo
-
-		sed -e "s|^#define PHP_CONFIG_FILE_PATH.*|#define PHP_CONFIG_FILE_PATH \"/etc/php/apache${APACHE_VERSION}-php4\"|g;" -i main/build-defs.h
-		sed -e "s|^#define PHP_CONFIG_FILE_SCAN_DIR.*|#define PHP_CONFIG_FILE_SCAN_DIR \"/etc/php/apache${APACHE_VERSION}-php4/ext-active\"|g;" -i main/build-defs.h
-		for x in main/main.o main/main.lo main/php_ini.o main/php_ini.lo ; do
-			[[ -f ${x} ]] && rm -f ${x}
-		done
-		make || die "Unable to build mod_php"
-	fi
-}
-
-src_compile_normal() {
-	php_determine_sapis
-
-	CLEAN_REQUIRED=0
-
-	for x in ${PHPSAPIS} ; do
-		if [[ "${CLEAN_REQUIRED}" = 1 ]] ; then
-			make clean
-		fi
-
-		PHPSAPI=${x}
-
-		case ${x} in
-			cli)
-				my_conf="--enable-cli --disable-cgi"
-				php4_4-sapi_src_compile
-				cp sapi/cli/php php-cli
-				;;
-			cgi)
-				my_conf="--disable-cli --enable-cgi --enable-fastcgi"
-				phpconfutils_extension_enable "discard-path" "discard-path" 0
-				phpconfutils_extension_enable "force-cgi-redirect" "force-cgi-redirect" 0
-				php4_4-sapi_src_compile
-				cp sapi/cgi/php php-cgi
-				;;
-			apache*)
-				my_conf="--disable-cli --with-apxs${USE_APACHE2}=/usr/sbin/apxs${USE_APACHE2}"
-				php4_4-sapi_src_compile
-				;;
-		esac
-
-		CLEAN_REQUIRED=1
-	done
-}
-
-src_install() {
-	php_determine_sapis
-
-	destdir=/usr/$(get_libdir)/php4
-
-	# let the eclass do the heavy lifting
-	php4_4-sapi_src_install
-
-	einfo
-	einfo "Installing SAPI(s) ${PHPSAPIS}"
-	einfo
-
-	for x in ${PHPSAPIS} ; do
-		PHPSAPI=${x}
-		case ${x} in
-			cli)
-				einfo "Installing CLI SAPI"
-				into ${destdir}
-				newbin php-cli php || die "Unable to install ${x} sapi"
-				php4_4-sapi_install_ini
-				;;
-			cgi)
-				einfo "Installing CGI SAPI"
-				into ${destdir}
-				dobin php-cgi || die "Unable to install ${x} sapi"
-				php4_4-sapi_install_ini
-				;;
-			apache*)
-				einfo "Installing apache${USE_APACHE2} SAPI"
-				make INSTALL_ROOT="${D}" install-sapi || die "Unable to install ${x} SAPI"
-				if [[ -n "${USE_APACHE2}" ]] ; then
-					einfo "Installing Apache2 config file for PHP4 (70_mod_php.conf)"
-					insinto ${APACHE_MODULES_CONFDIR}
-					newins "${FILESDIR}/70_mod_php.conf-apache2" "70_mod_php.conf"
-				else
-					einfo "Installing Apache config file for PHP4 (70_mod_php.conf)"
-					insinto ${APACHE_MODULES_CONFDIR}
-					newins "${FILESDIR}/70_mod_php.conf-apache1" "70_mod_php.conf"
-				fi
-				php4_4-sapi_install_ini
-				;;
-		esac
-	done
-}
-
-pkg_postinst() {
-	# Output some general info to the user
-	if useq apache || useq apache2 ; then
-		APACHE1_MOD_DEFINE="PHP4"
-		APACHE1_MOD_CONF="70_mod_php"
-		APACHE2_MOD_DEFINE="PHP4"
-		APACHE2_MOD_CONF="70_mod_php"
-		apache-module_pkg_postinst
-	fi
-	php4_4-sapi_pkg_postinst
-}
diff --git a/dev-lang/php/php-5.1.4-r3.ebuild b/dev-lang/php/php-5.1.4-r3.ebuild
deleted file mode 100644
index 77a29cdf068a..000000000000
--- a/dev-lang/php/php-5.1.4-r3.ebuild
+++ /dev/null
@@ -1,290 +0,0 @@
-# Copyright 1999-2006 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/php/php-5.1.4-r3.ebuild,v 1.1 2006/06/20 20:38:58 chtekk Exp $
-
-IUSE="cgi cli discard-path force-cgi-redirect"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd"
-
-# NOTE: Portage doesn't support setting PROVIDE based on the USE flags
-#		that have been enabled, so we have to PROVIDE everything for now
-#		and hope for the best
-PROVIDE="virtual/php virtual/httpd-php"
-
-# php package settings
-SLOT="5"
-MY_PHP_PV="${PV}"
-MY_PHP_P="php-${MY_PHP_PV}"
-PHP_PACKAGE=1
-
-# php patch settings
-PHP_PATCHSET_REV="4"
-HARDENEDPHP_PATCH="hardening-patch-${MY_PHP_PV}-0.4.11-gentoo.patch.gz"
-MULTILIB_PATCH="${MY_PHP_PV}/opt/php${MY_PHP_PV}-multilib-search-path.patch"
-FASTBUILD_PATCH="${MY_PHP_PV}/opt/php${MY_PHP_PV}-fastbuild.patch"
-
-inherit php5_1-sapi apache-module
-
-want_apache
-
-DESCRIPTION="The PHP language runtime engine."
-
-DEPEND="${DEPEND} app-admin/php-toolkit"
-RDEPEND="${RDEPEND} app-admin/php-toolkit"
-
-# PHP patchsets
-SRC_URI="${SRC_URI} http://gentoo.longitekk.com/php-patchset-${MY_PHP_PV}-r${PHP_PATCHSET_REV}.tar.bz2"
-
-# Hardened-PHP patch
-[[ -n "${HARDENEDPHP_PATCH}" ]] && SRC_URI="${SRC_URI} hardenedphp? ( http://gentoo.longitekk.com/${HARDENEDPHP_PATCH} )"
-
-pkg_setup() {
-	PHPCONFUTILS_AUTO_USE=""
-
-	# make sure the user has specified a SAPI
-	einfo "Determining SAPI(s) to build"
-	phpconfutils_require_any "  Enabled  SAPI:" "  Disabled SAPI:" cli cgi apache apache2
-
-	if useq apache2 ; then
-		if [[ "${APACHE_VERSION}" != "0" ]] ; then
-			if ! useq threads ; then
-				APACHE2_SAFE_MPMS="peruser prefork"
-			else
-				APACHE2_SAFE_MPMS="event leader metuxmpm perchild threadpool worker"
-			fi
-
-			ewarn
-			ewarn "If this package fails with a fatal error about Apache2 not having"
-			ewarn "been compiled with a compatible MPM, this is normally because you"
-			ewarn "need to toggle the 'threads' USE flag."
-			ewarn
-			ewarn "If 'threads' is off, try switching it on."
-			ewarn "If 'threads' is on, try switching it off."
-			ewarn
-
-			apache-module_pkg_setup
-		fi
-	fi
-
-	if useq fastbuild ; then
-		ewarn
-		ewarn "'fastbuild' attempts to build all SAPIs in a single pass."
-		ewarn "This is an experimental feature, so please rebuild PHP"
-		ewarn "without the 'fastbuild' USE flag if you experience"
-		ewarn "any problems, and then reproduce any bugs before filing"
-		ewarn "them in Gentoo's Bugzilla or bugs.php.net."
-		ewarn "If you have conclusive evidence that a bug directly"
-		ewarn "derives from 'fastbuild', please file a bug in"
-		ewarn "Gentoo's Bugzilla only."
-		ewarn
-	fi
-
-	php5_1-sapi_pkg_setup
-}
-
-php_determine_sapis() {
-	# holds the list of sapis that we want to build
-	PHPSAPIS=
-
-	if useq cli || phpconfutils_usecheck cli ; then
-		PHPSAPIS="${PHPSAPIS} cli"
-	fi
-
-	if useq cgi ; then
-		PHPSAPIS="${PHPSAPIS} cgi"
-	fi
-
-	# note - we can only build one apache sapi for now
-	# note - apache SAPI comes after the simpler cli/cgi sapis
-	if useq apache || useq apache2 ; then
-		if [[ "${APACHE_VERSION}" != "0" ]] ; then
-			PHPSAPIS="${PHPSAPIS} apache${APACHE_VERSION}"
-		fi
-	fi
-}
-
-src_compile() {
-	if useq fastbuild && [[ -n "${FASTBUILD_PATCH}" ]] ; then
-		src_compile_fastbuild
-	else
-		src_compile_normal
-	fi
-}
-
-src_compile_fastbuild() {
-	php_determine_sapis
-
-	build_cli=0
-	build_cgi=0
-	build_apache=0
-
-	for x in ${PHPSAPIS} ; do
-		case ${x} in
-			cli)
-				build_cli=1
-				;;
-			cgi)
-				build_cgi=1
-				;;
-			apache*)
-				build_apache=1
-				;;
-		esac
-	done
-
-	if [[ ${build_cli} = 1 ]] ; then
-		my_conf="${my_conf} --enable-cli"
-	else
-		my_conf="${my_conf} --disable-cli"
-	fi
-
-	if [[ ${build_cgi} = 1 ]] ; then
-		my_conf="${my_conf} --enable-cgi --enable-fastcgi"
-		phpconfutils_extension_enable "discard-path" "discard-path" 0
-		phpconfutils_extension_enable "force-cgi-redirect" "force-cgi-redirect" 0
-	else
-		my_conf="${my_conf} --disable-cgi"
-	fi
-
-	if [[ ${build_apache} = 1 ]] ; then
-		my_conf="${my_conf} --with-apxs${USE_APACHE2}=/usr/sbin/apxs${USE_APACHE2}"
-	fi
-
-	# now we know what we are building, build it
-	php5_1-sapi_src_compile
-
-	# to keep the separate php.ini files for each SAPI, we change the
-	# build-defs.h and recompile
-
-	if [[ ${build_cli} = 1 ]] ; then
-		einfo
-		einfo "Building CLI SAPI"
-		einfo
-
-		sed -e 's|^#define PHP_CONFIG_FILE_PATH.*|#define PHP_CONFIG_FILE_PATH "/etc/php/cli-php5"|g;' -i main/build-defs.h
-		sed -e 's|^#define PHP_CONFIG_FILE_SCAN_DIR.*|#define PHP_CONFIG_FILE_SCAN_DIR "/etc/php/cli-php5/ext-active"|g;' -i main/build-defs.h
-		for x in main/main.o main/main.lo main/php_ini.o main/php_ini.lo ; do
-			[[ -f ${x} ]] && rm -f ${x}
-		done
-		make sapi/cli/php || die "Unable to make CLI SAPI"
-		cp sapi/cli/php php-cli || die "Unable to copy CLI SAPI"
-	fi
-
-	if [[ ${build_cgi} = 1 ]] ; then
-		einfo
-		einfo "Building CGI SAPI"
-		einfo
-
-		sed -e 's|^#define PHP_CONFIG_FILE_PATH.*|#define PHP_CONFIG_FILE_PATH "/etc/php/cgi-php5"|g;' -i main/build-defs.h
-		sed -e 's|^#define PHP_CONFIG_FILE_SCAN_DIR.*|#define PHP_CONFIG_FILE_SCAN_DIR "/etc/php/cgi-php5/ext-active"|g;' -i main/build-defs.h
-		for x in main/main.o main/main.lo main/php_ini.o main/php_ini.lo ; do
-			[[ -f ${x} ]] && rm -f ${x}
-		done
-		make sapi/cgi/php || die "Unable to make CGI SAPI"
-		cp sapi/cgi/php php-cgi || die "Unable to copy CGI SAPI"
-	fi
-
-	if [[ ${build_apache} = 1 ]] ; then
-		einfo
-		einfo "Building apache${USE_APACHE2} SAPI"
-		einfo
-
-		sed -e "s|^#define PHP_CONFIG_FILE_PATH.*|#define PHP_CONFIG_FILE_PATH \"/etc/php/apache${APACHE_VERSION}-php5\"|g;" -i main/build-defs.h
-		sed -e "s|^#define PHP_CONFIG_FILE_SCAN_DIR.*|#define PHP_CONFIG_FILE_SCAN_DIR \"/etc/php/apache${APACHE_VERSION}-php5/ext-active\"|g;" -i main/build-defs.h
-		for x in main/main.o main/main.lo main/php_ini.o main/php_ini.lo ; do
-			[[ -f ${x} ]] && rm -f ${x}
-		done
-		make || die "Unable to build mod_php"
-	fi
-}
-
-src_compile_normal() {
-	php_determine_sapis
-
-	CLEAN_REQUIRED=0
-
-	for x in ${PHPSAPIS} ; do
-		if [[ "${CLEAN_REQUIRED}" = 1 ]] ; then
-			make clean
-		fi
-
-		PHPSAPI=${x}
-
-		case ${x} in
-			cli)
-				my_conf="--enable-cli --disable-cgi"
-				php5_1-sapi_src_compile
-				cp sapi/cli/php php-cli
-				;;
-			cgi)
-				my_conf="--disable-cli --enable-cgi --enable-fastcgi"
-				phpconfutils_extension_enable "discard-path" "discard-path" 0
-				phpconfutils_extension_enable "force-cgi-redirect" "force-cgi-redirect" 0
-				php5_1-sapi_src_compile
-				cp sapi/cgi/php php-cgi
-				;;
-			apache*)
-				my_conf="--disable-cli --with-apxs${USE_APACHE2}=/usr/sbin/apxs${USE_APACHE2}"
-				php5_1-sapi_src_compile
-				;;
-		esac
-
-		CLEAN_REQUIRED=1
-	done
-}
-
-src_install() {
-	php_determine_sapis
-
-	destdir=/usr/$(get_libdir)/php5
-
-	# let the eclass do the heavy lifting
-	php5_1-sapi_src_install
-
-	einfo
-	einfo "Installing SAPI(s) ${PHPSAPIS}"
-	einfo
-
-	for x in ${PHPSAPIS} ; do
-		PHPSAPI=${x}
-		case ${x} in
-			cli)
-				einfo "Installing CLI SAPI"
-				into ${destdir}
-				newbin php-cli php || die "Unable to install ${x} sapi"
-				php5_1-sapi_install_ini
-				;;
-			cgi)
-				einfo "Installing CGI SAPI"
-				into ${destdir}
-				dobin php-cgi || die "Unable to install ${x} sapi"
-				php5_1-sapi_install_ini
-				;;
-			apache*)
-				einfo "Installing apache${USE_APACHE2} SAPI"
-				make INSTALL_ROOT="${D}" install-sapi || die "Unable to install ${x} SAPI"
-				if [[ -n "${USE_APACHE2}" ]] ; then
-					einfo "Installing Apache2 config file for PHP5 (70_mod_php5.conf)"
-					insinto ${APACHE_MODULES_CONFDIR}
-					newins "${FILESDIR}/70_mod_php5.conf-apache2" "70_mod_php5.conf"
-				else
-					einfo "Installing Apache config file for PHP5 (70_mod_php5.conf)"
-					insinto ${APACHE_MODULES_CONFDIR}
-					newins "${FILESDIR}/70_mod_php5.conf-apache1" "70_mod_php5.conf"
-				fi
-				php5_1-sapi_install_ini
-				;;
-		esac
-	done
-}
-
-pkg_postinst() {
-	# Output some general info to the user
-	if useq apache || useq apache2 ; then
-		APACHE1_MOD_DEFINE="PHP5"
-		APACHE1_MOD_CONF="70_mod_php5"
-		APACHE2_MOD_DEFINE="PHP5"
-		APACHE2_MOD_CONF="70_mod_php5"
-		apache-module_pkg_postinst
-	fi
-	php5_1-sapi_pkg_postinst
-}