Sync with overlay, fix security issues and other bugs.

(Portage version: 2.1_pre10-r2)
 (Unsigned Manifest commit)

5 files changed, 60 insertions, 634 deletions

diff --git a/dev-lang/php/Manifest b/dev-lang/php/Manifest
index ad446a035493..61556152ca0b 100644
--- a/dev-lang/php/Manifest
+++ b/dev-lang/php/Manifest
@@ -1,64 +1,84 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-MD5 e426697735b301567a60ec9e33ee1be3 ChangeLog 19880
-RMD160 337254403c105a797ea00cea6339c8150a71a539 ChangeLog 19880
-SHA256 dc8f4baa9b5809761d28cfbb99c43679c7b57ae949afe0281449179ca798044f ChangeLog 19880
+AUX 70_mod_php.conf-apache1 454 RMD160 869b5c225782690889bdfa5227a8f46c33ac71d3 SHA1 27e7fc24e1793bacef9b9735102d335b1a5d21ff SHA256 9e6227e508f0c297f48c667e2135c7692f7943b3d0cd2ffdbdcca0bad5220343 size 454
 MD5 6171c7aa95f69b8a54b0f29bd1056d2b files/70_mod_php.conf-apache1 454
 RMD160 869b5c225782690889bdfa5227a8f46c33ac71d3 files/70_mod_php.conf-apache1 454
 SHA256 9e6227e508f0c297f48c667e2135c7692f7943b3d0cd2ffdbdcca0bad5220343 files/70_mod_php.conf-apache1 454
+AUX 70_mod_php.conf-apache2 458 RMD160 d2de515f92639d817a67c3a44db3e3dff4864974 SHA1 5ed31bd0969e17a2b74b4c5dd7665b58911bf0ab SHA256 06e3046fa7352eb2349967382bff711c01f6600688b8f49569ceacf2a31b130a size 458
 MD5 4a84c92760a7758b6446a62cabb8beed files/70_mod_php.conf-apache2 458
 RMD160 d2de515f92639d817a67c3a44db3e3dff4864974 files/70_mod_php.conf-apache2 458
 SHA256 06e3046fa7352eb2349967382bff711c01f6600688b8f49569ceacf2a31b130a files/70_mod_php.conf-apache2 458
+AUX 70_mod_php5.conf-apache1 494 RMD160 52b3137709eaa38a5a024d8d76f9970ca49b5485 SHA1 fa20572b8a8a5d646671f78be57002c31f3172cc SHA256 d6755b60c2d22b315e3affe501a5c4883180736d3b46839b89334a1123ecfe52 size 494
 MD5 acdac68b3a1afd99aaf37e818bc921e3 files/70_mod_php5.conf-apache1 494
 RMD160 52b3137709eaa38a5a024d8d76f9970ca49b5485 files/70_mod_php5.conf-apache1 494
 SHA256 d6755b60c2d22b315e3affe501a5c4883180736d3b46839b89334a1123ecfe52 files/70_mod_php5.conf-apache1 494
+AUX 70_mod_php5.conf-apache2 494 RMD160 52b3137709eaa38a5a024d8d76f9970ca49b5485 SHA1 fa20572b8a8a5d646671f78be57002c31f3172cc SHA256 d6755b60c2d22b315e3affe501a5c4883180736d3b46839b89334a1123ecfe52 size 494
 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
-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 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 4eeacf120b26f71aff4c612bd866efe3 files/digest-php-4.4.2-r1 807
-RMD160 3e876c3c34ffd53a15ea30e3c45a6ad536062df2 files/digest-php-4.4.2-r1 807
-SHA256 9dec8fe23b8d6279141f7ae97581b13d99c828c83fcff734e8f6ed7664954234 files/digest-php-4.4.2-r1 807
-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 ff8e7b70d7eb49eb7b0e6cc65d9dc6f4 files/digest-php-5.1.2 804
-RMD160 eb0553851c98b72a5b76c854255b42f6268cba96 files/digest-php-5.1.2 804
-SHA256 c5796a8c5be891a50b66433f00df75607a22c5155bfae2527f657cc870f433e4 files/digest-php-5.1.2 804
-MD5 064423a4fffb09666150214b4c0988ee files/digest-php-5.1.2-r1 804
-RMD160 15133ef29601329f0e7ed4f213ec901fdbde5a0b files/digest-php-5.1.2-r1 804
-SHA256 3426b8d138536259ef8d1aea8e9dce2efc2fb74fbb63f7ead789ffba6a8175ff files/digest-php-5.1.2-r1 804
-MD5 c58d07ca1c1235bbad9bccaec96fc062 metadata.xml 157
-RMD160 a98db3a086fae3c09a903dadbc05f60443ec4b1a metadata.xml 157
-SHA256 54f8878ca0228e380abbaa4b529806b5533a6b9b51b3b16c0909e906586a91a1 metadata.xml 157
+DIST hardening-patch-4.3.11-0.4.3-gentoo.patch.gz 85180 RMD160 abc0ce0ee3020c9ec67ac595531c0fae13c8d351 SHA256 103e80cb39fc1a5b6b93e9d5faf9842ea1e1a7847cfc868369325f80421d29c7 size 85180
+DIST hardening-patch-4.4.2-0.4.8-gentoo.patch.gz 59792 RMD160 87c5234a6e70b3f24b20227e891e4f878b9e55a8 SHA256 31a8aec0f46cd34079179a32e1b8033891d9cb0e5cbd53ef9d56848b48c1f1f9 size 59792
+DIST hardening-patch-4.4.2-0.4.9-gentoo.patch.gz 59219 RMD160 6802aa02189489cf1e713dfde02039f888992507 SHA256 1a1affd04f234567cf049265fe62e9a2c3bde99193e6e17d5f8c010b04075760 size 59219
+DIST hardening-patch-5.0.5-0.4.8-gentoo.patch.gz 57864 RMD160 f68e2870ef56f005ae062f53053ecffd87b2059d SHA256 6d8e61ff1fa10ce238600e936de1eac665c5237482ae6c3b4db05c6b7d684a7c size 57864
+DIST hardening-patch-5.1.2-0.4.8-gentoo.patch.gz 57663 RMD160 2b79a7a367b834fefd1c82268424bee35dd27474 SHA256 7e6453a9b45daf9af9d861b3907349d1d385eed7341f1c5427ab7b2a5f4794f7 size 57663
+DIST hardening-patch-5.1.4-0.4.9-gentoo.patch.gz 57671 RMD160 c9e16019388d55a17d1c198f24492d7d07d68847 SHA256 f877989c03d13bb3b51e9af4e9a67d535da35784ceabd19dcd85be64ff6b9efa size 57671
+DIST php-4.3.11.tar.bz2 4012575 RMD160 fe44f6c2783ddd469b94744e440e836cff3329e5 SHA256 6b133db9ac17d4e1f393003683c1b4d15dff3197559c85fd8dd63ba4868a21c5 size 4012575
+DIST php-4.4.2.tar.bz2 4371185 RMD160 cbef0fa4e233529422bc0944dcfb79d866013f5e SHA256 a2024d665125a41611eb64451648d37a81e3579594c8810bb41ac8b2b63f81eb size 4371185
+DIST php-5.0.5.tar.bz2 4895556 RMD160 6a9a892affba229770154407860cd1c2a098eaf9 SHA256 aa63e769059d2452b153db6d4e6b421228d0606cbe8b11ace00e4c1b5c2cdc4f size 4895556
+DIST php-5.1.2.tar.bz2 6319905 RMD160 1e21b5ba280b7efc8197802c673bb5d4e9dc9f8e SHA256 a18399360e1c5dcbdfed4f7215ae8fd2a5e057c24b86392392e832216aa63202 size 6319905
+DIST php-5.1.4.tar.bz2 5992825 RMD160 5468a7d544285438c78a8f68f1169dc22e4e8a2b SHA256 43d323b1730e2bc77ec16ee374effb38ec5be0f22e906c55c2e30dfaf22bb865 size 5992825
+DIST php-patchset-4.3.11-r2.tar.bz2 27051 RMD160 0c0fa32570cd79eb0ce59b308fdb38c68c58280a SHA256 4235ac9ac8104fdcd39d11774de6c24493e6e94df7f840f69925430fec3b0d39 size 27051
+DIST php-patchset-4.4.2-r1.tar.bz2 13774 RMD160 95db8755a8d5d8972bc8bf5ecaf8740663f910d5 SHA256 8106995c3243c604434cb4b4fdafc04db0e3604eccb7ba487724f44b892252e4 size 13774
+DIST php-patchset-4.4.2-r3.tar.bz2 18050 RMD160 8c4309da5bd260536bce7523c30bbca7d9283ee6 SHA256 c755311adff209e488b4ebce14ed900c9c9f0d518ada7280953df4ddbb301e0e size 18050
+DIST php-patchset-5.0.5-r2.tar.bz2 20314 RMD160 2a929a6eb9f5e8a9e01c26b6304f7c60e4c1bf7d SHA256 46bfe8d324b28dbfc8c9399bf6c1f2ef3e44cca7b97e08a9083f986002482309 size 20314
+DIST php-patchset-5.1.2-r1.tar.bz2 6782 RMD160 a0dcf11a29b8a0654ca158532f6865819cb2ef6f SHA256 e171ed1b1dac3571b1c72c3fb48e7d79029a99562c83e1e1242c2589aeff685e size 6782
+DIST php-patchset-5.1.4-r1.tar.bz2 7330 RMD160 ed33ee236286539a0614709d944ac636b84bca45 SHA256 5a780b331343fa1fb6c3c4a76bf87e24e586ca2f41c5cd3824291f1b0037e961 size 7330
+DIST php-pcrelib-new-secpatch.tar.bz2 357619 RMD160 1748ef9837f3f5ce7ad81f0dd751b430c8c2c6f6 SHA256 7c49aa2c6be704b576720673fa123febdddc541d8152ccacea5cb2c9d1560a19 size 357619
+EBUILD php-4.3.11-r5.ebuild 8652 RMD160 e6558c2497d4b1f445cd2f7b89a5478ff2f9e8c3 SHA1 f31934e18afa6592edcd85b049eb619f8a3c6e22 SHA256 c905511bc92efa27b7ab8a90e12afb6b9805535886e3d98ef60ce4b630d333c3 size 8652
 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
-MD5 e8d9c526749b6b372a5c34244aa33910 php-4.4.2-r1.ebuild 7946
-RMD160 47de25f1906ad30a29ff6758f02b91305a7a67f1 php-4.4.2-r1.ebuild 7946
-SHA256 37583e197256e41fdfd3119c231980cbe08b79dc037dcb510c61ec98265457bd php-4.4.2-r1.ebuild 7946
+EBUILD php-4.4.2-r2.ebuild 7946 RMD160 74bfb5c45d57313830b08b92e2706b48a97769c6 SHA1 a4283f4edf21bfe05f4b74dc6708b14602bacc0e SHA256 f1c4966346b2b605fcbc28f884e47947a84b342881f6df3e15a44cee17b22df6 size 7946
+MD5 78a74d82dd33ec3cb96186c683870d95 php-4.4.2-r2.ebuild 7946
+RMD160 74bfb5c45d57313830b08b92e2706b48a97769c6 php-4.4.2-r2.ebuild 7946
+SHA256 f1c4966346b2b605fcbc28f884e47947a84b342881f6df3e15a44cee17b22df6 php-4.4.2-r2.ebuild 7946
+EBUILD php-4.4.2.ebuild 7933 RMD160 9d30635459a6a92fd23004a199af951b60f55ee7 SHA1 db47b8992cc9fa7a7faff253a901505feea7b060 SHA256 df5e713f9b0594e3eb502b35f8e9a1dacaaa8f57ae283d6e501cba402e698688 size 7933
 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 size 4749
 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
-MD5 7c10b011d76f97e76b88d9517f3748fa php-5.1.2-r1.ebuild 7967
-RMD160 86f760cf73351bd8c97ef0887217de844d674187 php-5.1.2-r1.ebuild 7967
-SHA256 9b9dc760363e5ecdd247d5db5090419a86c35bbaa5fa656c390893ded204e743 php-5.1.2-r1.ebuild 7967
+EBUILD php-5.1.2.ebuild 7941 RMD160 ca893e8e99d26ace3c0c49a70c252422ae387d73 SHA1 4f4fd60446cb19d28c97736e214def0e10ce4998 SHA256 11bafdf5f54be4e9f9f5fc8a6a787752fb3b4478552bec8494754314afa4a071 size 7941
 MD5 133bfa02abd39422a466bb2519bcb564 php-5.1.2.ebuild 7941
 RMD160 ca893e8e99d26ace3c0c49a70c252422ae387d73 php-5.1.2.ebuild 7941
 SHA256 11bafdf5f54be4e9f9f5fc8a6a787752fb3b4478552bec8494754314afa4a071 php-5.1.2.ebuild 7941
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.2.2 (GNU/Linux)
-
-iD8DBQFESsh4AiZjviIA2XgRAli6AKCGogEMFX3ccxu/DONp8Dy3GAIOSgCeJYoP
-T1LLTWy6JHRVbanzl7DT6OI=
-=DrxF
------END PGP SIGNATURE-----
+EBUILD php-5.1.4.ebuild 7951 RMD160 fc53eea5921662b0a6dc0974db38b9825e2cdb05 SHA1 47a17f4261f0ee1f9ec20010c2489f9def19c186 SHA256 0faa6f98a45322adc6e59e3f1ee6621c04c899aa0fc8bbe46ed58909db234aaf size 7951
+MD5 baac1ccfe5e337c5c86fd4b6442a1c38 php-5.1.4.ebuild 7951
+RMD160 fc53eea5921662b0a6dc0974db38b9825e2cdb05 php-5.1.4.ebuild 7951
+SHA256 0faa6f98a45322adc6e59e3f1ee6621c04c899aa0fc8bbe46ed58909db234aaf php-5.1.4.ebuild 7951
+MISC ChangeLog 20169 RMD160 649e9128b324bcd0915dc70d9e780fc42cc1fc28 SHA1 96a90a4b8009db3c07b59107fc9203e931051214 SHA256 7057e3d82714f5ac37a8aabe41705ff14057941d6d9df1d99fffae874e1793a9 size 20169
+MD5 b6090500b40d2134c5507c4c32f45441 ChangeLog 20169
+RMD160 649e9128b324bcd0915dc70d9e780fc42cc1fc28 ChangeLog 20169
+SHA256 7057e3d82714f5ac37a8aabe41705ff14057941d6d9df1d99fffae874e1793a9 ChangeLog 20169
+MISC metadata.xml 157 RMD160 a98db3a086fae3c09a903dadbc05f60443ec4b1a SHA1 ddaa23cc35eb917bf8962b652442bebb1ce0f440 SHA256 54f8878ca0228e380abbaa4b529806b5533a6b9b51b3b16c0909e906586a91a1 size 157
+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 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 9725c80f79599a7b88dd30d0b83ccda5 files/digest-php-4.4.2-r2 807
+RMD160 ed752e77ffc0ce8d42ecca4c0ce5a8765f54291d files/digest-php-4.4.2-r2 807
+SHA256 e3c4f72c5a274e2b88f9cdedb839c767906a2b42f0eb7796277b83fc1d0c64f9 files/digest-php-4.4.2-r2 807
+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 ff8e7b70d7eb49eb7b0e6cc65d9dc6f4 files/digest-php-5.1.2 804
+RMD160 eb0553851c98b72a5b76c854255b42f6268cba96 files/digest-php-5.1.2 804
+SHA256 c5796a8c5be891a50b66433f00df75607a22c5155bfae2527f657cc870f433e4 files/digest-php-5.1.2 804
+MD5 5111ecf7db7bc8a53932daf9b7b51f9d files/digest-php-5.1.4 804
+RMD160 f2bb0efde323790a1fe29fc5ccb3caa5f2fadaa9 files/digest-php-5.1.4 804
+SHA256 a9347ffe2dabf53bb7877bdb0089134854f3eb87990facecbbf61c8443c3dc6d files/digest-php-5.1.4 804
diff --git a/dev-lang/php/files/digest-php-4.4.2-r1 b/dev-lang/php/files/digest-php-4.4.2-r1
deleted file mode 100644
index 5a2b723bcfe2..000000000000
--- a/dev-lang/php/files/digest-php-4.4.2-r1
+++ /dev/null
@@ -1,9 +0,0 @@
-MD5 fa67e075f724b5cb4701ffdd0a05e03d hardening-patch-4.4.2-0.4.8-gentoo.patch.gz 59792
-RMD160 87c5234a6e70b3f24b20227e891e4f878b9e55a8 hardening-patch-4.4.2-0.4.8-gentoo.patch.gz 59792
-SHA256 31a8aec0f46cd34079179a32e1b8033891d9cb0e5cbd53ef9d56848b48c1f1f9 hardening-patch-4.4.2-0.4.8-gentoo.patch.gz 59792
-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 4aebd7939e86bc60e447b2f9bb2d4bc2 php-patchset-4.4.2-r2.tar.bz2 14555
-RMD160 491fcc0c993530f9ac4429d44a37415c2a9a0b37 php-patchset-4.4.2-r2.tar.bz2 14555
-SHA256 9c7e9ed0044d0222745b5e30584e489e9574330aeb7964a40d1d1de757fb4bf3 php-patchset-4.4.2-r2.tar.bz2 14555
diff --git a/dev-lang/php/files/digest-php-5.1.2-r1 b/dev-lang/php/files/digest-php-5.1.2-r1
deleted file mode 100644
index c798681029ba..000000000000
--- a/dev-lang/php/files/digest-php-5.1.2-r1
+++ /dev/null
@@ -1,9 +0,0 @@
-MD5 61d534c04399b5fa1f167ec2d86351a3 hardening-patch-5.1.2-0.4.8-gentoo.patch.gz 57663
-RMD160 2b79a7a367b834fefd1c82268424bee35dd27474 hardening-patch-5.1.2-0.4.8-gentoo.patch.gz 57663
-SHA256 7e6453a9b45daf9af9d861b3907349d1d385eed7341f1c5427ab7b2a5f4794f7 hardening-patch-5.1.2-0.4.8-gentoo.patch.gz 57663
-MD5 79cee17e9db85be878000a2a4198378e php-5.1.2.tar.bz2 6319905
-RMD160 1e21b5ba280b7efc8197802c673bb5d4e9dc9f8e php-5.1.2.tar.bz2 6319905
-SHA256 a18399360e1c5dcbdfed4f7215ae8fd2a5e057c24b86392392e832216aa63202 php-5.1.2.tar.bz2 6319905
-MD5 2ba96733f6786016f367d152922d5dfb php-patchset-5.1.2-r2.tar.bz2 8278
-RMD160 320dbe43eea1025c0ec007f5eb4f1de2422cff98 php-patchset-5.1.2-r2.tar.bz2 8278
-SHA256 059b45665051b6b5434f061ec8e04ba0cc4dc15892b8572218c0cbd8c15397ab php-patchset-5.1.2-r2.tar.bz2 8278
diff --git a/dev-lang/php/php-4.4.2-r1.ebuild b/dev-lang/php/php-4.4.2-r1.ebuild
deleted file mode 100644
index dde23089bf5f..000000000000
--- a/dev-lang/php/php-4.4.2-r1.ebuild
+++ /dev/null
@@ -1,288 +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-r1.ebuild,v 1.2 2006/04/20 12:35:09 chtekk Exp $
-
-IUSE="cgi cli discard-path force-cgi-redirect"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
-
-# 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="2"
-HARDENEDPHP_PATCH="hardening-patch-${MY_PHP_PV}-0.4.8-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, which may fail to compile"
-		ewarn "and may produce PHP binaries which are broken."
-		ewarn
-		ewarn "Rebuild without 'fastbuild' and reproduce any bugs before filing"
-		ewarn "any bugs in Gentoo's Bugzilla or bugs.php.net."
-		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.2-r1.ebuild b/dev-lang/php/php-5.1.2-r1.ebuild
deleted file mode 100644
index d3c6e25e60e5..000000000000
--- a/dev-lang/php/php-5.1.2-r1.ebuild
+++ /dev/null
@@ -1,288 +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.2-r1.ebuild,v 1.3 2006/04/23 00:24:09 flameeyes 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="2"
-HARDENEDPHP_PATCH="hardening-patch-${MY_PHP_PV}-0.4.8-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, which may fail to compile"
-		ewarn "and may produce PHP binaries which are broken."
-		ewarn
-		ewarn "Rebuild without 'fastbuild' and reproduce any bugs before filing"
-		ewarn "any bugs in Gentoo's Bugzilla or bugs.php.net."
-		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
-}