remove old
authorMatti Bickel <mabi@gentoo.org>
Mon, 5 Jul 2010 23:17:04 +0000 (23:17 +0000)
committerMatti Bickel <mabi@gentoo.org>
Mon, 5 Jul 2010 23:17:04 +0000 (23:17 +0000)
Package-Manager: portage-2.1.8.3/cvs/Linux x86_64

dev-lang/php/ChangeLog
dev-lang/php/Manifest
dev-lang/php/php-5.2.10-r1.ebuild [deleted file]
dev-lang/php/php-5.2.10-r2.ebuild [deleted file]
dev-lang/php/php-5.2.10.ebuild [deleted file]
dev-lang/php/php-5.2.11-r1.ebuild [deleted file]
dev-lang/php/php-5.2.11.ebuild [deleted file]
dev-lang/php/php-5.2.12.ebuild [deleted file]
dev-lang/php/php-5.2.9-r2.ebuild [deleted file]

index 31fa2bfacb12bbc465ea7b0b3f195223dcf34fce..020e6eaf8ce2b940d40c3c9b57eb6fa5135015dc 100644 (file)
@@ -1,6 +1,11 @@
 # ChangeLog for dev-lang/php
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/php/ChangeLog,v 1.387 2010/07/05 14:10:06 mabi Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/php/ChangeLog,v 1.388 2010/07/05 23:17:04 mabi Exp $
+
+  05 Jul 2010; Matti Bickel <mabi@gentoo.org> -php-5.2.9-r2.ebuild,
+  -php-5.2.10.ebuild, -php-5.2.10-r1.ebuild, -php-5.2.10-r2.ebuild,
+  -php-5.2.11.ebuild, -php-5.2.11-r1.ebuild, -php-5.2.12.ebuild:
+  remove old
 
   05 Jul 2010; Matti Bickel <mabi@gentoo.org> php-5.3.2.ebuild:
   introduced new style virtual httpd-php (bug #319623)
index 282d45c05190f7d680ac976a80a93532a1670904..20719af754b09ff6463ddec4931c78f7da5604cb 100644 (file)
@@ -14,33 +14,13 @@ AUX eblits/src_test-v1.eblit 1480 RMD160 68ef731042ef236efee923649b318239c0219d5
 AUX php-5.2.10-pdo_dblib.patch 559 RMD160 062604e291113b2bb86044b5eeffb72fad210fbc SHA1 d59d26e6557dac86e582e1a6ed7bb4795cf150c6 SHA256 0548d63d7379cd19f7ade6ca1222b1b577f684b142ff6b0e8e23742b1f7f9794
 AUX php-5.2.12-libpng14.patch 222 RMD160 d63bd712d077d9606a02d6620c7084bca7197c01 SHA1 a25a47386d625a47698094fc4825208c6ec8f2a4 SHA256 af94a9c2a104dcb037aa059dd46b6f534adb939ea44ad4cb9e3a0a7c49b64fab
 AUX php5-ldvs 22 RMD160 5846dab2745b68a88175dd4e72d0b8cf4756dd46 SHA1 592398c92575adb14ec972847ce2aca28a7b9c2c SHA256 b79d0e52b1b3b4543b31ad45525ae1c2814a27ea8e676772ab10bf6fb12dfe79
-DIST php-5.2.10.tar.bz2 8808759 RMD160 9a9ec823eda9d6b3c085967e7a71f776071fc78f SHA1 9a287e2791d28928fb1ee1a1167290c5005feccd SHA256 d45fd9ed292ec429151a195541aa55b5d26c66531bdcdbc33e9c34f625f182ca
-DIST php-5.2.11.tar.bz2 9030787 RMD160 6aad53dee864ab89f794a9d3c2aa32d435ed5654 SHA1 819c853ce657ef260d4a73b5a21f961115b97eef SHA256 9bcd14ceda2b4bd7abcc7eb59bd74bae490d9335e4207580de783b48aa7e8f23
-DIST php-5.2.12.tar.bz2 9075161 RMD160 027f3597fd961d2a95682e2f0738415f8a911371 SHA1 6605f23b70e3db824047830f08d636e09ec10ff3 SHA256 e65756a8412726a491ca48da1e0693eaeb3f38f19fb6cbc8f53005cab1f2491a
 DIST php-5.2.13.tar.bz2 9084518 RMD160 9e21d32a7b757d25ed827834b26235ea1eebfcc8 SHA1 7127a21f1b493e3cd43f45cadecdb46b623eb1fb SHA256 2b50a2535e3bb9a98cd4d1633f9452d877276c40b385915261f040d535c7eadb
-DIST php-5.2.9.tar.bz2 10203122 RMD160 fc2b316ff05462667704027cf2a1a4ac0a238422 SHA1 1c738dbd7e3f8d723b6ce2e0fbc90a69e249f5f0 SHA256 30166dda7c3d8bdcb2753ab79260be25454cdf3673d681b7651f8d32006ee2a6
 DIST php-5.3.2.tar.bz2 10477662 RMD160 60a8aac0d51511ecaf8dcad9d31bdf072c0c99cf SHA1 79ea4ee3da3a7542d1e348ac963a5b38bcbb4b6b SHA256 9a380a574adcb3a9abe3226e7c3a9bae619e8a1b90842ec2a7edf0ad92afdeda
-DIST php-patchset-5.2.10-r0.tar.bz2 11015 RMD160 703a9f3dce390c9572c88099035a09d343e98452 SHA1 62071c0f6edb892b43ba5150a04c28deab59ef4d SHA256 f949b2ea3dc7eb1456e473b9597288def2d86e58cfe9dd4ce5a8cf25cdcd6d0c
-DIST php-patchset-5.2.10-r1.tar.bz2 11294 RMD160 1f23bbb661f40ac44ed4e39e51abc0a8d5d2b9a0 SHA1 66841d8f64058e6fdd74fb82dc686e75f5f36f6d SHA256 e32a9f08307707476dec5ad44a6923c7827d7635c2b723d3e70cc82eee1da1e3
-DIST php-patchset-5.2.11-r0.tar.bz2 10171 RMD160 f02780907f8d2fa44aba1974de4376b5e14497c0 SHA1 47586ffae72ff3966afa4cf20ae355190dbac29c SHA256 441bc612aa7e19e2a4c2fd37181fb652e84cdf002d1841ebcf2e631d0bd4cd99
-DIST php-patchset-5.2.11-r1.tar.bz2 10403 RMD160 53ce1a43697db2cf79eba89a548f52efa64c0d20 SHA1 905e1fc34be10b5ed0abe816cbce2524933559f4 SHA256 fd4f95de091cbe7d52ee3008b45a189f2158bbf861e2017b92a8a3b7a8abb32c
-DIST php-patchset-5.2.12-r0.tar.bz2 10181 RMD160 e78dc3a500838e163da4eb5853dfe539430486c3 SHA1 91244c62af3ef3a0ebd1a396dbe22d2732512c89 SHA256 ca0cb19e98cb073fa0dd9157c728a9285b97198f1b522727e040f0f00dd8255f
 DIST php-patchset-5.2.13-r0.tar.bz2 10207 RMD160 b367c17742553fcfbf4cb1b76f8dd4aae9f08cf8 SHA1 20b60e3aef34d0b558f0c896c6981957490b2ba9 SHA256 c71dad65178186786393164a0cb4f056b85f0e00579da3dc2dbe5b863ec4262b
-DIST php-patchset-5.2.9-r2.tar.bz2 17294 RMD160 1367ccf198686df2ff81408b1d6fb7096fa6790b SHA1 d5d1528aa775ff4af9251a6843a5f18bffcb4795 SHA256 ba77dab6cf96f874070afee76d1ad7b48a55a8738bc0e0bc6c54f011b9070dc1
 DIST php-patchset-5.3.2-r1.tar.bz2 9702 RMD160 40cdb57493dc44640cf0b9ab545d0206e24e2316 SHA1 c60b29edb9cc28658b8da63a82800cd90eef12d4 SHA256 5c75dd05000c90e55a11295ead6aae5aea238001d852c14cb821abd2730aef67
-DIST suhosin-patch-5.2.10-0.9.7.patch.gz 23072 RMD160 18df1686a48d652f581591115b51461e9dacf5a4 SHA1 3768bbded0bb2376414322b26308342452cb927a SHA256 51d8496172b838c4bbb40f783b535162169b5e218cd6093ecc25cfcfa0c469f8
-DIST suhosin-patch-5.2.11-0.9.7.patch.gz 23050 RMD160 0f6d442aace34c221f9fbff42a63e7f3b4489f15 SHA1 248419332131efc53f3306c2a57a4b1a9dc92cc1 SHA256 392f10c9b7d9c47f30e989fb7775cc46d36153b933bf7ac9ccd8826b2954584b
 DIST suhosin-patch-5.2.13-0.9.7.patch.gz 22989 RMD160 63a022a5bf0fb8c6688f4c0ebcfaa8a437ea6935 SHA1 e2faf8db2d7facbd44cee2f737ce87732835d341 SHA256 787743e5d201ab2ce3fcc3f252eedd7f167470fa1f55af0646d7f03aab89d184
-DIST suhosin-patch-5.2.9-0.9.7.patch.gz 23026 RMD160 1d2e01a935c4bbc9e858796f8f6004b4f75950b3 SHA1 4197644330a4f182f4dd64beb9db29406ed300ca SHA256 6f7a86cff1cdd1007ba248292f6adfe3b7c01adfed56c2e937c87c60210bbc38
 DIST suhosin-patch-5.3.2-0.9.9.1.patch.gz 40847 RMD160 64d8b7ec2ec91fd7a43b0cd95c0aa0df5b666768 SHA1 c48d3f24341d3b0214ca3e980320b23864aa93ba SHA256 a61f081022888bf78997e434744d6c0604194c73a00e70c1165524a0a6329de2
-EBUILD php-5.2.10-r1.ebuild 16745 RMD160 fe4cfc9b98bc59896b47eedd5e130ba7ff959b41 SHA1 99e861e950fba9a53ff076a6899553313cee4fc4 SHA256 dba2f96e34bf26fcd9561a531590ab2698da19ff33fe302c8c05a091c4c9300d
-EBUILD php-5.2.10-r2.ebuild 16837 RMD160 42203f775e0684373492a476cf3a80b9eb0048b1 SHA1 fbc5e68c94757e2b5f4fb6b994663132d16ce5d5 SHA256 8ed75d0f54bdd8e72ecc73c4e71a7866d6e0c569b22b3a1897fc1608e5db7ba6
-EBUILD php-5.2.10.ebuild 16724 RMD160 5647b04c6b6d44f1fb68ab531f4aaa5a80a20716 SHA1 21e7c02154fb181e1c4b301a62bba9aa6df20253 SHA256 44772c82d4532a26709c32bc50f837803f1d77b5a07335dfcd9f3be4536e1632
-EBUILD php-5.2.11-r1.ebuild 16959 RMD160 641f78e81d61c3634fa6c9d9a0abbb1109a28a8d SHA1 2b4f5477f1ebc7a532d06bf739bc09ad1191a1c6 SHA256 bc16c2a7afe8e89da0879631f566871d49e8992e040e228de2d007e2a22098ee
-EBUILD php-5.2.11.ebuild 16796 RMD160 4d55fe8a9787c726a23a426e891ceffbb44faef6 SHA1 73982a0b7fa8ec6b32f20398423fb8df55bc4584 SHA256 fac36984c24deb2d26ace5c5e99760c0b1b57c57c901e78e6be77989c2a55110
-EBUILD php-5.2.12.ebuild 16901 RMD160 42ad4d01a89392445e491f1d784a7f23028fb0dc SHA1 17f6e1da1793a06c10636e332440c37535262a7d SHA256 cbab429ae3fe5bc0fe4cb961dbb1df91be35c04f7c8340cfee39117afcfeddcc
 EBUILD php-5.2.13.ebuild 16879 RMD160 c580f3e8de5be0a3338ae3f816153c1d42b4337f SHA1 4bc3f1792d3f85a96ecbf538f97c76d1de8dda4a SHA256 811314bfdf521766794650581c963b31d81c10071311e20121e4a1ca5458a51f
-EBUILD php-5.2.9-r2.ebuild 16727 RMD160 aa0e1af3e50b550111c3d1490adc9e8ed2432b34 SHA1 1e4b46b562d74e758db1ec52751419cd02333878 SHA256 7187f6feedc92c355543713cb07218a48f1cd45e9394fa6d4a00bbe7e5b3010b
 EBUILD php-5.3.2.ebuild 9365 RMD160 afe466f09d14dc5ee20f8a55ba153500e115babe SHA1 37be3c2c873b0ac97c8f2fd0598f0af18e5ae01f SHA256 fc26ce0a37c9e2bce49b9b29fe7fa2daef76ef9075103f8e4b80eda1378ff35c
-MISC ChangeLog 67082 RMD160 28359b6ad8a0bdcd05d9ee93e4e20fa5efa4467d SHA1 48c2d66455700488adf06b4d8359783758294bdf SHA256 413fc096596900e1949c6a0cb65543584a372303e33552287d25e0885ce11393
+MISC ChangeLog 67297 RMD160 8541d264d4ba481a22267cdc63444578dc7784cd SHA1 02590c2b1813f2fa36a7881e337836ad394a584c SHA256 9b5a92f4d09b66f01d6bd1a34ec6ce2e2193fa753d30cb390fe1a5ecbab8840c
 MISC metadata.xml 2185 RMD160 2e1d4afa19f7370b62080f3f62bc0f8e525b82bd SHA1 2b758e52eb1e1130fffe162e6cd2122deaf18bf3 SHA256 8a8be20f80edd56dd9f16b90f4ff91fde426b05861e737750664223801e2c667
diff --git a/dev-lang/php/php-5.2.10-r1.ebuild b/dev-lang/php/php-5.2.10-r1.ebuild
deleted file mode 100644 (file)
index 616b231..0000000
+++ /dev/null
@@ -1,547 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/php/php-5.2.10-r1.ebuild,v 1.2 2010/01/31 19:53:09 tove Exp $
-
-CGI_SAPI_USE="discard-path force-cgi-redirect"
-APACHE2_SAPI_USE="concurrentmodphp threads"
-IUSE="cli cgi ${CGI_SAPI_USE} ${APACHE2_SAPI_USE} fastbuild"
-
-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, general
-PHP_PATCHSET_REV="${PR/r/}"
-SUHOSIN_PATCH="suhosin-patch-${MY_PHP_PV}-0.9.7.patch.gz"
-MULTILIB_PATCH="${MY_PHP_PV}/opt/multilib-search-path.patch"
-# php patch settings, ebuild specific
-FASTBUILD_PATCH="${MY_PHP_PV}/opt/fastbuild.patch"
-CONCURRENTMODPHP_PATCH="${MY_PHP_PV}/opt/concurrent_apache_modules.patch"
-# kolab patch - http://kolab.org/cgi-bin/viewcvs-kolab.cgi/server/patches/php/
-# bugs about this go to wrobel@gentoo.org
-KOLAB_PATCH="${MY_PHP_PV}/opt/kolab-imap-annotations.patch"
-
-inherit versionator php5_2-sapi apache-module
-
-# Suhosin patch support
-[[ -n "${SUHOSIN_PATCH}" ]] && SRC_URI="${SRC_URI} suhosin? ( http://gentoo.longitekk.com/${SUHOSIN_PATCH} )"
-
-DESCRIPTION="The PHP language runtime engine: CLI, CGI and Apache2 SAPIs."
-
-DEPEND="app-admin/php-toolkit
-       imap? ( >=virtual/imap-c-client-2006k )
-       pcre? ( >=dev-libs/libpcre-7.8 )
-       xml? ( >=dev-libs/libxml2-2.7.2-r2 )
-       xmlrpc? ( >=dev-libs/libxml2-2.7.2-r2 virtual/libiconv )"
-
-RDEPEND="${DEPEND}"
-if [[ -n "${KOLAB_PATCH}" ]] ; then
-       IUSE="${IUSE} kolab"
-       DEPEND="${DEPEND}
-               kolab? ( >=net-libs/c-client-2004g-r1 )"
-fi
-
-want_apache
-
-pkg_setup() {
-       PHPCONFUTILS_AUTO_USE=""
-
-       # Make sure the user has specified at least one SAPI
-       einfo "Determining SAPI(s) to build"
-       phpconfutils_require_any "  Enabled  SAPI:" "  Disabled SAPI:" cli cgi apache2
-
-       # Threaded Apache2 support
-       if use apache2 ; then
-               has_apache_threads
-       fi
-
-       # Concurrent PHP Apache2 modules support
-       if use apache2 ; then
-               if use concurrentmodphp ; then
-                       ewarn
-                       ewarn "'concurrentmodphp' makes it possible to load multiple, differently"
-                       ewarn "versioned mod_php's into the same Apache instance. This is done with"
-                       ewarn "a few linker tricks and workarounds, and is not guaranteed to always"
-                       ewarn "work correctly, so use it at your own risk. Especially, do not use"
-                       ewarn "this in conjunction with PHP modules (PECL, ...) other than the ones"
-                       ewarn "you may find in the Portage tree or the PHP Overlay!"
-                       ewarn "This is an experimental feature, so please rebuild PHP"
-                       ewarn "without the 'concurrentmodphp' 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 'concurrentmodphp', please file a bug in"
-                       ewarn "Gentoo's Bugzilla only."
-                       ewarn
-                       ebeep 5
-               fi
-       fi
-
-       # fastbuild support
-       if use 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
-
-       if use pcre ; then
-               built_with_use dev-libs/libpcre unicode || \
-                       die "Please rebuild dev-libs/libpcre with USE=unicode"
-       fi
-
-       depend.apache_pkg_setup
-       php5_2-sapi_pkg_setup
-}
-
-php_determine_sapis() {
-       # holds the list of sapis that we want to build
-       PHPSAPIS=
-
-       if use cli || phpconfutils_usecheck cli ; then
-               PHPSAPIS="${PHPSAPIS} cli"
-       fi
-
-       if use cgi ; then
-               PHPSAPIS="${PHPSAPIS} cgi"
-       fi
-
-       # note - apache SAPI comes after the simpler cli/cgi sapis
-       if use apache2 ; then
-               PHPSAPIS="${PHPSAPIS} apache${APACHE_VERSION}"
-       fi
-}
-
-src_unpack() {
-       if [[ "${PHP_PACKAGE}" == 1 ]] ; then
-               unpack ${A}
-       fi
-
-       cd "${S}"
-
-       # Concurrent PHP Apache2 modules support
-       if use apache2 ; then
-               if use concurrentmodphp ; then
-                       if [[ -n "${CONCURRENTMODPHP_PATCH}" ]] && [[ -f "${WORKDIR}/${CONCURRENTMODPHP_PATCH}" ]] ; then
-                               epatch "${WORKDIR}/${CONCURRENTMODPHP_PATCH}"
-                       else
-                               ewarn "There is no concurrent mod_php patch available for this PHP release yet!"
-                       fi
-               fi
-       fi
-
-       # fastbuild support
-       if use fastbuild ; then
-               if [[ -n "${FASTBUILD_PATCH}" ]] && [[ -f "${WORKDIR}/${FASTBUILD_PATCH}" ]] ; then
-                       epatch "${WORKDIR}/${FASTBUILD_PATCH}"
-               else
-                       ewarn "There is no fastbuild patch available for this PHP release yet!"
-               fi
-       fi
-
-       # kolab support
-       if [[ -n "${KOLAB_PATCH}" ]] ; then
-               use kolab && epatch "${WORKDIR}/${KOLAB_PATCH}"
-       fi
-
-       # pretend to not have flex, bug 221357
-       sed -re 's:( +)PHP_SUBST\(LEX\):\1LEX="exit 0;"\n\0:' -i acinclude.m4
-
-       # Now let the eclass do the rest and regenerate the configure
-       php5_2-sapi_src_unpack
-
-       # Fix Makefile.global:test to consider the CGI SAPI if present
-       if use cgi ; then
-               sed -e "s|test \! -z \"\$(top_builddir)/php-cli\" \&\& test -x \"\$(top_builddir)/php-cli\"|test \! -z \"\$(top_builddir)/php-cli\" \&\& test -x \"\$(top_builddir)/php-cli\" \&\& test \! -z \"\$(top_builddir)/php-cgi\" \&\& test -x \"\$(top_builddir)/php-cgi\"|g" -i Makefile.global
-               sed -e "s|TEST_PHP_EXECUTABLE=\"\$(top_builddir)/php-cli\"|TEST_PHP_EXECUTABLE=\"\$(top_builddir)/php-cli\" TEST_PHP_CGI_EXECUTABLE=\"\$(top_builddir)/php-cgi\"|g" -i Makefile.global
-       fi
-
-       # try to fix some test cases which fail because of sandbox otherwise
-       sed -e 's:/no/such/:.\0:' -i ext/standard/tests/file/005_error.phpt \
-               ext/standard/tests/file/006_error.phpt \
-               ext/standard/tests/file/touch.phpt
-
-       # REMOVING BROKEN TESTS:
-       # removing this test as it has been broken for ages and is not easily
-       # fixable (depends on a lot of factors)
-       rm ext/standard/tests/general_functions/phpinfo.phpt
-
-       # never worked properly, no easy fix
-       rm ext/iconv/tests/bug16069.phpt ext/iconv/tests/iconv_stream_filter.phpt
-
-       # needs write access to /tmp and others
-       rm ext/session/tests/session_save_path_variation5.phpt
-
-       # new tests since 5.2.7 which have never been working for me
-       rm ext/spl/tests/arrayObject___construct_basic4.phpt \
-               ext/spl/tests/arrayObject___construct_basic5.phpt \
-               ext/spl/tests/arrayObject_exchangeArray_basic3.phpt \
-               ext/spl/tests/arrayObject_setFlags_basic1.phpt \
-               tests/lang/bug45392.phpt
-
-       # those might as well be related to suhosin
-       rm ext/session/tests/session_decode_variation3.phpt \
-               ext/session/tests/session_encode_variation8.phpt
-
-       # missing skipif
-       use reflection || \
-               rm ext/standard/tests/directory/DirectoryClass_basic_001.phpt
-
-       # sandbox-related (sandbox checks for permissions before even looking
-       # at the fs, but the tests expect "No such file or directory"
-       sed -e 's:/blah:./bla:' -i \
-               ext/session/tests/session_save_path_variation{2,3}.phpt
-       rm ext/standard/tests/file/rename_variation13.phpt
-
-       # test passes, but run-tests.php claims failure
-       rm ext/standard/tests/file/tempnam_variation4.phpt
-
-       # these tests behave differently with suhosin enabled, adapting them...
-       use suhosin && sed -e 's:File(\.\./):File(..):g' -i \
-               tests/security/open_basedir*{.inc,.phpt}
-}
-
-src_compile() {
-       # bug 217392 (autconf-2.62 behavior changes)
-       export CFLAGS="${CFLAGS} -D_GNU_SOURCE"
-       export CXXFLAGS="${CXXFLAGS} -D_GNU_SOURCE"
-       if use 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_apache2=0
-       my_conf=""
-
-       for x in ${PHPSAPIS} ; do
-               case ${x} in
-                       cli)
-                               build_cli=1
-                               ;;
-                       cgi)
-                               build_cgi=1
-                               ;;
-                       apache2)
-                               build_apache2=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_apache2} = 1 ]] ; then
-               my_conf="${my_conf} --with-apxs2=/usr/sbin/apxs2"
-
-               # Threaded Apache2 support
-               if use threads ; then
-                       my_conf="${my_conf} --enable-maintainer-zts"
-                       ewarn "Enabling ZTS for Apache2 MPM"
-               fi
-
-               # Concurrent PHP Apache2 modules support
-               if use concurrentmodphp ; then
-                       append-ldflags "-Wl,--version-script=${FILESDIR}/php5-ldvs"
-               fi
-       fi
-
-       if use pcre || phpconfutils_usecheck pcre ; then
-               myconf="${my_conf} --with-pcre-dir=/usr"
-               phpconfutils_extension_with "pcre-regex" "pcre" 0 "/usr"
-       fi
-
-       # Now we know what we are building, build it
-       php5_2-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-cgi || die "Unable to make CGI SAPI"
-               cp sapi/cgi/php-cgi php-cgi || die "Unable to copy CGI SAPI"
-       fi
-
-       if [[ ${build_apache2} = 1 ]] ; then
-               einfo
-               einfo "Building apache${APACHE_VERSION} 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 make apache${APACHE_VERSION} SAPI"
-       fi
-}
-
-src_compile_normal() {
-       php_determine_sapis
-
-       CLEAN_REQUIRED=0
-       my_conf=""
-
-       # Support the Apache2 extras, they must be set globally for all
-       # SAPIs to work correctly, especially for external PHP extensions
-       if use apache2 ; then
-               # Concurrent PHP Apache2 modules support
-               if use concurrentmodphp ; then
-                       append-ldflags "-Wl,--version-script=${FILESDIR}/php5-ldvs"
-               fi
-       fi
-
-       for x in ${PHPSAPIS} ; do
-               if use pcre || phpconfutils_usecheck pcre ; then
-                       myconf="${my_conf} --with-pcre-dir=/usr"
-                       phpconfutils_extension_with "pcre-regex" "pcre" 0 "/usr"
-               fi
-
-               # Support the Apache2 extras, they must be set globally for all
-               # SAPIs to work correctly, especially for external PHP extensions
-               if use apache2 ; then
-                       # Threaded Apache2 support
-                       if use threads ; then
-                               my_conf="${my_conf} --enable-maintainer-zts"
-                               ewarn "Enabling ZTS for Apache2 MPM"
-                       fi
-               fi
-
-               if [[ "${CLEAN_REQUIRED}" = 1 ]] ; then
-                       make clean
-               fi
-
-               PHPSAPI="${x}"
-
-               case ${x} in
-                       cli)
-                               my_conf="${my_conf} --enable-cli --disable-cgi"
-                               php5_2-sapi_src_compile
-                               cp sapi/cli/php php-cli || die "Unable to copy CLI SAPI"
-                               ;;
-                       cgi)
-                               my_conf="${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_2-sapi_src_compile
-                               cp sapi/cgi/php-cgi php-cgi || die "Unable to copy CGI SAPI"
-                               ;;
-                       apache2)
-                               my_conf="${my_conf} --disable-cli --with-apxs2=/usr/sbin/apxs2"
-                               php5_2-sapi_src_compile
-                               ;;
-               esac
-
-               CLEAN_REQUIRED=1
-               my_conf=""
-       done
-}
-
-src_install() {
-       php_determine_sapis
-
-       destdir=/usr/$(get_libdir)/php5
-
-       # Let the eclass do the common work
-       php5_2-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_2-sapi_install_ini
-                               ;;
-                       cgi)
-                               einfo "Installing CGI SAPI"
-                               into ${destdir}
-                               dobin php-cgi || die "Unable to install ${x} sapi"
-                               php5_2-sapi_install_ini
-                               ;;
-                       apache2)
-                               einfo "Installing Apache${APACHE_VERSION} SAPI"
-                               make INSTALL_ROOT="${D}" install-sapi || die "Unable to install ${x} SAPI"
-                               if use concurrentmodphp ; then
-                                       einfo "Installing Apache${APACHE_VERSION} config file for PHP5-concurrent (70_mod_php5_concurr.conf)"
-                                       insinto ${APACHE_MODULES_CONFDIR}
-                                       newins "${FILESDIR}/70_mod_php5_concurr.conf-apache2-r1" "70_mod_php5_concurr.conf"
-
-                                       # Put the ld version script in the right place so it's always accessible
-                                       insinto "/var/lib/php-pkg/${CATEGORY}/${PN}-${PVR}/"
-                                       doins "${FILESDIR}/php5-ldvs"
-
-                                       # Redefine the extension dir to have the modphp suffix
-                                       PHPEXTDIR="`"${D}/${destdir}/bin/php-config" --extension-dir`-versioned"
-                               else
-                                       einfo "Installing Apache${APACHE_VERSION} config file for PHP5 (70_mod_php5.conf)"
-                                       insinto ${APACHE_MODULES_CONFDIR}
-                                       newins "${FILESDIR}/70_mod_php5.conf-apache2-r1" "70_mod_php5.conf"
-                               fi
-                               php5_2-sapi_install_ini
-                               ;;
-               esac
-       done
-
-       # Install env.d files
-       newenvd "${FILESDIR}/20php5-envd" "20php5"
-       sed -e "s|/lib/|/$(get_libdir)/|g" -i "${D}/etc/env.d/20php5"
-}
-
-pkg_postinst() {
-       # Output some general info to the user
-       if use apache2 ; then
-               APACHE2_MOD_DEFINE="PHP5"
-               if use concurrentmodphp ; then
-                       APACHE2_MOD_CONF="70_mod_php5_concurr"
-               else
-                       APACHE2_MOD_CONF="70_mod_php5"
-               fi
-               apache-module_pkg_postinst
-       fi
-
-       # Update Apache2 to use mod_php
-       if use apache2 ; then
-               "${ROOT}/usr/sbin/php-select" -t apache2 php5 > /dev/null 2>&1
-               exitStatus=$?
-               if [[ ${exitStatus} == 2 ]] ; then
-                       php-select apache2 php5
-               elif [[ ${exitStatus} == 4 ]] ; then
-                       ewarn
-                       ewarn "Apache2 is configured to load a different version of PHP."
-                       ewarn "To make Apache2 use PHP v5, use php-select:"
-                       ewarn
-                       ewarn "    php-select apache2 php5"
-                       ewarn
-               fi
-       fi
-
-       # Create the symlinks for php-cli
-       if use cli || phpconfutils_usecheck cli ; then
-               "${ROOT}/usr/sbin/php-select" -t php php5 > /dev/null 2>&1
-               exitStatus=$?
-               if [[ ${exitStatus} == 5 ]] ; then
-                       php-select php php5
-               elif [[ ${exitStatus} == 4 ]] ; then
-                       ewarn
-                       ewarn "/usr/bin/php links to a different version of PHP."
-                       ewarn "To make /usr/bin/php point to PHP v5, use php-select:"
-                       ewarn
-                       ewarn "    php-select php php5"
-                       ewarn
-               fi
-       fi
-
-       # Create the symlinks for php-cgi
-       if use cgi ; then
-               "${ROOT}/usr/sbin/php-select" -t php-cgi php5 > /dev/null 2>&1
-               exitStatus=$?
-               if [[ ${exitStatus} == 5 ]] ; then
-                       php-select php-cgi php5
-               elif [[ ${exitStatus} == 4 ]] ; then
-                       ewarn
-                       ewarn "/usr/bin/php-cgi links to a different version of PHP."
-                       ewarn "To make /usr/bin/php-cgi point to PHP v5, use php-select:"
-                       ewarn
-                       ewarn "    php-select php-cgi php5"
-                       ewarn
-               fi
-       fi
-
-       # Create the symlinks for php-devel
-       "${ROOT}/usr/sbin/php-select" -t php-devel php5 > /dev/null 2>&1
-       exitStatus=$?
-       if [[ $exitStatus == 5 ]] ; then
-               php-select php-devel php5
-       elif [[ $exitStatus == 4 ]] ; then
-               ewarn
-               ewarn "/usr/bin/php-config and/or /usr/bin/phpize are linked to a"
-               ewarn "different version of PHP. To make them point to PHP v5, use"
-               ewarn "php-select:"
-               ewarn
-               ewarn "    php-select php-devel php5"
-               ewarn
-       fi
-
-       php5_2-sapi_pkg_postinst
-}
-
-src_test() {
-       echo ">>> Test phase [test]: ${CATEGORY}/${PF}"
-       if [[ ! -x "${S}"/php-cli ]]; then
-               ewarn "Running the php test suite requires USE=cli"
-               return
-       fi
-
-       export TEST_PHP_EXECUTABLE="${S}"/php-cli
-       if [[ -x "${S}"/php-cgi ]]; then
-               export TEST_PHP_CGI_EXECUTABLE="${S}"/php-cgi
-       fi
-       REPORT_EXIT_STATUS=1 "${S}"/php-cli -n "${S}"/run-tests.php -n
-
-       if [[ $? != 0 ]] ; then
-               eerror "Not all tests were successful!"
-       fi
-}
diff --git a/dev-lang/php/php-5.2.10-r2.ebuild b/dev-lang/php/php-5.2.10-r2.ebuild
deleted file mode 100644 (file)
index cdb348e..0000000
+++ /dev/null
@@ -1,550 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/php/php-5.2.10-r2.ebuild,v 1.2 2010/01/31 19:53:09 tove Exp $
-
-CGI_SAPI_USE="discard-path force-cgi-redirect"
-APACHE2_SAPI_USE="concurrentmodphp threads"
-IUSE="cli cgi ${CGI_SAPI_USE} ${APACHE2_SAPI_USE} fastbuild"
-
-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, general
-PHP_PATCHSET_REV="${PR/r/}"
-PHP_PATCHSET_REV="${PHP_PATCHSET_REV/2/1}"
-SUHOSIN_PATCH="suhosin-patch-${MY_PHP_PV}-0.9.7.patch.gz"
-MULTILIB_PATCH="${MY_PHP_PV}/opt/multilib-search-path.patch"
-# php patch settings, ebuild specific
-FASTBUILD_PATCH="${MY_PHP_PV}/opt/fastbuild.patch"
-CONCURRENTMODPHP_PATCH="${MY_PHP_PV}/opt/concurrent_apache_modules.patch"
-# kolab patch - http://kolab.org/cgi-bin/viewcvs-kolab.cgi/server/patches/php/
-# bugs about this go to wrobel@gentoo.org
-KOLAB_PATCH="${MY_PHP_PV}/opt/kolab-imap-annotations.patch"
-
-inherit versionator php5_2-sapi apache-module
-
-# Suhosin patch support
-[[ -n "${SUHOSIN_PATCH}" ]] && SRC_URI="${SRC_URI} suhosin? ( http://gentoo.longitekk.com/${SUHOSIN_PATCH} )"
-
-DESCRIPTION="The PHP language runtime engine: CLI, CGI and Apache2 SAPIs."
-
-DEPEND="app-admin/php-toolkit
-       imap? ( >=virtual/imap-c-client-2006k )
-       pcre? ( >=dev-libs/libpcre-7.8 )
-       xml? ( >=dev-libs/libxml2-2.7.2-r2 )
-       xmlrpc? ( >=dev-libs/libxml2-2.7.2-r2 virtual/libiconv )"
-
-RDEPEND="${DEPEND}"
-if [[ -n "${KOLAB_PATCH}" ]] ; then
-       IUSE="${IUSE} kolab"
-       DEPEND="${DEPEND}
-               kolab? ( >=net-libs/c-client-2004g-r1 )"
-fi
-
-want_apache
-
-pkg_setup() {
-       PHPCONFUTILS_AUTO_USE=""
-
-       # Make sure the user has specified at least one SAPI
-       einfo "Determining SAPI(s) to build"
-       phpconfutils_require_any "  Enabled  SAPI:" "  Disabled SAPI:" cli cgi apache2
-
-       # Threaded Apache2 support
-       if use apache2 ; then
-               has_apache_threads
-       fi
-
-       # Concurrent PHP Apache2 modules support
-       if use apache2 ; then
-               if use concurrentmodphp ; then
-                       ewarn
-                       ewarn "'concurrentmodphp' makes it possible to load multiple, differently"
-                       ewarn "versioned mod_php's into the same Apache instance. This is done with"
-                       ewarn "a few linker tricks and workarounds, and is not guaranteed to always"
-                       ewarn "work correctly, so use it at your own risk. Especially, do not use"
-                       ewarn "this in conjunction with PHP modules (PECL, ...) other than the ones"
-                       ewarn "you may find in the Portage tree or the PHP Overlay!"
-                       ewarn "This is an experimental feature, so please rebuild PHP"
-                       ewarn "without the 'concurrentmodphp' 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 'concurrentmodphp', please file a bug in"
-                       ewarn "Gentoo's Bugzilla only."
-                       ewarn
-                       ebeep 5
-               fi
-       fi
-
-       # fastbuild support
-       if use 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
-
-       if use pcre ; then
-               built_with_use dev-libs/libpcre unicode || \
-                       die "Please rebuild dev-libs/libpcre with USE=unicode"
-       fi
-
-       depend.apache_pkg_setup
-       php5_2-sapi_pkg_setup
-}
-
-php_determine_sapis() {
-       # holds the list of sapis that we want to build
-       PHPSAPIS=
-
-       if use cli || phpconfutils_usecheck cli ; then
-               PHPSAPIS="${PHPSAPIS} cli"
-       fi
-
-       if use cgi ; then
-               PHPSAPIS="${PHPSAPIS} cgi"
-       fi
-
-       # note - apache SAPI comes after the simpler cli/cgi sapis
-       if use apache2 ; then
-               PHPSAPIS="${PHPSAPIS} apache${APACHE_VERSION}"
-       fi
-}
-
-src_unpack() {
-       if [[ "${PHP_PACKAGE}" == 1 ]] ; then
-               unpack ${A}
-       fi
-
-       cd "${S}"
-
-       # Concurrent PHP Apache2 modules support
-       if use apache2 ; then
-               if use concurrentmodphp ; then
-                       if [[ -n "${CONCURRENTMODPHP_PATCH}" ]] && [[ -f "${WORKDIR}/${CONCURRENTMODPHP_PATCH}" ]] ; then
-                               epatch "${WORKDIR}/${CONCURRENTMODPHP_PATCH}"
-                       else
-                               ewarn "There is no concurrent mod_php patch available for this PHP release yet!"
-                       fi
-               fi
-       fi
-
-       # Quick fix for bug #279576
-       epatch "${FILESDIR}"/php-${PV}-pdo_dblib.patch
-
-       # fastbuild support
-       if use fastbuild ; then
-               if [[ -n "${FASTBUILD_PATCH}" ]] && [[ -f "${WORKDIR}/${FASTBUILD_PATCH}" ]] ; then
-                       epatch "${WORKDIR}/${FASTBUILD_PATCH}"
-               else
-                       ewarn "There is no fastbuild patch available for this PHP release yet!"
-               fi
-       fi
-
-       # kolab support
-       if [[ -n "${KOLAB_PATCH}" ]] ; then
-               use kolab && epatch "${WORKDIR}/${KOLAB_PATCH}"
-       fi
-
-       # pretend to not have flex, bug 221357
-       sed -re 's:( +)PHP_SUBST\(LEX\):\1LEX="exit 0;"\n\0:' -i acinclude.m4
-
-       # Now let the eclass do the rest and regenerate the configure
-       php5_2-sapi_src_unpack
-
-       # Fix Makefile.global:test to consider the CGI SAPI if present
-       if use cgi ; then
-               sed -e "s|test \! -z \"\$(top_builddir)/php-cli\" \&\& test -x \"\$(top_builddir)/php-cli\"|test \! -z \"\$(top_builddir)/php-cli\" \&\& test -x \"\$(top_builddir)/php-cli\" \&\& test \! -z \"\$(top_builddir)/php-cgi\" \&\& test -x \"\$(top_builddir)/php-cgi\"|g" -i Makefile.global
-               sed -e "s|TEST_PHP_EXECUTABLE=\"\$(top_builddir)/php-cli\"|TEST_PHP_EXECUTABLE=\"\$(top_builddir)/php-cli\" TEST_PHP_CGI_EXECUTABLE=\"\$(top_builddir)/php-cgi\"|g" -i Makefile.global
-       fi
-
-       # try to fix some test cases which fail because of sandbox otherwise
-       sed -e 's:/no/such/:.\0:' -i ext/standard/tests/file/005_error.phpt \
-               ext/standard/tests/file/006_error.phpt \
-               ext/standard/tests/file/touch.phpt
-
-       # REMOVING BROKEN TESTS:
-       # removing this test as it has been broken for ages and is not easily
-       # fixable (depends on a lot of factors)
-       rm ext/standard/tests/general_functions/phpinfo.phpt
-
-       # never worked properly, no easy fix
-       rm ext/iconv/tests/bug16069.phpt ext/iconv/tests/iconv_stream_filter.phpt
-
-       # needs write access to /tmp and others
-       rm ext/session/tests/session_save_path_variation5.phpt
-
-       # new tests since 5.2.7 which have never been working for me
-       rm ext/spl/tests/arrayObject___construct_basic4.phpt \
-               ext/spl/tests/arrayObject___construct_basic5.phpt \
-               ext/spl/tests/arrayObject_exchangeArray_basic3.phpt \
-               ext/spl/tests/arrayObject_setFlags_basic1.phpt
-
-       # those might as well be related to suhosin
-       rm ext/session/tests/session_decode_variation3.phpt \
-               ext/session/tests/session_encode_variation8.phpt
-
-       # missing skipif
-       use reflection || \
-               rm ext/standard/tests/directory/DirectoryClass_basic_001.phpt
-
-       # sandbox-related (sandbox checks for permissions before even looking
-       # at the fs, but the tests expect "No such file or directory"
-       sed -e 's:/blah:./bla:' -i \
-               ext/session/tests/session_save_path_variation{2,3}.phpt
-       rm ext/standard/tests/file/rename_variation13.phpt
-
-       # test passes, but run-tests.php claims failure
-       rm ext/standard/tests/file/tempnam_variation4.phpt
-
-       # these tests behave differently with suhosin enabled, adapting them...
-       use suhosin && sed -e 's:File(\.\./):File(..):g' -i \
-               tests/security/open_basedir*{.inc,.phpt}
-}
-
-src_compile() {
-       # bug 217392 (autconf-2.62 behavior changes)
-       export CFLAGS="${CFLAGS} -D_GNU_SOURCE"
-       export CXXFLAGS="${CXXFLAGS} -D_GNU_SOURCE"
-       if use 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_apache2=0
-       my_conf=""
-
-       for x in ${PHPSAPIS} ; do
-               case ${x} in
-                       cli)
-                               build_cli=1
-                               ;;
-                       cgi)
-                               build_cgi=1
-                               ;;
-                       apache2)
-                               build_apache2=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_apache2} = 1 ]] ; then
-               my_conf="${my_conf} --with-apxs2=/usr/sbin/apxs2"
-
-               # Threaded Apache2 support
-               if use threads ; then
-                       my_conf="${my_conf} --enable-maintainer-zts"
-                       ewarn "Enabling ZTS for Apache2 MPM"
-               fi
-
-               # Concurrent PHP Apache2 modules support
-               if use concurrentmodphp ; then
-                       append-ldflags "-Wl,--version-script=${FILESDIR}/php5-ldvs"
-               fi
-       fi
-
-       if use pcre || phpconfutils_usecheck pcre ; then
-               myconf="${my_conf} --with-pcre-dir=/usr"
-               phpconfutils_extension_with "pcre-regex" "pcre" 0 "/usr"
-       fi
-
-       # Now we know what we are building, build it
-       php5_2-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-cgi || die "Unable to make CGI SAPI"
-               cp sapi/cgi/php-cgi php-cgi || die "Unable to copy CGI SAPI"
-       fi
-
-       if [[ ${build_apache2} = 1 ]] ; then
-               einfo
-               einfo "Building apache${APACHE_VERSION} 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 make apache${APACHE_VERSION} SAPI"
-       fi
-}
-
-src_compile_normal() {
-       php_determine_sapis
-
-       CLEAN_REQUIRED=0
-       my_conf=""
-
-       # Support the Apache2 extras, they must be set globally for all
-       # SAPIs to work correctly, especially for external PHP extensions
-       if use apache2 ; then
-               # Concurrent PHP Apache2 modules support
-               if use concurrentmodphp ; then
-                       append-ldflags "-Wl,--version-script=${FILESDIR}/php5-ldvs"
-               fi
-       fi
-
-       for x in ${PHPSAPIS} ; do
-               if use pcre || phpconfutils_usecheck pcre ; then
-                       myconf="${my_conf} --with-pcre-dir=/usr"
-                       phpconfutils_extension_with "pcre-regex" "pcre" 0 "/usr"
-               fi
-
-               # Support the Apache2 extras, they must be set globally for all
-               # SAPIs to work correctly, especially for external PHP extensions
-               if use apache2 ; then
-                       # Threaded Apache2 support
-                       if use threads ; then
-                               my_conf="${my_conf} --enable-maintainer-zts"
-                               ewarn "Enabling ZTS for Apache2 MPM"
-                       fi
-               fi
-
-               if [[ "${CLEAN_REQUIRED}" = 1 ]] ; then
-                       make clean
-               fi
-
-               PHPSAPI="${x}"
-
-               case ${x} in
-                       cli)
-                               my_conf="${my_conf} --enable-cli --disable-cgi"
-                               php5_2-sapi_src_compile
-                               cp sapi/cli/php php-cli || die "Unable to copy CLI SAPI"
-                               ;;
-                       cgi)
-                               my_conf="${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_2-sapi_src_compile
-                               cp sapi/cgi/php-cgi php-cgi || die "Unable to copy CGI SAPI"
-                               ;;
-                       apache2)
-                               my_conf="${my_conf} --disable-cli --with-apxs2=/usr/sbin/apxs2"
-                               php5_2-sapi_src_compile
-                               ;;
-               esac
-
-               CLEAN_REQUIRED=1
-               my_conf=""
-       done
-}
-
-src_install() {
-       php_determine_sapis
-
-       destdir=/usr/$(get_libdir)/php5
-
-       # Let the eclass do the common work
-       php5_2-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_2-sapi_install_ini
-                               ;;
-                       cgi)
-                               einfo "Installing CGI SAPI"
-                               into ${destdir}
-                               dobin php-cgi || die "Unable to install ${x} sapi"
-                               php5_2-sapi_install_ini
-                               ;;
-                       apache2)
-                               einfo "Installing Apache${APACHE_VERSION} SAPI"
-                               make INSTALL_ROOT="${D}" install-sapi || die "Unable to install ${x} SAPI"
-                               if use concurrentmodphp ; then
-                                       einfo "Installing Apache${APACHE_VERSION} config file for PHP5-concurrent (70_mod_php5_concurr.conf)"
-                                       insinto ${APACHE_MODULES_CONFDIR}
-                                       newins "${FILESDIR}/70_mod_php5_concurr.conf-apache2-r1" "70_mod_php5_concurr.conf"
-
-                                       # Put the ld version script in the right place so it's always accessible
-                                       insinto "/var/lib/php-pkg/${CATEGORY}/${PN}-${PVR}/"
-                                       doins "${FILESDIR}/php5-ldvs"
-
-                                       # Redefine the extension dir to have the modphp suffix
-                                       PHPEXTDIR="`"${D}/${destdir}/bin/php-config" --extension-dir`-versioned"
-                               else
-                                       einfo "Installing Apache${APACHE_VERSION} config file for PHP5 (70_mod_php5.conf)"
-                                       insinto ${APACHE_MODULES_CONFDIR}
-                                       newins "${FILESDIR}/70_mod_php5.conf-apache2-r1" "70_mod_php5.conf"
-                               fi
-                               php5_2-sapi_install_ini
-                               ;;
-               esac
-       done
-
-       # Install env.d files
-       newenvd "${FILESDIR}/20php5-envd" "20php5"
-       sed -e "s|/lib/|/$(get_libdir)/|g" -i "${D}/etc/env.d/20php5"
-}
-
-pkg_postinst() {
-       # Output some general info to the user
-       if use apache2 ; then
-               APACHE2_MOD_DEFINE="PHP5"
-               if use concurrentmodphp ; then
-                       APACHE2_MOD_CONF="70_mod_php5_concurr"
-               else
-                       APACHE2_MOD_CONF="70_mod_php5"
-               fi
-               apache-module_pkg_postinst
-       fi
-
-       # Update Apache2 to use mod_php
-       if use apache2 ; then
-               "${ROOT}/usr/sbin/php-select" -t apache2 php5 > /dev/null 2>&1
-               exitStatus=$?
-               if [[ ${exitStatus} == 2 ]] ; then
-                       php-select apache2 php5
-               elif [[ ${exitStatus} == 4 ]] ; then
-                       ewarn
-                       ewarn "Apache2 is configured to load a different version of PHP."
-                       ewarn "To make Apache2 use PHP v5, use php-select:"
-                       ewarn
-                       ewarn "    php-select apache2 php5"
-                       ewarn
-               fi
-       fi
-
-       # Create the symlinks for php-cli
-       if use cli || phpconfutils_usecheck cli ; then
-               "${ROOT}/usr/sbin/php-select" -t php php5 > /dev/null 2>&1
-               exitStatus=$?
-               if [[ ${exitStatus} == 5 ]] ; then
-                       php-select php php5
-               elif [[ ${exitStatus} == 4 ]] ; then
-                       ewarn
-                       ewarn "/usr/bin/php links to a different version of PHP."
-                       ewarn "To make /usr/bin/php point to PHP v5, use php-select:"
-                       ewarn
-                       ewarn "    php-select php php5"
-                       ewarn
-               fi
-       fi
-
-       # Create the symlinks for php-cgi
-       if use cgi ; then
-               "${ROOT}/usr/sbin/php-select" -t php-cgi php5 > /dev/null 2>&1
-               exitStatus=$?
-               if [[ ${exitStatus} == 5 ]] ; then
-                       php-select php-cgi php5
-               elif [[ ${exitStatus} == 4 ]] ; then
-                       ewarn
-                       ewarn "/usr/bin/php-cgi links to a different version of PHP."
-                       ewarn "To make /usr/bin/php-cgi point to PHP v5, use php-select:"
-                       ewarn
-                       ewarn "    php-select php-cgi php5"
-                       ewarn
-               fi
-       fi
-
-       # Create the symlinks for php-devel
-       "${ROOT}/usr/sbin/php-select" -t php-devel php5 > /dev/null 2>&1
-       exitStatus=$?
-       if [[ $exitStatus == 5 ]] ; then
-               php-select php-devel php5
-       elif [[ $exitStatus == 4 ]] ; then
-               ewarn
-               ewarn "/usr/bin/php-config and/or /usr/bin/phpize are linked to a"
-               ewarn "different version of PHP. To make them point to PHP v5, use"
-               ewarn "php-select:"
-               ewarn
-               ewarn "    php-select php-devel php5"
-               ewarn
-       fi
-
-       php5_2-sapi_pkg_postinst
-}
-
-src_test() {
-       echo ">>> Test phase [test]: ${CATEGORY}/${PF}"
-       if [[ ! -x "${S}"/php-cli ]]; then
-               ewarn "Running the php test suite requires USE=cli"
-               return
-       fi
-
-       export TEST_PHP_EXECUTABLE="${S}"/php-cli
-       if [[ -x "${S}"/php-cgi ]]; then
-               export TEST_PHP_CGI_EXECUTABLE="${S}"/php-cgi
-       fi
-       REPORT_EXIT_STATUS=1 "${S}"/php-cli -n "${S}"/run-tests.php -n
-
-       if [[ $? != 0 ]] ; then
-               eerror "Not all tests were successful!"
-       fi
-}
diff --git a/dev-lang/php/php-5.2.10.ebuild b/dev-lang/php/php-5.2.10.ebuild
deleted file mode 100644 (file)
index a76bced..0000000
+++ /dev/null
@@ -1,547 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/php/php-5.2.10.ebuild,v 1.8 2010/01/31 19:53:09 tove Exp $
-
-CGI_SAPI_USE="discard-path force-cgi-redirect"
-APACHE2_SAPI_USE="concurrentmodphp threads"
-IUSE="cli cgi ${CGI_SAPI_USE} ${APACHE2_SAPI_USE} fastbuild"
-
-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, general
-PHP_PATCHSET_REV="${PR/r/}"
-SUHOSIN_PATCH="suhosin-patch-5.2.9-0.9.7.patch.gz"
-MULTILIB_PATCH="${MY_PHP_PV}/opt/multilib-search-path.patch"
-# php patch settings, ebuild specific
-FASTBUILD_PATCH="${MY_PHP_PV}/opt/fastbuild.patch"
-CONCURRENTMODPHP_PATCH="${MY_PHP_PV}/opt/concurrent_apache_modules.patch"
-# kolab patch - http://kolab.org/cgi-bin/viewcvs-kolab.cgi/server/patches/php/
-# bugs about this go to wrobel@gentoo.org
-KOLAB_PATCH="${MY_PHP_PV}/opt/kolab-imap-annotations.patch"
-
-inherit versionator php5_2-sapi apache-module
-
-# Suhosin patch support
-[[ -n "${SUHOSIN_PATCH}" ]] && SRC_URI="${SRC_URI} suhosin? ( http://gentoo.longitekk.com/${SUHOSIN_PATCH} )"
-
-DESCRIPTION="The PHP language runtime engine: CLI, CGI and Apache2 SAPIs."
-
-DEPEND="app-admin/php-toolkit
-       imap? ( >=virtual/imap-c-client-2006k )
-       pcre? ( >=dev-libs/libpcre-7.8 )
-       xml? ( >=dev-libs/libxml2-2.7.2-r2 )
-       xmlrpc? ( >=dev-libs/libxml2-2.7.2-r2 virtual/libiconv )"
-
-RDEPEND="${DEPEND}"
-if [[ -n "${KOLAB_PATCH}" ]] ; then
-       IUSE="${IUSE} kolab"
-       DEPEND="${DEPEND}
-               kolab? ( >=net-libs/c-client-2004g-r1 )"
-fi
-
-want_apache
-
-pkg_setup() {
-       PHPCONFUTILS_AUTO_USE=""
-
-       # Make sure the user has specified at least one SAPI
-       einfo "Determining SAPI(s) to build"
-       phpconfutils_require_any "  Enabled  SAPI:" "  Disabled SAPI:" cli cgi apache2
-
-       # Threaded Apache2 support
-       if use apache2 ; then
-               has_apache_threads
-       fi
-
-       # Concurrent PHP Apache2 modules support
-       if use apache2 ; then
-               if use concurrentmodphp ; then
-                       ewarn
-                       ewarn "'concurrentmodphp' makes it possible to load multiple, differently"
-                       ewarn "versioned mod_php's into the same Apache instance. This is done with"
-                       ewarn "a few linker tricks and workarounds, and is not guaranteed to always"
-                       ewarn "work correctly, so use it at your own risk. Especially, do not use"
-                       ewarn "this in conjunction with PHP modules (PECL, ...) other than the ones"
-                       ewarn "you may find in the Portage tree or the PHP Overlay!"
-                       ewarn "This is an experimental feature, so please rebuild PHP"
-                       ewarn "without the 'concurrentmodphp' 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 'concurrentmodphp', please file a bug in"
-                       ewarn "Gentoo's Bugzilla only."
-                       ewarn
-                       ebeep 5
-               fi
-       fi
-
-       # fastbuild support
-       if use 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
-
-       if use pcre ; then
-               built_with_use dev-libs/libpcre unicode || \
-                       die "Please rebuild dev-libs/libpcre with USE=unicode"
-       fi
-
-       depend.apache_pkg_setup
-       php5_2-sapi_pkg_setup
-}
-
-php_determine_sapis() {
-       # holds the list of sapis that we want to build
-       PHPSAPIS=
-
-       if use cli || phpconfutils_usecheck cli ; then
-               PHPSAPIS="${PHPSAPIS} cli"
-       fi
-
-       if use cgi ; then
-               PHPSAPIS="${PHPSAPIS} cgi"
-       fi
-
-       # note - apache SAPI comes after the simpler cli/cgi sapis
-       if use apache2 ; then
-               PHPSAPIS="${PHPSAPIS} apache${APACHE_VERSION}"
-       fi
-}
-
-src_unpack() {
-       if [[ "${PHP_PACKAGE}" == 1 ]] ; then
-               unpack ${A}
-       fi
-
-       cd "${S}"
-
-       # Concurrent PHP Apache2 modules support
-       if use apache2 ; then
-               if use concurrentmodphp ; then
-                       if [[ -n "${CONCURRENTMODPHP_PATCH}" ]] && [[ -f "${WORKDIR}/${CONCURRENTMODPHP_PATCH}" ]] ; then
-                               epatch "${WORKDIR}/${CONCURRENTMODPHP_PATCH}"
-                       else
-                               ewarn "There is no concurrent mod_php patch available for this PHP release yet!"
-                       fi
-               fi
-       fi
-
-       # fastbuild support
-       if use fastbuild ; then
-               if [[ -n "${FASTBUILD_PATCH}" ]] && [[ -f "${WORKDIR}/${FASTBUILD_PATCH}" ]] ; then
-                       epatch "${WORKDIR}/${FASTBUILD_PATCH}"
-               else
-                       ewarn "There is no fastbuild patch available for this PHP release yet!"
-               fi
-       fi
-
-       # kolab support
-       if [[ -n "${KOLAB_PATCH}" ]] ; then
-               use kolab && epatch "${WORKDIR}/${KOLAB_PATCH}"
-       fi
-
-       # pretend to not have flex, bug 221357
-       sed -re 's:( +)PHP_SUBST\(LEX\):\1LEX="exit 0;"\n\0:' -i acinclude.m4
-
-       # Now let the eclass do the rest and regenerate the configure
-       php5_2-sapi_src_unpack
-
-       # Fix Makefile.global:test to consider the CGI SAPI if present
-       if use cgi ; then
-               sed -e "s|test \! -z \"\$(top_builddir)/php-cli\" \&\& test -x \"\$(top_builddir)/php-cli\"|test \! -z \"\$(top_builddir)/php-cli\" \&\& test -x \"\$(top_builddir)/php-cli\" \&\& test \! -z \"\$(top_builddir)/php-cgi\" \&\& test -x \"\$(top_builddir)/php-cgi\"|g" -i Makefile.global
-               sed -e "s|TEST_PHP_EXECUTABLE=\"\$(top_builddir)/php-cli\"|TEST_PHP_EXECUTABLE=\"\$(top_builddir)/php-cli\" TEST_PHP_CGI_EXECUTABLE=\"\$(top_builddir)/php-cgi\"|g" -i Makefile.global
-       fi
-
-       # try to fix some test cases which fail because of sandbox otherwise
-       sed -e 's:/no/such/:.\0:' -i ext/standard/tests/file/005_error.phpt \
-               ext/standard/tests/file/006_error.phpt \
-               ext/standard/tests/file/touch.phpt
-
-       # REMOVING BROKEN TESTS:
-       # removing this test as it has been broken for ages and is not easily
-       # fixable (depends on a lot of factors)
-       rm ext/standard/tests/general_functions/phpinfo.phpt
-
-       # never worked properly, no easy fix
-       rm ext/iconv/tests/bug16069.phpt ext/iconv/tests/iconv_stream_filter.phpt
-
-       # needs write access to /tmp and others
-       rm ext/session/tests/session_save_path_variation5.phpt
-
-       # new tests since 5.2.7 which have never been working for me
-       rm ext/spl/tests/arrayObject___construct_basic4.phpt \
-               ext/spl/tests/arrayObject___construct_basic5.phpt \
-               ext/spl/tests/arrayObject_exchangeArray_basic3.phpt \
-               ext/spl/tests/arrayObject_setFlags_basic1.phpt \
-               tests/lang/bug45392.phpt
-
-       # those might as well be related to suhosin
-       rm ext/session/tests/session_decode_variation3.phpt \
-               ext/session/tests/session_encode_variation8.phpt
-
-       # missing skipif
-       use reflection || \
-               rm ext/standard/tests/directory/DirectoryClass_basic_001.phpt
-
-       # sandbox-related (sandbox checks for permissions before even looking
-       # at the fs, but the tests expect "No such file or directory"
-       sed -e 's:/blah:./bla:' -i \
-               ext/session/tests/session_save_path_variation{2,3}.phpt
-       rm ext/standard/tests/file/rename_variation13.phpt
-
-       # test passes, but run-tests.php claims failure
-       rm ext/standard/tests/file/tempnam_variation4.phpt
-
-       # these tests behave differently with suhosin enabled, adapting them...
-       use suhosin && sed -e 's:File(\.\./):File(..):g' -i \
-               tests/security/open_basedir*{.inc,.phpt}
-}
-
-src_compile() {
-       # bug 217392 (autconf-2.62 behavior changes)
-       export CFLAGS="${CFLAGS} -D_GNU_SOURCE"
-       export CXXFLAGS="${CXXFLAGS} -D_GNU_SOURCE"
-       if use 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_apache2=0
-       my_conf=""
-
-       for x in ${PHPSAPIS} ; do
-               case ${x} in
-                       cli)
-                               build_cli=1
-                               ;;
-                       cgi)
-                               build_cgi=1
-                               ;;
-                       apache2)
-                               build_apache2=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_apache2} = 1 ]] ; then
-               my_conf="${my_conf} --with-apxs2=/usr/sbin/apxs2"
-
-               # Threaded Apache2 support
-               if use threads ; then
-                       my_conf="${my_conf} --enable-maintainer-zts"
-                       ewarn "Enabling ZTS for Apache2 MPM"
-               fi
-
-               # Concurrent PHP Apache2 modules support
-               if use concurrentmodphp ; then
-                       append-ldflags "-Wl,--version-script=${FILESDIR}/php5-ldvs"
-               fi
-       fi
-
-       if use pcre || phpconfutils_usecheck pcre ; then
-               myconf="${my_conf} --with-pcre-dir=/usr"
-               phpconfutils_extension_with "pcre-regex" "pcre" 0 "/usr"
-       fi
-
-       # Now we know what we are building, build it
-       php5_2-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-cgi || die "Unable to make CGI SAPI"
-               cp sapi/cgi/php-cgi php-cgi || die "Unable to copy CGI SAPI"
-       fi
-
-       if [[ ${build_apache2} = 1 ]] ; then
-               einfo
-               einfo "Building apache${APACHE_VERSION} 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 make apache${APACHE_VERSION} SAPI"
-       fi
-}
-
-src_compile_normal() {
-       php_determine_sapis
-
-       CLEAN_REQUIRED=0
-       my_conf=""
-
-       # Support the Apache2 extras, they must be set globally for all
-       # SAPIs to work correctly, especially for external PHP extensions
-       if use apache2 ; then
-               # Concurrent PHP Apache2 modules support
-               if use concurrentmodphp ; then
-                       append-ldflags "-Wl,--version-script=${FILESDIR}/php5-ldvs"
-               fi
-       fi
-
-       for x in ${PHPSAPIS} ; do
-               if use pcre || phpconfutils_usecheck pcre ; then
-                       myconf="${my_conf} --with-pcre-dir=/usr"
-                       phpconfutils_extension_with "pcre-regex" "pcre" 0 "/usr"
-               fi
-
-               # Support the Apache2 extras, they must be set globally for all
-               # SAPIs to work correctly, especially for external PHP extensions
-               if use apache2 ; then
-                       # Threaded Apache2 support
-                       if use threads ; then
-                               my_conf="${my_conf} --enable-maintainer-zts"
-                               ewarn "Enabling ZTS for Apache2 MPM"
-                       fi
-               fi
-
-               if [[ "${CLEAN_REQUIRED}" = 1 ]] ; then
-                       make clean
-               fi
-
-               PHPSAPI="${x}"
-
-               case ${x} in
-                       cli)
-                               my_conf="${my_conf} --enable-cli --disable-cgi"
-                               php5_2-sapi_src_compile
-                               cp sapi/cli/php php-cli || die "Unable to copy CLI SAPI"
-                               ;;
-                       cgi)
-                               my_conf="${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_2-sapi_src_compile
-                               cp sapi/cgi/php-cgi php-cgi || die "Unable to copy CGI SAPI"
-                               ;;
-                       apache2)
-                               my_conf="${my_conf} --disable-cli --with-apxs2=/usr/sbin/apxs2"
-                               php5_2-sapi_src_compile
-                               ;;
-               esac
-
-               CLEAN_REQUIRED=1
-               my_conf=""
-       done
-}
-
-src_install() {
-       php_determine_sapis
-
-       destdir=/usr/$(get_libdir)/php5
-
-       # Let the eclass do the common work
-       php5_2-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_2-sapi_install_ini
-                               ;;
-                       cgi)
-                               einfo "Installing CGI SAPI"
-                               into ${destdir}
-                               dobin php-cgi || die "Unable to install ${x} sapi"
-                               php5_2-sapi_install_ini
-                               ;;
-                       apache2)
-                               einfo "Installing Apache${APACHE_VERSION} SAPI"
-                               make INSTALL_ROOT="${D}" install-sapi || die "Unable to install ${x} SAPI"
-                               if use concurrentmodphp ; then
-                                       einfo "Installing Apache${APACHE_VERSION} config file for PHP5-concurrent (70_mod_php5_concurr.conf)"
-                                       insinto ${APACHE_MODULES_CONFDIR}
-                                       newins "${FILESDIR}/70_mod_php5_concurr.conf-apache2-r1" "70_mod_php5_concurr.conf"
-
-                                       # Put the ld version script in the right place so it's always accessible
-                                       insinto "/var/lib/php-pkg/${CATEGORY}/${PN}-${PVR}/"
-                                       doins "${FILESDIR}/php5-ldvs"
-
-                                       # Redefine the extension dir to have the modphp suffix
-                                       PHPEXTDIR="`"${D}/${destdir}/bin/php-config" --extension-dir`-versioned"
-                               else
-                                       einfo "Installing Apache${APACHE_VERSION} config file for PHP5 (70_mod_php5.conf)"
-                                       insinto ${APACHE_MODULES_CONFDIR}
-                                       newins "${FILESDIR}/70_mod_php5.conf-apache2-r1" "70_mod_php5.conf"
-                               fi
-                               php5_2-sapi_install_ini
-                               ;;
-               esac
-       done
-
-       # Install env.d files
-       newenvd "${FILESDIR}/20php5-envd" "20php5"
-       sed -e "s|/lib/|/$(get_libdir)/|g" -i "${D}/etc/env.d/20php5"
-}
-
-pkg_postinst() {
-       # Output some general info to the user
-       if use apache2 ; then
-               APACHE2_MOD_DEFINE="PHP5"
-               if use concurrentmodphp ; then
-                       APACHE2_MOD_CONF="70_mod_php5_concurr"
-               else
-                       APACHE2_MOD_CONF="70_mod_php5"
-               fi
-               apache-module_pkg_postinst
-       fi
-
-       # Update Apache2 to use mod_php
-       if use apache2 ; then
-               "${ROOT}/usr/sbin/php-select" -t apache2 php5 > /dev/null 2>&1
-               exitStatus=$?
-               if [[ ${exitStatus} == 2 ]] ; then
-                       php-select apache2 php5
-               elif [[ ${exitStatus} == 4 ]] ; then
-                       ewarn
-                       ewarn "Apache2 is configured to load a different version of PHP."
-                       ewarn "To make Apache2 use PHP v5, use php-select:"
-                       ewarn
-                       ewarn "    php-select apache2 php5"
-                       ewarn
-               fi
-       fi
-
-       # Create the symlinks for php-cli
-       if use cli || phpconfutils_usecheck cli ; then
-               "${ROOT}/usr/sbin/php-select" -t php php5 > /dev/null 2>&1
-               exitStatus=$?
-               if [[ ${exitStatus} == 5 ]] ; then
-                       php-select php php5
-               elif [[ ${exitStatus} == 4 ]] ; then
-                       ewarn
-                       ewarn "/usr/bin/php links to a different version of PHP."
-                       ewarn "To make /usr/bin/php point to PHP v5, use php-select:"
-                       ewarn
-                       ewarn "    php-select php php5"
-                       ewarn
-               fi
-       fi
-
-       # Create the symlinks for php-cgi
-       if use cgi ; then
-               "${ROOT}/usr/sbin/php-select" -t php-cgi php5 > /dev/null 2>&1
-               exitStatus=$?
-               if [[ ${exitStatus} == 5 ]] ; then
-                       php-select php-cgi php5
-               elif [[ ${exitStatus} == 4 ]] ; then
-                       ewarn
-                       ewarn "/usr/bin/php-cgi links to a different version of PHP."
-                       ewarn "To make /usr/bin/php-cgi point to PHP v5, use php-select:"
-                       ewarn
-                       ewarn "    php-select php-cgi php5"
-                       ewarn
-               fi
-       fi
-
-       # Create the symlinks for php-devel
-       "${ROOT}/usr/sbin/php-select" -t php-devel php5 > /dev/null 2>&1
-       exitStatus=$?
-       if [[ $exitStatus == 5 ]] ; then
-               php-select php-devel php5
-       elif [[ $exitStatus == 4 ]] ; then
-               ewarn
-               ewarn "/usr/bin/php-config and/or /usr/bin/phpize are linked to a"
-               ewarn "different version of PHP. To make them point to PHP v5, use"
-               ewarn "php-select:"
-               ewarn
-               ewarn "    php-select php-devel php5"
-               ewarn
-       fi
-
-       php5_2-sapi_pkg_postinst
-}
-
-src_test() {
-       echo ">>> Test phase [test]: ${CATEGORY}/${PF}"
-       if [[ ! -x "${S}"/php-cli ]]; then
-               ewarn "Running the php test suite requires USE=cli"
-               return
-       fi
-
-       export TEST_PHP_EXECUTABLE="${S}"/php-cli
-       if [[ -x "${S}"/php-cgi ]]; then
-               export TEST_PHP_CGI_EXECUTABLE="${S}"/php-cgi
-       fi
-       REPORT_EXIT_STATUS=1 "${S}"/php-cli -n "${S}"/run-tests.php -n
-
-       if [[ $? != 0 ]] ; then
-               eerror "Not all tests were successful!"
-       fi
-}
diff --git a/dev-lang/php/php-5.2.11-r1.ebuild b/dev-lang/php/php-5.2.11-r1.ebuild
deleted file mode 100644 (file)
index bfe0d1f..0000000
+++ /dev/null
@@ -1,552 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/php/php-5.2.11-r1.ebuild,v 1.9 2010/01/31 19:53:09 tove Exp $
-
-CGI_SAPI_USE="discard-path force-cgi-redirect"
-APACHE2_SAPI_USE="concurrentmodphp threads"
-IUSE="cli cgi ${CGI_SAPI_USE} ${APACHE2_SAPI_USE} fastbuild"
-
-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, general
-PHP_PATCHSET_URI="http://dev.gentoo.org/~cla/distfiles/php-patchset-${PVR}.tar.bz2"
-PHP_PATCHSET_REV="${PR/r/}"
-PHP_PATCHSET_REV="${PHP_PATCHSET_REV/2/1}"
-SUHOSIN_PATCH="suhosin-patch-${MY_PHP_PV}-0.9.7.patch.gz"
-MULTILIB_PATCH="${MY_PHP_PV}/opt/multilib-search-path.patch"
-# php patch settings, ebuild specific
-FASTBUILD_PATCH="${MY_PHP_PV}/opt/fastbuild.patch"
-CONCURRENTMODPHP_PATCH="${MY_PHP_PV}/opt/concurrent_apache_modules.patch"
-# kolab patch - http://kolab.org/cgi-bin/viewcvs-kolab.cgi/server/patches/php/
-# bugs about this go to wrobel@gentoo.org
-KOLAB_PATCH="${MY_PHP_PV}/opt/kolab-imap-annotations.patch"
-
-inherit versionator php5_2-sapi apache-module
-
-# Suhosin patch support
-[[ -n "${SUHOSIN_PATCH}" ]] && SRC_URI="${SRC_URI} suhosin? ( http://gentoo.longitekk.com/${SUHOSIN_PATCH} )"
-
-DESCRIPTION="The PHP language runtime engine: CLI, CGI and Apache2 SAPIs."
-
-DEPEND="app-admin/php-toolkit
-       imap? ( >=virtual/imap-c-client-2006k )
-       pcre? ( >=dev-libs/libpcre-7.8 )
-       xml? ( >=dev-libs/libxml2-2.7.2-r2 )
-       xmlrpc? ( >=dev-libs/libxml2-2.7.2-r2 virtual/libiconv )"
-
-RDEPEND="${DEPEND}"
-if [[ -n "${KOLAB_PATCH}" ]] ; then
-       IUSE="${IUSE} kolab"
-       DEPEND="${DEPEND}
-               kolab? ( >=net-libs/c-client-2004g-r1 )"
-fi
-
-PDEPEND="suhosin? ( >=dev-php5/suhosin-0.9.29 )"
-
-want_apache
-
-pkg_setup() {
-       PHPCONFUTILS_AUTO_USE=""
-
-       # Make sure the user has specified at least one SAPI
-       einfo "Determining SAPI(s) to build"
-       phpconfutils_require_any "  Enabled  SAPI:" "  Disabled SAPI:" cli cgi apache2
-
-       # Threaded Apache2 support
-       if use apache2 ; then
-               has_apache_threads
-       fi
-
-       # Concurrent PHP Apache2 modules support
-       if use apache2 ; then
-               if use concurrentmodphp ; then
-                       ewarn
-                       ewarn "'concurrentmodphp' makes it possible to load multiple, differently"
-                       ewarn "versioned mod_php's into the same Apache instance. This is done with"
-                       ewarn "a few linker tricks and workarounds, and is not guaranteed to always"
-                       ewarn "work correctly, so use it at your own risk. Especially, do not use"
-                       ewarn "this in conjunction with PHP modules (PECL, ...) other than the ones"
-                       ewarn "you may find in the Portage tree or the PHP Overlay!"
-                       ewarn "This is an experimental feature, so please rebuild PHP"
-                       ewarn "without the 'concurrentmodphp' 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 'concurrentmodphp', please file a bug in"
-                       ewarn "Gentoo's Bugzilla only."
-                       ewarn
-                       ebeep 5
-               fi
-       fi
-
-       # fastbuild support
-       if use 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
-
-       if use pcre ; then
-               built_with_use dev-libs/libpcre unicode || \
-                       die "Please rebuild dev-libs/libpcre with USE=unicode"
-       fi
-
-       depend.apache_pkg_setup
-       php5_2-sapi_pkg_setup
-}
-
-php_determine_sapis() {
-       # holds the list of sapis that we want to build
-       PHPSAPIS=
-
-       if use cli || phpconfutils_usecheck cli ; then
-               PHPSAPIS="${PHPSAPIS} cli"
-       fi
-
-       if use cgi ; then
-               PHPSAPIS="${PHPSAPIS} cgi"
-       fi
-
-       # note - apache SAPI comes after the simpler cli/cgi sapis
-       if use apache2 ; then
-               PHPSAPIS="${PHPSAPIS} apache${APACHE_VERSION}"
-       fi
-}
-
-src_unpack() {
-       if [[ "${PHP_PACKAGE}" == 1 ]] ; then
-               unpack ${A}
-       fi
-
-       cd "${S}"
-
-       # Concurrent PHP Apache2 modules support
-       if use apache2 ; then
-               if use concurrentmodphp ; then
-                       if [[ -n "${CONCURRENTMODPHP_PATCH}" ]] && [[ -f "${WORKDIR}/${CONCURRENTMODPHP_PATCH}" ]] ; then
-                               epatch "${WORKDIR}/${CONCURRENTMODPHP_PATCH}"
-                       else
-                               ewarn "There is no concurrent mod_php patch available for this PHP release yet!"
-                       fi
-               fi
-       fi
-
-       # fastbuild support
-       if use fastbuild ; then
-               if [[ -n "${FASTBUILD_PATCH}" ]] && [[ -f "${WORKDIR}/${FASTBUILD_PATCH}" ]] ; then
-                       epatch "${WORKDIR}/${FASTBUILD_PATCH}"
-               else
-                       ewarn "There is no fastbuild patch available for this PHP release yet!"
-               fi
-       fi
-
-       # kolab support
-       if [[ -n "${KOLAB_PATCH}" ]] ; then
-               use kolab && epatch "${WORKDIR}/${KOLAB_PATCH}"
-       fi
-
-       # Security bug #292132
-       epatch "${WORKDIR}"/${MY_PHP_PV}/gd-maxcolors.patch
-
-       # pretend to not have flex, bug 221357
-       sed -re 's:( +)PHP_SUBST\(LEX\):\1LEX="exit 0;"\n\0:' -i acinclude.m4
-
-       # Now let the eclass do the rest and regenerate the configure
-       php5_2-sapi_src_unpack
-
-       # Fix Makefile.global:test to consider the CGI SAPI if present
-       if use cgi ; then
-               sed -e "s|test \! -z \"\$(top_builddir)/php-cli\" \&\& test -x \"\$(top_builddir)/php-cli\"|test \! -z \"\$(top_builddir)/php-cli\" \&\& test -x \"\$(top_builddir)/php-cli\" \&\& test \! -z \"\$(top_builddir)/php-cgi\" \&\& test -x \"\$(top_builddir)/php-cgi\"|g" -i Makefile.global
-               sed -e "s|TEST_PHP_EXECUTABLE=\"\$(top_builddir)/php-cli\"|TEST_PHP_EXECUTABLE=\"\$(top_builddir)/php-cli\" TEST_PHP_CGI_EXECUTABLE=\"\$(top_builddir)/php-cgi\"|g" -i Makefile.global
-       fi
-
-       # try to fix some test cases which fail because of sandbox otherwise
-       sed -e 's:/no/such/:.\0:' -i ext/standard/tests/file/005_error.phpt \
-               ext/standard/tests/file/006_error.phpt \
-               ext/standard/tests/file/touch.phpt
-
-       # REMOVING BROKEN TESTS:
-       # removing this test as it has been broken for ages and is not easily
-       # fixable (depends on a lot of factors)
-       rm ext/standard/tests/general_functions/phpinfo.phpt
-
-       # never worked properly, no easy fix
-       rm ext/iconv/tests/bug16069.phpt ext/iconv/tests/iconv_stream_filter.phpt
-
-       # needs write access to /tmp and others
-       rm ext/session/tests/session_save_path_variation5.phpt
-
-       # new tests since 5.2.7 which have never been working for me
-       rm ext/spl/tests/arrayObject___construct_basic4.phpt \
-               ext/spl/tests/arrayObject___construct_basic5.phpt \
-               ext/spl/tests/arrayObject_exchangeArray_basic3.phpt \
-               ext/spl/tests/arrayObject_setFlags_basic1.phpt
-
-       # those might as well be related to suhosin
-       rm ext/session/tests/session_decode_variation3.phpt \
-               ext/session/tests/session_encode_variation8.phpt
-
-       # missing skipif
-       use reflection || \
-               rm ext/standard/tests/directory/DirectoryClass_basic_001.phpt
-
-       # sandbox-related (sandbox checks for permissions before even looking
-       # at the fs, but the tests expect "No such file or directory"
-       sed -e 's:/blah:./bla:' -i \
-               ext/session/tests/session_save_path_variation{2,3}.phpt
-       rm ext/standard/tests/file/rename_variation13.phpt
-
-       # test passes, but run-tests.php claims failure
-       rm ext/standard/tests/file/tempnam_variation4.phpt
-
-       # these tests behave differently with suhosin enabled, adapting them...
-       use suhosin && sed -e 's:File(\.\./):File(..):g' -i \
-               tests/security/open_basedir*{.inc,.phpt}
-}
-
-src_compile() {
-       # bug 217392 (autconf-2.62 behavior changes)
-       export CFLAGS="${CFLAGS} -D_GNU_SOURCE"
-       export CXXFLAGS="${CXXFLAGS} -D_GNU_SOURCE"
-       if use 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_apache2=0
-       my_conf=""
-
-       for x in ${PHPSAPIS} ; do
-               case ${x} in
-                       cli)
-                               build_cli=1
-                               ;;
-                       cgi)
-                               build_cgi=1
-                               ;;
-                       apache2)
-                               build_apache2=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_apache2} = 1 ]] ; then
-               my_conf="${my_conf} --with-apxs2=/usr/sbin/apxs2"
-
-               # Threaded Apache2 support
-               if use threads ; then
-                       my_conf="${my_conf} --enable-maintainer-zts"
-                       ewarn "Enabling ZTS for Apache2 MPM"
-               fi
-
-               # Concurrent PHP Apache2 modules support
-               if use concurrentmodphp ; then
-                       append-ldflags "-Wl,--version-script=${FILESDIR}/php5-ldvs"
-               fi
-       fi
-
-       if use pcre || phpconfutils_usecheck pcre ; then
-               myconf="${my_conf} --with-pcre-dir=/usr"
-               phpconfutils_extension_with "pcre-regex" "pcre" 0 "/usr"
-       fi
-
-       # Now we know what we are building, build it
-       php5_2-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-cgi || die "Unable to make CGI SAPI"
-               cp sapi/cgi/php-cgi php-cgi || die "Unable to copy CGI SAPI"
-       fi
-
-       if [[ ${build_apache2} = 1 ]] ; then
-               einfo
-               einfo "Building apache${APACHE_VERSION} 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 make apache${APACHE_VERSION} SAPI"
-       fi
-}
-
-src_compile_normal() {
-       php_determine_sapis
-
-       CLEAN_REQUIRED=0
-       my_conf=""
-
-       # Support the Apache2 extras, they must be set globally for all
-       # SAPIs to work correctly, especially for external PHP extensions
-       if use apache2 ; then
-               # Concurrent PHP Apache2 modules support
-               if use concurrentmodphp ; then
-                       append-ldflags "-Wl,--version-script=${FILESDIR}/php5-ldvs"
-               fi
-       fi
-
-       for x in ${PHPSAPIS} ; do
-               if use pcre || phpconfutils_usecheck pcre ; then
-                       myconf="${my_conf} --with-pcre-dir=/usr"
-                       phpconfutils_extension_with "pcre-regex" "pcre" 0 "/usr"
-               fi
-
-               # Support the Apache2 extras, they must be set globally for all
-               # SAPIs to work correctly, especially for external PHP extensions
-               if use apache2 ; then
-                       # Threaded Apache2 support
-                       if use threads ; then
-                               my_conf="${my_conf} --enable-maintainer-zts"
-                               ewarn "Enabling ZTS for Apache2 MPM"
-                       fi
-               fi
-
-               if [[ "${CLEAN_REQUIRED}" = 1 ]] ; then
-                       make clean
-               fi
-
-               PHPSAPI="${x}"
-
-               case ${x} in
-                       cli)
-                               my_conf="${my_conf} --enable-cli --disable-cgi"
-                               php5_2-sapi_src_compile
-                               cp sapi/cli/php php-cli || die "Unable to copy CLI SAPI"
-                               ;;
-                       cgi)
-                               my_conf="${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_2-sapi_src_compile
-                               cp sapi/cgi/php-cgi php-cgi || die "Unable to copy CGI SAPI"
-                               ;;
-                       apache2)
-                               my_conf="${my_conf} --disable-cli --with-apxs2=/usr/sbin/apxs2"
-                               php5_2-sapi_src_compile
-                               ;;
-               esac
-
-               CLEAN_REQUIRED=1
-               my_conf=""
-       done
-}
-
-src_install() {
-       php_determine_sapis
-
-       destdir=/usr/$(get_libdir)/php5
-
-       # Let the eclass do the common work
-       php5_2-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_2-sapi_install_ini
-                               ;;
-                       cgi)
-                               einfo "Installing CGI SAPI"
-                               into ${destdir}
-                               dobin php-cgi || die "Unable to install ${x} sapi"
-                               php5_2-sapi_install_ini
-                               ;;
-                       apache2)
-                               einfo "Installing Apache${APACHE_VERSION} SAPI"
-                               make INSTALL_ROOT="${D}" install-sapi || die "Unable to install ${x} SAPI"
-                               if use concurrentmodphp ; then
-                                       einfo "Installing Apache${APACHE_VERSION} config file for PHP5-concurrent (70_mod_php5_concurr.conf)"
-                                       insinto ${APACHE_MODULES_CONFDIR}
-                                       newins "${FILESDIR}/70_mod_php5_concurr.conf-apache2-r1" "70_mod_php5_concurr.conf"
-
-                                       # Put the ld version script in the right place so it's always accessible
-                                       insinto "/var/lib/php-pkg/${CATEGORY}/${PN}-${PVR}/"
-                                       doins "${FILESDIR}/php5-ldvs"
-
-                                       # Redefine the extension dir to have the modphp suffix
-                                       PHPEXTDIR="`"${D}/${destdir}/bin/php-config" --extension-dir`-versioned"
-                               else
-                                       einfo "Installing Apache${APACHE_VERSION} config file for PHP5 (70_mod_php5.conf)"
-                                       insinto ${APACHE_MODULES_CONFDIR}
-                                       newins "${FILESDIR}/70_mod_php5.conf-apache2-r1" "70_mod_php5.conf"
-                               fi
-                               php5_2-sapi_install_ini
-                               ;;
-               esac
-       done
-
-       # Install env.d files
-       newenvd "${FILESDIR}/20php5-envd" "20php5"
-       sed -e "s|/lib/|/$(get_libdir)/|g" -i "${D}/etc/env.d/20php5"
-}
-
-pkg_postinst() {
-       # Output some general info to the user
-       if use apache2 ; then
-               APACHE2_MOD_DEFINE="PHP5"
-               if use concurrentmodphp ; then
-                       APACHE2_MOD_CONF="70_mod_php5_concurr"
-               else
-                       APACHE2_MOD_CONF="70_mod_php5"
-               fi
-               apache-module_pkg_postinst
-       fi
-
-       # Update Apache2 to use mod_php
-       if use apache2 ; then
-               "${ROOT}/usr/sbin/php-select" -t apache2 php5 > /dev/null 2>&1
-               exitStatus=$?
-               if [[ ${exitStatus} == 2 ]] ; then
-                       php-select apache2 php5
-               elif [[ ${exitStatus} == 4 ]] ; then
-                       ewarn
-                       ewarn "Apache2 is configured to load a different version of PHP."
-                       ewarn "To make Apache2 use PHP v5, use php-select:"
-                       ewarn
-                       ewarn "    php-select apache2 php5"
-                       ewarn
-               fi
-       fi
-
-       # Create the symlinks for php-cli
-       if use cli || phpconfutils_usecheck cli ; then
-               "${ROOT}/usr/sbin/php-select" -t php php5 > /dev/null 2>&1
-               exitStatus=$?
-               if [[ ${exitStatus} == 5 ]] ; then
-                       php-select php php5
-               elif [[ ${exitStatus} == 4 ]] ; then
-                       ewarn
-                       ewarn "/usr/bin/php links to a different version of PHP."
-                       ewarn "To make /usr/bin/php point to PHP v5, use php-select:"
-                       ewarn
-                       ewarn "    php-select php php5"
-                       ewarn
-               fi
-       fi
-
-       # Create the symlinks for php-cgi
-       if use cgi ; then
-               "${ROOT}/usr/sbin/php-select" -t php-cgi php5 > /dev/null 2>&1
-               exitStatus=$?
-               if [[ ${exitStatus} == 5 ]] ; then
-                       php-select php-cgi php5
-               elif [[ ${exitStatus} == 4 ]] ; then
-                       ewarn
-                       ewarn "/usr/bin/php-cgi links to a different version of PHP."
-                       ewarn "To make /usr/bin/php-cgi point to PHP v5, use php-select:"
-                       ewarn
-                       ewarn "    php-select php-cgi php5"
-                       ewarn
-               fi
-       fi
-
-       # Create the symlinks for php-devel
-       "${ROOT}/usr/sbin/php-select" -t php-devel php5 > /dev/null 2>&1
-       exitStatus=$?
-       if [[ $exitStatus == 5 ]] ; then
-               php-select php-devel php5
-       elif [[ $exitStatus == 4 ]] ; then
-               ewarn
-               ewarn "/usr/bin/php-config and/or /usr/bin/phpize are linked to a"
-               ewarn "different version of PHP. To make them point to PHP v5, use"
-               ewarn "php-select:"
-               ewarn
-               ewarn "    php-select php-devel php5"
-               ewarn
-       fi
-
-       php5_2-sapi_pkg_postinst
-}
-
-src_test() {
-       echo ">>> Test phase [test]: ${CATEGORY}/${PF}"
-       if [[ ! -x "${S}"/php-cli ]]; then
-               ewarn "Running the php test suite requires USE=cli"
-               return
-       fi
-
-       export TEST_PHP_EXECUTABLE="${S}"/php-cli
-       if [[ -x "${S}"/php-cgi ]]; then
-               export TEST_PHP_CGI_EXECUTABLE="${S}"/php-cgi
-       fi
-       REPORT_EXIT_STATUS=1 "${S}"/php-cli -n "${S}"/run-tests.php -n
-
-       if [[ $? != 0 ]] ; then
-               eerror "Not all tests were successful!"
-       fi
-}
diff --git a/dev-lang/php/php-5.2.11.ebuild b/dev-lang/php/php-5.2.11.ebuild
deleted file mode 100644 (file)
index 6e466ef..0000000
+++ /dev/null
@@ -1,549 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/php/php-5.2.11.ebuild,v 1.10 2010/01/31 19:53:09 tove Exp $
-
-CGI_SAPI_USE="discard-path force-cgi-redirect"
-APACHE2_SAPI_USE="concurrentmodphp threads"
-IUSE="cli cgi ${CGI_SAPI_USE} ${APACHE2_SAPI_USE} fastbuild"
-
-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, general
-PHP_PATCHSET_REV="${PR/r/}"
-PHP_PATCHSET_REV="${PHP_PATCHSET_REV/2/1}"
-SUHOSIN_PATCH="suhosin-patch-${MY_PHP_PV}-0.9.7.patch.gz"
-MULTILIB_PATCH="${MY_PHP_PV}/opt/multilib-search-path.patch"
-# php patch settings, ebuild specific
-FASTBUILD_PATCH="${MY_PHP_PV}/opt/fastbuild.patch"
-CONCURRENTMODPHP_PATCH="${MY_PHP_PV}/opt/concurrent_apache_modules.patch"
-# kolab patch - http://kolab.org/cgi-bin/viewcvs-kolab.cgi/server/patches/php/
-# bugs about this go to wrobel@gentoo.org
-KOLAB_PATCH="${MY_PHP_PV}/opt/kolab-imap-annotations.patch"
-
-inherit versionator php5_2-sapi apache-module
-
-# Suhosin patch support
-[[ -n "${SUHOSIN_PATCH}" ]] && SRC_URI="${SRC_URI} suhosin? ( http://gentoo.longitekk.com/${SUHOSIN_PATCH} )"
-
-DESCRIPTION="The PHP language runtime engine: CLI, CGI and Apache2 SAPIs."
-
-DEPEND="app-admin/php-toolkit
-       imap? ( >=virtual/imap-c-client-2006k )
-       pcre? ( >=dev-libs/libpcre-7.8 )
-       xml? ( >=dev-libs/libxml2-2.7.2-r2 )
-       xmlrpc? ( >=dev-libs/libxml2-2.7.2-r2 virtual/libiconv )"
-
-RDEPEND="${DEPEND}"
-if [[ -n "${KOLAB_PATCH}" ]] ; then
-       IUSE="${IUSE} kolab"
-       DEPEND="${DEPEND}
-               kolab? ( >=net-libs/c-client-2004g-r1 )"
-fi
-
-PDEPEND="suhosin? ( >=dev-php5/suhosin-0.9.29 )"
-
-want_apache
-
-pkg_setup() {
-       PHPCONFUTILS_AUTO_USE=""
-
-       # Make sure the user has specified at least one SAPI
-       einfo "Determining SAPI(s) to build"
-       phpconfutils_require_any "  Enabled  SAPI:" "  Disabled SAPI:" cli cgi apache2
-
-       # Threaded Apache2 support
-       if use apache2 ; then
-               has_apache_threads
-       fi
-
-       # Concurrent PHP Apache2 modules support
-       if use apache2 ; then
-               if use concurrentmodphp ; then
-                       ewarn
-                       ewarn "'concurrentmodphp' makes it possible to load multiple, differently"
-                       ewarn "versioned mod_php's into the same Apache instance. This is done with"
-                       ewarn "a few linker tricks and workarounds, and is not guaranteed to always"
-                       ewarn "work correctly, so use it at your own risk. Especially, do not use"
-                       ewarn "this in conjunction with PHP modules (PECL, ...) other than the ones"
-                       ewarn "you may find in the Portage tree or the PHP Overlay!"
-                       ewarn "This is an experimental feature, so please rebuild PHP"
-                       ewarn "without the 'concurrentmodphp' 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 'concurrentmodphp', please file a bug in"
-                       ewarn "Gentoo's Bugzilla only."
-                       ewarn
-                       ebeep 5
-               fi
-       fi
-
-       # fastbuild support
-       if use 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
-
-       if use pcre ; then
-               built_with_use dev-libs/libpcre unicode || \
-                       die "Please rebuild dev-libs/libpcre with USE=unicode"
-       fi
-
-       depend.apache_pkg_setup
-       php5_2-sapi_pkg_setup
-}
-
-php_determine_sapis() {
-       # holds the list of sapis that we want to build
-       PHPSAPIS=
-
-       if use cli || phpconfutils_usecheck cli ; then
-               PHPSAPIS="${PHPSAPIS} cli"
-       fi
-
-       if use cgi ; then
-               PHPSAPIS="${PHPSAPIS} cgi"
-       fi
-
-       # note - apache SAPI comes after the simpler cli/cgi sapis
-       if use apache2 ; then
-               PHPSAPIS="${PHPSAPIS} apache${APACHE_VERSION}"
-       fi
-}
-
-src_unpack() {
-       if [[ "${PHP_PACKAGE}" == 1 ]] ; then
-               unpack ${A}
-       fi
-
-       cd "${S}"
-
-       # Concurrent PHP Apache2 modules support
-       if use apache2 ; then
-               if use concurrentmodphp ; then
-                       if [[ -n "${CONCURRENTMODPHP_PATCH}" ]] && [[ -f "${WORKDIR}/${CONCURRENTMODPHP_PATCH}" ]] ; then
-                               epatch "${WORKDIR}/${CONCURRENTMODPHP_PATCH}"
-                       else
-                               ewarn "There is no concurrent mod_php patch available for this PHP release yet!"
-                       fi
-               fi
-       fi
-
-       # fastbuild support
-       if use fastbuild ; then
-               if [[ -n "${FASTBUILD_PATCH}" ]] && [[ -f "${WORKDIR}/${FASTBUILD_PATCH}" ]] ; then
-                       epatch "${WORKDIR}/${FASTBUILD_PATCH}"
-               else
-                       ewarn "There is no fastbuild patch available for this PHP release yet!"
-               fi
-       fi
-
-       # kolab support
-       if [[ -n "${KOLAB_PATCH}" ]] ; then
-               use kolab && epatch "${WORKDIR}/${KOLAB_PATCH}"
-       fi
-
-       # pretend to not have flex, bug 221357
-       sed -re 's:( +)PHP_SUBST\(LEX\):\1LEX="exit 0;"\n\0:' -i acinclude.m4
-
-       # Now let the eclass do the rest and regenerate the configure
-       php5_2-sapi_src_unpack
-
-       # Fix Makefile.global:test to consider the CGI SAPI if present
-       if use cgi ; then
-               sed -e "s|test \! -z \"\$(top_builddir)/php-cli\" \&\& test -x \"\$(top_builddir)/php-cli\"|test \! -z \"\$(top_builddir)/php-cli\" \&\& test -x \"\$(top_builddir)/php-cli\" \&\& test \! -z \"\$(top_builddir)/php-cgi\" \&\& test -x \"\$(top_builddir)/php-cgi\"|g" -i Makefile.global
-               sed -e "s|TEST_PHP_EXECUTABLE=\"\$(top_builddir)/php-cli\"|TEST_PHP_EXECUTABLE=\"\$(top_builddir)/php-cli\" TEST_PHP_CGI_EXECUTABLE=\"\$(top_builddir)/php-cgi\"|g" -i Makefile.global
-       fi
-
-       # try to fix some test cases which fail because of sandbox otherwise
-       sed -e 's:/no/such/:.\0:' -i ext/standard/tests/file/005_error.phpt \
-               ext/standard/tests/file/006_error.phpt \
-               ext/standard/tests/file/touch.phpt
-
-       # REMOVING BROKEN TESTS:
-       # removing this test as it has been broken for ages and is not easily
-       # fixable (depends on a lot of factors)
-       rm ext/standard/tests/general_functions/phpinfo.phpt
-
-       # never worked properly, no easy fix
-       rm ext/iconv/tests/bug16069.phpt ext/iconv/tests/iconv_stream_filter.phpt
-
-       # needs write access to /tmp and others
-       rm ext/session/tests/session_save_path_variation5.phpt
-
-       # new tests since 5.2.7 which have never been working for me
-       rm ext/spl/tests/arrayObject___construct_basic4.phpt \
-               ext/spl/tests/arrayObject___construct_basic5.phpt \
-               ext/spl/tests/arrayObject_exchangeArray_basic3.phpt \
-               ext/spl/tests/arrayObject_setFlags_basic1.phpt
-
-       # those might as well be related to suhosin
-       rm ext/session/tests/session_decode_variation3.phpt \
-               ext/session/tests/session_encode_variation8.phpt
-
-       # missing skipif
-       use reflection || \
-               rm ext/standard/tests/directory/DirectoryClass_basic_001.phpt
-
-       # sandbox-related (sandbox checks for permissions before even looking
-       # at the fs, but the tests expect "No such file or directory"
-       sed -e 's:/blah:./bla:' -i \
-               ext/session/tests/session_save_path_variation{2,3}.phpt
-       rm ext/standard/tests/file/rename_variation13.phpt
-
-       # test passes, but run-tests.php claims failure
-       rm ext/standard/tests/file/tempnam_variation4.phpt
-
-       # these tests behave differently with suhosin enabled, adapting them...
-       use suhosin && sed -e 's:File(\.\./):File(..):g' -i \
-               tests/security/open_basedir*{.inc,.phpt}
-}
-
-src_compile() {
-       # bug 217392 (autconf-2.62 behavior changes)
-       export CFLAGS="${CFLAGS} -D_GNU_SOURCE"
-       export CXXFLAGS="${CXXFLAGS} -D_GNU_SOURCE"
-       if use 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_apache2=0
-       my_conf=""
-
-       for x in ${PHPSAPIS} ; do
-               case ${x} in
-                       cli)
-                               build_cli=1
-                               ;;
-                       cgi)
-                               build_cgi=1
-                               ;;
-                       apache2)
-                               build_apache2=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_apache2} = 1 ]] ; then
-               my_conf="${my_conf} --with-apxs2=/usr/sbin/apxs2"
-
-               # Threaded Apache2 support
-               if use threads ; then
-                       my_conf="${my_conf} --enable-maintainer-zts"
-                       ewarn "Enabling ZTS for Apache2 MPM"
-               fi
-
-               # Concurrent PHP Apache2 modules support
-               if use concurrentmodphp ; then
-                       append-ldflags "-Wl,--version-script=${FILESDIR}/php5-ldvs"
-               fi
-       fi
-
-       if use pcre || phpconfutils_usecheck pcre ; then
-               myconf="${my_conf} --with-pcre-dir=/usr"
-               phpconfutils_extension_with "pcre-regex" "pcre" 0 "/usr"
-       fi
-
-       # Now we know what we are building, build it
-       php5_2-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-cgi || die "Unable to make CGI SAPI"
-               cp sapi/cgi/php-cgi php-cgi || die "Unable to copy CGI SAPI"
-       fi
-
-       if [[ ${build_apache2} = 1 ]] ; then
-               einfo
-               einfo "Building apache${APACHE_VERSION} 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 make apache${APACHE_VERSION} SAPI"
-       fi
-}
-
-src_compile_normal() {
-       php_determine_sapis
-
-       CLEAN_REQUIRED=0
-       my_conf=""
-
-       # Support the Apache2 extras, they must be set globally for all
-       # SAPIs to work correctly, especially for external PHP extensions
-       if use apache2 ; then
-               # Concurrent PHP Apache2 modules support
-               if use concurrentmodphp ; then
-                       append-ldflags "-Wl,--version-script=${FILESDIR}/php5-ldvs"
-               fi
-       fi
-
-       for x in ${PHPSAPIS} ; do
-               if use pcre || phpconfutils_usecheck pcre ; then
-                       myconf="${my_conf} --with-pcre-dir=/usr"
-                       phpconfutils_extension_with "pcre-regex" "pcre" 0 "/usr"
-               fi
-
-               # Support the Apache2 extras, they must be set globally for all
-               # SAPIs to work correctly, especially for external PHP extensions
-               if use apache2 ; then
-                       # Threaded Apache2 support
-                       if use threads ; then
-                               my_conf="${my_conf} --enable-maintainer-zts"
-                               ewarn "Enabling ZTS for Apache2 MPM"
-                       fi
-               fi
-
-               if [[ "${CLEAN_REQUIRED}" = 1 ]] ; then
-                       make clean
-               fi
-
-               PHPSAPI="${x}"
-
-               case ${x} in
-                       cli)
-                               my_conf="${my_conf} --enable-cli --disable-cgi"
-                               php5_2-sapi_src_compile
-                               cp sapi/cli/php php-cli || die "Unable to copy CLI SAPI"
-                               ;;
-                       cgi)
-                               my_conf="${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_2-sapi_src_compile
-                               cp sapi/cgi/php-cgi php-cgi || die "Unable to copy CGI SAPI"
-                               ;;
-                       apache2)
-                               my_conf="${my_conf} --disable-cli --with-apxs2=/usr/sbin/apxs2"
-                               php5_2-sapi_src_compile
-                               ;;
-               esac
-
-               CLEAN_REQUIRED=1
-               my_conf=""
-       done
-}
-
-src_install() {
-       php_determine_sapis
-
-       destdir=/usr/$(get_libdir)/php5
-
-       # Let the eclass do the common work
-       php5_2-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_2-sapi_install_ini
-                               ;;
-                       cgi)
-                               einfo "Installing CGI SAPI"
-                               into ${destdir}
-                               dobin php-cgi || die "Unable to install ${x} sapi"
-                               php5_2-sapi_install_ini
-                               ;;
-                       apache2)
-                               einfo "Installing Apache${APACHE_VERSION} SAPI"
-                               make INSTALL_ROOT="${D}" install-sapi || die "Unable to install ${x} SAPI"
-                               if use concurrentmodphp ; then
-                                       einfo "Installing Apache${APACHE_VERSION} config file for PHP5-concurrent (70_mod_php5_concurr.conf)"
-                                       insinto ${APACHE_MODULES_CONFDIR}
-                                       newins "${FILESDIR}/70_mod_php5_concurr.conf-apache2-r1" "70_mod_php5_concurr.conf"
-
-                                       # Put the ld version script in the right place so it's always accessible
-                                       insinto "/var/lib/php-pkg/${CATEGORY}/${PN}-${PVR}/"
-                                       doins "${FILESDIR}/php5-ldvs"
-
-                                       # Redefine the extension dir to have the modphp suffix
-                                       PHPEXTDIR="`"${D}/${destdir}/bin/php-config" --extension-dir`-versioned"
-                               else
-                                       einfo "Installing Apache${APACHE_VERSION} config file for PHP5 (70_mod_php5.conf)"
-                                       insinto ${APACHE_MODULES_CONFDIR}
-                                       newins "${FILESDIR}/70_mod_php5.conf-apache2-r1" "70_mod_php5.conf"
-                               fi
-                               php5_2-sapi_install_ini
-                               ;;
-               esac
-       done
-
-       # Install env.d files
-       newenvd "${FILESDIR}/20php5-envd" "20php5"
-       sed -e "s|/lib/|/$(get_libdir)/|g" -i "${D}/etc/env.d/20php5"
-}
-
-pkg_postinst() {
-       # Output some general info to the user
-       if use apache2 ; then
-               APACHE2_MOD_DEFINE="PHP5"
-               if use concurrentmodphp ; then
-                       APACHE2_MOD_CONF="70_mod_php5_concurr"
-               else
-                       APACHE2_MOD_CONF="70_mod_php5"
-               fi
-               apache-module_pkg_postinst
-       fi
-
-       # Update Apache2 to use mod_php
-       if use apache2 ; then
-               "${ROOT}/usr/sbin/php-select" -t apache2 php5 > /dev/null 2>&1
-               exitStatus=$?
-               if [[ ${exitStatus} == 2 ]] ; then
-                       php-select apache2 php5
-               elif [[ ${exitStatus} == 4 ]] ; then
-                       ewarn
-                       ewarn "Apache2 is configured to load a different version of PHP."
-                       ewarn "To make Apache2 use PHP v5, use php-select:"
-                       ewarn
-                       ewarn "    php-select apache2 php5"
-                       ewarn
-               fi
-       fi
-
-       # Create the symlinks for php-cli
-       if use cli || phpconfutils_usecheck cli ; then
-               "${ROOT}/usr/sbin/php-select" -t php php5 > /dev/null 2>&1
-               exitStatus=$?
-               if [[ ${exitStatus} == 5 ]] ; then
-                       php-select php php5
-               elif [[ ${exitStatus} == 4 ]] ; then
-                       ewarn
-                       ewarn "/usr/bin/php links to a different version of PHP."
-                       ewarn "To make /usr/bin/php point to PHP v5, use php-select:"
-                       ewarn
-                       ewarn "    php-select php php5"
-                       ewarn
-               fi
-       fi
-
-       # Create the symlinks for php-cgi
-       if use cgi ; then
-               "${ROOT}/usr/sbin/php-select" -t php-cgi php5 > /dev/null 2>&1
-               exitStatus=$?
-               if [[ ${exitStatus} == 5 ]] ; then
-                       php-select php-cgi php5
-               elif [[ ${exitStatus} == 4 ]] ; then
-                       ewarn
-                       ewarn "/usr/bin/php-cgi links to a different version of PHP."
-                       ewarn "To make /usr/bin/php-cgi point to PHP v5, use php-select:"
-                       ewarn
-                       ewarn "    php-select php-cgi php5"
-                       ewarn
-               fi
-       fi
-
-       # Create the symlinks for php-devel
-       "${ROOT}/usr/sbin/php-select" -t php-devel php5 > /dev/null 2>&1
-       exitStatus=$?
-       if [[ $exitStatus == 5 ]] ; then
-               php-select php-devel php5
-       elif [[ $exitStatus == 4 ]] ; then
-               ewarn
-               ewarn "/usr/bin/php-config and/or /usr/bin/phpize are linked to a"
-               ewarn "different version of PHP. To make them point to PHP v5, use"
-               ewarn "php-select:"
-               ewarn
-               ewarn "    php-select php-devel php5"
-               ewarn
-       fi
-
-       php5_2-sapi_pkg_postinst
-}
-
-src_test() {
-       echo ">>> Test phase [test]: ${CATEGORY}/${PF}"
-       if [[ ! -x "${S}"/php-cli ]]; then
-               ewarn "Running the php test suite requires USE=cli"
-               return
-       fi
-
-       export TEST_PHP_EXECUTABLE="${S}"/php-cli
-       if [[ -x "${S}"/php-cgi ]]; then
-               export TEST_PHP_CGI_EXECUTABLE="${S}"/php-cgi
-       fi
-       REPORT_EXIT_STATUS=1 "${S}"/php-cli -n "${S}"/run-tests.php -n
-
-       if [[ $? != 0 ]] ; then
-               eerror "Not all tests were successful!"
-       fi
-}
diff --git a/dev-lang/php/php-5.2.12.ebuild b/dev-lang/php/php-5.2.12.ebuild
deleted file mode 100644 (file)
index b9ad877..0000000
+++ /dev/null
@@ -1,550 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/php/php-5.2.12.ebuild,v 1.10 2010/03/13 18:23:23 ssuominen Exp $
-
-CGI_SAPI_USE="discard-path force-cgi-redirect"
-APACHE2_SAPI_USE="concurrentmodphp threads"
-IUSE="cli cgi ${CGI_SAPI_USE} ${APACHE2_SAPI_USE} fastbuild"
-
-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, general
-PHP_PATCHSET_REV="${PR/r/}"
-PHP_PATCHSET_URI="http://dev.gentoo.org/~hoffie/distfiles/php-patchset-${PV}-r${PHP_PATCHSET_REV}.tar.bz2"
-SUHOSIN_PATCH="suhosin-patch-5.2.11-0.9.7.patch.gz"
-MULTILIB_PATCH="${MY_PHP_PV}/opt/multilib-search-path.patch"
-# php patch settings, ebuild specific
-FASTBUILD_PATCH="${MY_PHP_PV}/opt/fastbuild.patch"
-CONCURRENTMODPHP_PATCH="${MY_PHP_PV}/opt/concurrent_apache_modules.patch"
-# kolab patch - http://kolab.org/cgi-bin/viewcvs-kolab.cgi/server/patches/php/
-# bugs about this go to wrobel@gentoo.org
-KOLAB_PATCH="${MY_PHP_PV}/opt/kolab-imap-annotations.patch"
-
-inherit versionator php5_2-sapi apache-module
-
-# Suhosin patch support
-[[ -n "${SUHOSIN_PATCH}" ]] && SRC_URI="${SRC_URI} suhosin? ( http://gentoo.longitekk.com/${SUHOSIN_PATCH} )"
-
-DESCRIPTION="The PHP language runtime engine: CLI, CGI and Apache2 SAPIs."
-
-DEPEND="app-admin/php-toolkit
-       imap? ( >=virtual/imap-c-client-2006k )
-       pcre? ( >=dev-libs/libpcre-7.8 )
-       xml? ( >=dev-libs/libxml2-2.7.2-r2 )
-       xmlrpc? ( >=dev-libs/libxml2-2.7.2-r2 virtual/libiconv )"
-
-RDEPEND="${DEPEND}"
-if [[ -n "${KOLAB_PATCH}" ]] ; then
-       IUSE="${IUSE} kolab"
-       DEPEND="${DEPEND}
-               kolab? ( >=net-libs/c-client-2004g-r1 )"
-fi
-
-PDEPEND="suhosin? ( >=dev-php5/suhosin-0.9.29 )"
-
-want_apache
-
-pkg_setup() {
-       PHPCONFUTILS_AUTO_USE=""
-
-       # Make sure the user has specified at least one SAPI
-       einfo "Determining SAPI(s) to build"
-       phpconfutils_require_any "  Enabled  SAPI:" "  Disabled SAPI:" cli cgi apache2
-
-       # Threaded Apache2 support
-       if use apache2 ; then
-               has_apache_threads
-       fi
-
-       # Concurrent PHP Apache2 modules support
-       if use apache2 ; then
-               if use concurrentmodphp ; then
-                       ewarn
-                       ewarn "'concurrentmodphp' makes it possible to load multiple, differently"
-                       ewarn "versioned mod_php's into the same Apache instance. This is done with"
-                       ewarn "a few linker tricks and workarounds, and is not guaranteed to always"
-                       ewarn "work correctly, so use it at your own risk. Especially, do not use"
-                       ewarn "this in conjunction with PHP modules (PECL, ...) other than the ones"
-                       ewarn "you may find in the Portage tree or the PHP Overlay!"
-                       ewarn "This is an experimental feature, so please rebuild PHP"
-                       ewarn "without the 'concurrentmodphp' 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 'concurrentmodphp', please file a bug in"
-                       ewarn "Gentoo's Bugzilla only."
-                       ewarn
-                       ebeep 5
-               fi
-       fi
-
-       # fastbuild support
-       if use 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
-
-       if use pcre ; then
-               built_with_use dev-libs/libpcre unicode || \
-                       die "Please rebuild dev-libs/libpcre with USE=unicode"
-       fi
-
-       depend.apache_pkg_setup
-       php5_2-sapi_pkg_setup
-}
-
-php_determine_sapis() {
-       # holds the list of sapis that we want to build
-       PHPSAPIS=
-
-       if use cli || phpconfutils_usecheck cli ; then
-               PHPSAPIS="${PHPSAPIS} cli"
-       fi
-
-       if use cgi ; then
-               PHPSAPIS="${PHPSAPIS} cgi"
-       fi
-
-       # note - apache SAPI comes after the simpler cli/cgi sapis
-       if use apache2 ; then
-               PHPSAPIS="${PHPSAPIS} apache${APACHE_VERSION}"
-       fi
-}
-
-src_unpack() {
-       if [[ "${PHP_PACKAGE}" == 1 ]] ; then
-               unpack ${A}
-       fi
-
-       cd "${S}"
-
-       epatch "${FILESDIR}"/${P}-libpng14.patch
-
-       # Concurrent PHP Apache2 modules support
-       if use apache2 ; then
-               if use concurrentmodphp ; then
-                       if [[ -n "${CONCURRENTMODPHP_PATCH}" ]] && [[ -f "${WORKDIR}/${CONCURRENTMODPHP_PATCH}" ]] ; then
-                               epatch "${WORKDIR}/${CONCURRENTMODPHP_PATCH}"
-                       else
-                               ewarn "There is no concurrent mod_php patch available for this PHP release yet!"
-                       fi
-               fi
-       fi
-
-       # fastbuild support
-       if use fastbuild ; then
-               if [[ -n "${FASTBUILD_PATCH}" ]] && [[ -f "${WORKDIR}/${FASTBUILD_PATCH}" ]] ; then
-                       epatch "${WORKDIR}/${FASTBUILD_PATCH}"
-               else
-                       ewarn "There is no fastbuild patch available for this PHP release yet!"
-               fi
-       fi
-
-       # kolab support
-       if [[ -n "${KOLAB_PATCH}" ]] ; then
-               use kolab && epatch "${WORKDIR}/${KOLAB_PATCH}"
-       fi
-
-       # pretend to not have flex, bug 221357
-       sed -re 's:( +)PHP_SUBST\(LEX\):\1LEX="exit 0;"\n\0:' -i acinclude.m4
-
-       # Now let the eclass do the rest and regenerate the configure
-       php5_2-sapi_src_unpack
-
-       # Fix Makefile.global:test to consider the CGI SAPI if present
-       if use cgi ; then
-               sed -e "s|test \! -z \"\$(top_builddir)/php-cli\" \&\& test -x \"\$(top_builddir)/php-cli\"|test \! -z \"\$(top_builddir)/php-cli\" \&\& test -x \"\$(top_builddir)/php-cli\" \&\& test \! -z \"\$(top_builddir)/php-cgi\" \&\& test -x \"\$(top_builddir)/php-cgi\"|g" -i Makefile.global
-               sed -e "s|TEST_PHP_EXECUTABLE=\"\$(top_builddir)/php-cli\"|TEST_PHP_EXECUTABLE=\"\$(top_builddir)/php-cli\" TEST_PHP_CGI_EXECUTABLE=\"\$(top_builddir)/php-cgi\"|g" -i Makefile.global
-       fi
-
-       # try to fix some test cases which fail because of sandbox otherwise
-       sed -e 's:/no/such/:.\0:' -i ext/standard/tests/file/005_error.phpt \
-               ext/standard/tests/file/006_error.phpt \
-               ext/standard/tests/file/touch.phpt
-
-       # REMOVING BROKEN TESTS:
-       # removing this test as it has been broken for ages and is not easily
-       # fixable (depends on a lot of factors)
-       rm ext/standard/tests/general_functions/phpinfo.phpt
-
-       # never worked properly, no easy fix
-       rm ext/iconv/tests/bug16069.phpt ext/iconv/tests/iconv_stream_filter.phpt
-
-       # needs write access to /tmp and others
-       rm ext/session/tests/session_save_path_variation5.phpt
-
-       # new tests since 5.2.7 which have never been working for me
-       rm ext/spl/tests/arrayObject___construct_basic4.phpt \
-               ext/spl/tests/arrayObject___construct_basic5.phpt \
-               ext/spl/tests/arrayObject_exchangeArray_basic3.phpt \
-               ext/spl/tests/arrayObject_setFlags_basic1.phpt
-
-       # those might as well be related to suhosin
-       rm ext/session/tests/session_decode_variation3.phpt \
-               ext/session/tests/session_encode_variation8.phpt
-
-       # missing skipif
-       use reflection || \
-               rm ext/standard/tests/directory/DirectoryClass_basic_001.phpt
-
-       # sandbox-related (sandbox checks for permissions before even looking
-       # at the fs, but the tests expect "No such file or directory"
-       sed -e 's:/blah:./bla:' -i \
-               ext/session/tests/session_save_path_variation{2,3}.phpt
-       rm ext/standard/tests/file/rename_variation13.phpt
-
-       # test passes, but run-tests.php claims failure
-       rm ext/standard/tests/file/tempnam_variation4.phpt
-
-       # these tests behave differently with suhosin enabled, adapting them...
-       use suhosin && sed -e 's:File(\.\./):File(..):g' -i \
-               tests/security/open_basedir*{.inc,.phpt}
-}
-
-src_compile() {
-       # bug 217392 (autconf-2.62 behavior changes)
-       export CFLAGS="${CFLAGS} -D_GNU_SOURCE"
-       export CXXFLAGS="${CXXFLAGS} -D_GNU_SOURCE"
-       if use 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_apache2=0
-       my_conf=""
-
-       for x in ${PHPSAPIS} ; do
-               case ${x} in
-                       cli)
-                               build_cli=1
-                               ;;
-                       cgi)
-                               build_cgi=1
-                               ;;
-                       apache2)
-                               build_apache2=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_apache2} = 1 ]] ; then
-               my_conf="${my_conf} --with-apxs2=/usr/sbin/apxs2"
-
-               # Threaded Apache2 support
-               if use threads ; then
-                       my_conf="${my_conf} --enable-maintainer-zts"
-                       ewarn "Enabling ZTS for Apache2 MPM"
-               fi
-
-               # Concurrent PHP Apache2 modules support
-               if use concurrentmodphp ; then
-                       append-ldflags "-Wl,--version-script=${FILESDIR}/php5-ldvs"
-               fi
-       fi
-
-       if use pcre || phpconfutils_usecheck pcre ; then
-               myconf="${my_conf} --with-pcre-dir=/usr"
-               phpconfutils_extension_with "pcre-regex" "pcre" 0 "/usr"
-       fi
-
-       # Now we know what we are building, build it
-       php5_2-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-cgi || die "Unable to make CGI SAPI"
-               cp sapi/cgi/php-cgi php-cgi || die "Unable to copy CGI SAPI"
-       fi
-
-       if [[ ${build_apache2} = 1 ]] ; then
-               einfo
-               einfo "Building apache${APACHE_VERSION} 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 make apache${APACHE_VERSION} SAPI"
-       fi
-}
-
-src_compile_normal() {
-       php_determine_sapis
-
-       CLEAN_REQUIRED=0
-       my_conf=""
-
-       # Support the Apache2 extras, they must be set globally for all
-       # SAPIs to work correctly, especially for external PHP extensions
-       if use apache2 ; then
-               # Concurrent PHP Apache2 modules support
-               if use concurrentmodphp ; then
-                       append-ldflags "-Wl,--version-script=${FILESDIR}/php5-ldvs"
-               fi
-       fi
-
-       for x in ${PHPSAPIS} ; do
-               if use pcre || phpconfutils_usecheck pcre ; then
-                       myconf="${my_conf} --with-pcre-dir=/usr"
-                       phpconfutils_extension_with "pcre-regex" "pcre" 0 "/usr"
-               fi
-
-               # Support the Apache2 extras, they must be set globally for all
-               # SAPIs to work correctly, especially for external PHP extensions
-               if use apache2 ; then
-                       # Threaded Apache2 support
-                       if use threads ; then
-                               my_conf="${my_conf} --enable-maintainer-zts"
-                               ewarn "Enabling ZTS for Apache2 MPM"
-                       fi
-               fi
-
-               if [[ "${CLEAN_REQUIRED}" = 1 ]] ; then
-                       make clean
-               fi
-
-               PHPSAPI="${x}"
-
-               case ${x} in
-                       cli)
-                               my_conf="${my_conf} --enable-cli --disable-cgi"
-                               php5_2-sapi_src_compile
-                               cp sapi/cli/php php-cli || die "Unable to copy CLI SAPI"
-                               ;;
-                       cgi)
-                               my_conf="${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_2-sapi_src_compile
-                               cp sapi/cgi/php-cgi php-cgi || die "Unable to copy CGI SAPI"
-                               ;;
-                       apache2)
-                               my_conf="${my_conf} --disable-cli --with-apxs2=/usr/sbin/apxs2"
-                               php5_2-sapi_src_compile
-                               ;;
-               esac
-
-               CLEAN_REQUIRED=1
-               my_conf=""
-       done
-}
-
-src_install() {
-       php_determine_sapis
-
-       destdir=/usr/$(get_libdir)/php5
-
-       # Let the eclass do the common work
-       php5_2-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_2-sapi_install_ini
-                               ;;
-                       cgi)
-                               einfo "Installing CGI SAPI"
-                               into ${destdir}
-                               dobin php-cgi || die "Unable to install ${x} sapi"
-                               php5_2-sapi_install_ini
-                               ;;
-                       apache2)
-                               einfo "Installing Apache${APACHE_VERSION} SAPI"
-                               make INSTALL_ROOT="${D}" install-sapi || die "Unable to install ${x} SAPI"
-                               if use concurrentmodphp ; then
-                                       einfo "Installing Apache${APACHE_VERSION} config file for PHP5-concurrent (70_mod_php5_concurr.conf)"
-                                       insinto ${APACHE_MODULES_CONFDIR}
-                                       newins "${FILESDIR}/70_mod_php5_concurr.conf-apache2-r1" "70_mod_php5_concurr.conf"
-
-                                       # Put the ld version script in the right place so it's always accessible
-                                       insinto "/var/lib/php-pkg/${CATEGORY}/${PN}-${PVR}/"
-                                       doins "${FILESDIR}/php5-ldvs"
-
-                                       # Redefine the extension dir to have the modphp suffix
-                                       PHPEXTDIR="`"${D}/${destdir}/bin/php-config" --extension-dir`-versioned"
-                               else
-                                       einfo "Installing Apache${APACHE_VERSION} config file for PHP5 (70_mod_php5.conf)"
-                                       insinto ${APACHE_MODULES_CONFDIR}
-                                       newins "${FILESDIR}/70_mod_php5.conf-apache2-r1" "70_mod_php5.conf"
-                               fi
-                               php5_2-sapi_install_ini
-                               ;;
-               esac
-       done
-
-       # Install env.d files
-       newenvd "${FILESDIR}/20php5-envd" "20php5"
-       sed -e "s|/lib/|/$(get_libdir)/|g" -i "${D}/etc/env.d/20php5"
-}
-
-pkg_postinst() {
-       # Output some general info to the user
-       if use apache2 ; then
-               APACHE2_MOD_DEFINE="PHP5"
-               if use concurrentmodphp ; then
-                       APACHE2_MOD_CONF="70_mod_php5_concurr"
-               else
-                       APACHE2_MOD_CONF="70_mod_php5"
-               fi
-               apache-module_pkg_postinst
-       fi
-
-       # Update Apache2 to use mod_php
-       if use apache2 ; then
-               "${ROOT}/usr/sbin/php-select" -t apache2 php5 > /dev/null 2>&1
-               exitStatus=$?
-               if [[ ${exitStatus} == 2 ]] ; then
-                       php-select apache2 php5
-               elif [[ ${exitStatus} == 4 ]] ; then
-                       ewarn
-                       ewarn "Apache2 is configured to load a different version of PHP."
-                       ewarn "To make Apache2 use PHP v5, use php-select:"
-                       ewarn
-                       ewarn "    php-select apache2 php5"
-                       ewarn
-               fi
-       fi
-
-       # Create the symlinks for php-cli
-       if use cli || phpconfutils_usecheck cli ; then
-               "${ROOT}/usr/sbin/php-select" -t php php5 > /dev/null 2>&1
-               exitStatus=$?
-               if [[ ${exitStatus} == 5 ]] ; then
-                       php-select php php5
-               elif [[ ${exitStatus} == 4 ]] ; then
-                       ewarn
-                       ewarn "/usr/bin/php links to a different version of PHP."
-                       ewarn "To make /usr/bin/php point to PHP v5, use php-select:"
-                       ewarn
-                       ewarn "    php-select php php5"
-                       ewarn
-               fi
-       fi
-
-       # Create the symlinks for php-cgi
-       if use cgi ; then
-               "${ROOT}/usr/sbin/php-select" -t php-cgi php5 > /dev/null 2>&1
-               exitStatus=$?
-               if [[ ${exitStatus} == 5 ]] ; then
-                       php-select php-cgi php5
-               elif [[ ${exitStatus} == 4 ]] ; then
-                       ewarn
-                       ewarn "/usr/bin/php-cgi links to a different version of PHP."
-                       ewarn "To make /usr/bin/php-cgi point to PHP v5, use php-select:"
-                       ewarn
-                       ewarn "    php-select php-cgi php5"
-                       ewarn
-               fi
-       fi
-
-       # Create the symlinks for php-devel
-       "${ROOT}/usr/sbin/php-select" -t php-devel php5 > /dev/null 2>&1
-       exitStatus=$?
-       if [[ $exitStatus == 5 ]] ; then
-               php-select php-devel php5
-       elif [[ $exitStatus == 4 ]] ; then
-               ewarn
-               ewarn "/usr/bin/php-config and/or /usr/bin/phpize are linked to a"
-               ewarn "different version of PHP. To make them point to PHP v5, use"
-               ewarn "php-select:"
-               ewarn
-               ewarn "    php-select php-devel php5"
-               ewarn
-       fi
-
-       php5_2-sapi_pkg_postinst
-}
-
-src_test() {
-       echo ">>> Test phase [test]: ${CATEGORY}/${PF}"
-       if [[ ! -x "${S}"/php-cli ]]; then
-               ewarn "Running the php test suite requires USE=cli"
-               return
-       fi
-
-       export TEST_PHP_EXECUTABLE="${S}"/php-cli
-       if [[ -x "${S}"/php-cgi ]]; then
-               export TEST_PHP_CGI_EXECUTABLE="${S}"/php-cgi
-       fi
-       REPORT_EXIT_STATUS=1 "${S}"/php-cli -n "${S}"/run-tests.php -n
-
-       if [[ $? != 0 ]] ; then
-               eerror "Not all tests were successful!"
-       fi
-}
diff --git a/dev-lang/php/php-5.2.9-r2.ebuild b/dev-lang/php/php-5.2.9-r2.ebuild
deleted file mode 100644 (file)
index 46e165b..0000000
+++ /dev/null
@@ -1,547 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/php/php-5.2.9-r2.ebuild,v 1.10 2010/01/31 19:53:09 tove Exp $
-
-CGI_SAPI_USE="discard-path force-cgi-redirect"
-APACHE2_SAPI_USE="concurrentmodphp threads"
-IUSE="cli cgi ${CGI_SAPI_USE} ${APACHE2_SAPI_USE} fastbuild"
-
-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, general
-PHP_PATCHSET_REV="${PR/r/}"
-SUHOSIN_PATCH="suhosin-patch-${PV}-0.9.7.patch.gz"
-MULTILIB_PATCH="${MY_PHP_PV}/opt/multilib-search-path.patch"
-# php patch settings, ebuild specific
-FASTBUILD_PATCH="${MY_PHP_PV}/opt/fastbuild.patch"
-CONCURRENTMODPHP_PATCH="${MY_PHP_PV}/opt/concurrent_apache_modules.patch"
-# kolab patch - http://kolab.org/cgi-bin/viewcvs-kolab.cgi/server/patches/php/
-# bugs about this go to wrobel@gentoo.org
-KOLAB_PATCH="${MY_PHP_PV}/opt/kolab-imap-annotations.patch"
-
-inherit versionator php5_2-sapi apache-module
-
-# Suhosin patch support
-[[ -n "${SUHOSIN_PATCH}" ]] && SRC_URI="${SRC_URI} suhosin? ( http://gentoo.longitekk.com/${SUHOSIN_PATCH} )"
-
-DESCRIPTION="The PHP language runtime engine: CLI, CGI and Apache2 SAPIs."
-
-DEPEND="app-admin/php-toolkit
-       imap? ( >=virtual/imap-c-client-2006k )
-       pcre? ( >=dev-libs/libpcre-7.8 )
-       xml? ( >=dev-libs/libxml2-2.7.2-r2 )
-       xmlrpc? ( >=dev-libs/libxml2-2.7.2-r2 virtual/libiconv )"
-
-RDEPEND="${DEPEND}"
-if [[ -n "${KOLAB_PATCH}" ]] ; then
-       IUSE="${IUSE} kolab"
-       DEPEND="${DEPEND}
-               kolab? ( >=net-libs/c-client-2004g-r1 )"
-fi
-
-want_apache
-
-pkg_setup() {
-       PHPCONFUTILS_AUTO_USE=""
-
-       # Make sure the user has specified at least one SAPI
-       einfo "Determining SAPI(s) to build"
-       phpconfutils_require_any "  Enabled  SAPI:" "  Disabled SAPI:" cli cgi apache2
-
-       # Threaded Apache2 support
-       if use apache2 ; then
-               has_apache_threads
-       fi
-
-       # Concurrent PHP Apache2 modules support
-       if use apache2 ; then
-               if use concurrentmodphp ; then
-                       ewarn
-                       ewarn "'concurrentmodphp' makes it possible to load multiple, differently"
-                       ewarn "versioned mod_php's into the same Apache instance. This is done with"
-                       ewarn "a few linker tricks and workarounds, and is not guaranteed to always"
-                       ewarn "work correctly, so use it at your own risk. Especially, do not use"
-                       ewarn "this in conjunction with PHP modules (PECL, ...) other than the ones"
-                       ewarn "you may find in the Portage tree or the PHP Overlay!"
-                       ewarn "This is an experimental feature, so please rebuild PHP"
-                       ewarn "without the 'concurrentmodphp' 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 'concurrentmodphp', please file a bug in"
-                       ewarn "Gentoo's Bugzilla only."
-                       ewarn
-                       ebeep 5
-               fi
-       fi
-
-       # fastbuild support
-       if use 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
-
-       if use pcre ; then
-               built_with_use dev-libs/libpcre unicode || \
-                       die "Please rebuild dev-libs/libpcre with USE=unicode"
-       fi
-
-       depend.apache_pkg_setup
-       php5_2-sapi_pkg_setup
-}
-
-php_determine_sapis() {
-       # holds the list of sapis that we want to build
-       PHPSAPIS=
-
-       if use cli || phpconfutils_usecheck cli ; then
-               PHPSAPIS="${PHPSAPIS} cli"
-       fi
-
-       if use cgi ; then
-               PHPSAPIS="${PHPSAPIS} cgi"
-       fi
-
-       # note - apache SAPI comes after the simpler cli/cgi sapis
-       if use apache2 ; then
-               PHPSAPIS="${PHPSAPIS} apache${APACHE_VERSION}"
-       fi
-}
-
-src_unpack() {
-       if [[ "${PHP_PACKAGE}" == 1 ]] ; then
-               unpack ${A}
-       fi
-
-       cd "${S}"
-
-       # Concurrent PHP Apache2 modules support
-       if use apache2 ; then
-               if use concurrentmodphp ; then
-                       if [[ -n "${CONCURRENTMODPHP_PATCH}" ]] && [[ -f "${WORKDIR}/${CONCURRENTMODPHP_PATCH}" ]] ; then
-                               epatch "${WORKDIR}/${CONCURRENTMODPHP_PATCH}"
-                       else
-                               ewarn "There is no concurrent mod_php patch available for this PHP release yet!"
-                       fi
-               fi
-       fi
-
-       # fastbuild support
-       if use fastbuild ; then
-               if [[ -n "${FASTBUILD_PATCH}" ]] && [[ -f "${WORKDIR}/${FASTBUILD_PATCH}" ]] ; then
-                       epatch "${WORKDIR}/${FASTBUILD_PATCH}"
-               else
-                       ewarn "There is no fastbuild patch available for this PHP release yet!"
-               fi
-       fi
-
-       # kolab support
-       if [[ -n "${KOLAB_PATCH}" ]] ; then
-               use kolab && epatch "${WORKDIR}/${KOLAB_PATCH}"
-       fi
-
-       # pretend to not have flex, bug 221357
-       sed -re 's:( +)PHP_SUBST\(LEX\):\1LEX="exit 0;"\n\0:' -i acinclude.m4
-
-       # Now let the eclass do the rest and regenerate the configure
-       php5_2-sapi_src_unpack
-
-       # Fix Makefile.global:test to consider the CGI SAPI if present
-       if use cgi ; then
-               sed -e "s|test \! -z \"\$(top_builddir)/php-cli\" \&\& test -x \"\$(top_builddir)/php-cli\"|test \! -z \"\$(top_builddir)/php-cli\" \&\& test -x \"\$(top_builddir)/php-cli\" \&\& test \! -z \"\$(top_builddir)/php-cgi\" \&\& test -x \"\$(top_builddir)/php-cgi\"|g" -i Makefile.global
-               sed -e "s|TEST_PHP_EXECUTABLE=\"\$(top_builddir)/php-cli\"|TEST_PHP_EXECUTABLE=\"\$(top_builddir)/php-cli\" TEST_PHP_CGI_EXECUTABLE=\"\$(top_builddir)/php-cgi\"|g" -i Makefile.global
-       fi
-
-       # try to fix some test cases which fail because of sandbox otherwise
-       sed -e 's:/no/such/:.\0:' -i ext/standard/tests/file/005_error.phpt \
-               ext/standard/tests/file/006_error.phpt \
-               ext/standard/tests/file/touch.phpt
-
-       # REMOVING BROKEN TESTS:
-       # removing this test as it has been broken for ages and is not easily
-       # fixable (depends on a lot of factors)
-       rm ext/standard/tests/general_functions/phpinfo.phpt
-
-       # never worked properly, no easy fix
-       rm ext/iconv/tests/bug16069.phpt ext/iconv/tests/iconv_stream_filter.phpt
-
-       # needs write access to /tmp and others
-       rm ext/session/tests/session_save_path_variation5.phpt
-
-       # new tests since 5.2.7 which have never been working for me
-       rm ext/spl/tests/arrayObject___construct_basic4.phpt \
-               ext/spl/tests/arrayObject___construct_basic5.phpt \
-               ext/spl/tests/arrayObject_exchangeArray_basic3.phpt \
-               ext/spl/tests/arrayObject_setFlags_basic1.phpt \
-               tests/lang/bug45392.phpt
-
-       # those might as well be related to suhosin
-       rm ext/session/tests/session_decode_variation3.phpt \
-               ext/session/tests/session_encode_variation8.phpt
-
-       # missing skipif
-       use reflection || \
-               rm ext/standard/tests/directory/DirectoryClass_basic_001.phpt
-
-       # sandbox-related (sandbox checks for permissions before even looking
-       # at the fs, but the tests expect "No such file or directory"
-       sed -e 's:/blah:./bla:' -i \
-               ext/session/tests/session_save_path_variation{2,3}.phpt
-       rm ext/standard/tests/file/rename_variation13.phpt
-
-       # test passes, but run-tests.php claims failure
-       rm ext/standard/tests/file/tempnam_variation4.phpt
-
-       # these tests behave differently with suhosin enabled, adapting them...
-       use suhosin && sed -e 's:File(\.\./):File(..):g' -i \
-               tests/security/open_basedir*{.inc,.phpt}
-}
-
-src_compile() {
-       # bug 217392 (autconf-2.62 behavior changes)
-       export CFLAGS="${CFLAGS} -D_GNU_SOURCE"
-       export CXXFLAGS="${CXXFLAGS} -D_GNU_SOURCE"
-       if use 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_apache2=0
-       my_conf=""
-
-       for x in ${PHPSAPIS} ; do
-               case ${x} in
-                       cli)
-                               build_cli=1
-                               ;;
-                       cgi)
-                               build_cgi=1
-                               ;;
-                       apache2)
-                               build_apache2=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_apache2} = 1 ]] ; then
-               my_conf="${my_conf} --with-apxs2=/usr/sbin/apxs2"
-
-               # Threaded Apache2 support
-               if use threads ; then
-                       my_conf="${my_conf} --enable-maintainer-zts"
-                       ewarn "Enabling ZTS for Apache2 MPM"
-               fi
-
-               # Concurrent PHP Apache2 modules support
-               if use concurrentmodphp ; then
-                       append-ldflags "-Wl,--version-script=${FILESDIR}/php5-ldvs"
-               fi
-       fi
-
-       if use pcre || phpconfutils_usecheck pcre ; then
-               myconf="${my_conf} --with-pcre-dir=/usr"
-               phpconfutils_extension_with "pcre-regex" "pcre" 0 "/usr"
-       fi
-
-       # Now we know what we are building, build it
-       php5_2-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-cgi || die "Unable to make CGI SAPI"
-               cp sapi/cgi/php-cgi php-cgi || die "Unable to copy CGI SAPI"
-       fi
-
-       if [[ ${build_apache2} = 1 ]] ; then
-               einfo
-               einfo "Building apache${APACHE_VERSION} 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 make apache${APACHE_VERSION} SAPI"
-       fi
-}
-
-src_compile_normal() {
-       php_determine_sapis
-
-       CLEAN_REQUIRED=0
-       my_conf=""
-
-       # Support the Apache2 extras, they must be set globally for all
-       # SAPIs to work correctly, especially for external PHP extensions
-       if use apache2 ; then
-               # Concurrent PHP Apache2 modules support
-               if use concurrentmodphp ; then
-                       append-ldflags "-Wl,--version-script=${FILESDIR}/php5-ldvs"
-               fi
-       fi
-
-       for x in ${PHPSAPIS} ; do
-               if use pcre || phpconfutils_usecheck pcre ; then
-                       myconf="${my_conf} --with-pcre-dir=/usr"
-                       phpconfutils_extension_with "pcre-regex" "pcre" 0 "/usr"
-               fi
-
-               # Support the Apache2 extras, they must be set globally for all
-               # SAPIs to work correctly, especially for external PHP extensions
-               if use apache2 ; then
-                       # Threaded Apache2 support
-                       if use threads ; then
-                               my_conf="${my_conf} --enable-maintainer-zts"
-                               ewarn "Enabling ZTS for Apache2 MPM"
-                       fi
-               fi
-
-               if [[ "${CLEAN_REQUIRED}" = 1 ]] ; then
-                       make clean
-               fi
-
-               PHPSAPI="${x}"
-
-               case ${x} in
-                       cli)
-                               my_conf="${my_conf} --enable-cli --disable-cgi"
-                               php5_2-sapi_src_compile
-                               cp sapi/cli/php php-cli || die "Unable to copy CLI SAPI"
-                               ;;
-                       cgi)
-                               my_conf="${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_2-sapi_src_compile
-                               cp sapi/cgi/php-cgi php-cgi || die "Unable to copy CGI SAPI"
-                               ;;
-                       apache2)
-                               my_conf="${my_conf} --disable-cli --with-apxs2=/usr/sbin/apxs2"
-                               php5_2-sapi_src_compile
-                               ;;
-               esac
-
-               CLEAN_REQUIRED=1
-               my_conf=""
-       done
-}
-
-src_install() {
-       php_determine_sapis
-
-       destdir=/usr/$(get_libdir)/php5
-
-       # Let the eclass do the common work
-       php5_2-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_2-sapi_install_ini
-                               ;;
-                       cgi)
-                               einfo "Installing CGI SAPI"
-                               into ${destdir}
-                               dobin php-cgi || die "Unable to install ${x} sapi"
-                               php5_2-sapi_install_ini
-                               ;;
-                       apache2)
-                               einfo "Installing Apache${APACHE_VERSION} SAPI"
-                               make INSTALL_ROOT="${D}" install-sapi || die "Unable to install ${x} SAPI"
-                               if use concurrentmodphp ; then
-                                       einfo "Installing Apache${APACHE_VERSION} config file for PHP5-concurrent (70_mod_php5_concurr.conf)"
-                                       insinto ${APACHE_MODULES_CONFDIR}
-                                       newins "${FILESDIR}/70_mod_php5_concurr.conf-apache2-r1" "70_mod_php5_concurr.conf"
-
-                                       # Put the ld version script in the right place so it's always accessible
-                                       insinto "/var/lib/php-pkg/${CATEGORY}/${PN}-${PVR}/"
-                                       doins "${FILESDIR}/php5-ldvs"
-
-                                       # Redefine the extension dir to have the modphp suffix
-                                       PHPEXTDIR="`"${D}/${destdir}/bin/php-config" --extension-dir`-versioned"
-                               else
-                                       einfo "Installing Apache${APACHE_VERSION} config file for PHP5 (70_mod_php5.conf)"
-                                       insinto ${APACHE_MODULES_CONFDIR}
-                                       newins "${FILESDIR}/70_mod_php5.conf-apache2-r1" "70_mod_php5.conf"
-                               fi
-                               php5_2-sapi_install_ini
-                               ;;
-               esac
-       done
-
-       # Install env.d files
-       newenvd "${FILESDIR}/20php5-envd" "20php5"
-       sed -e "s|/lib/|/$(get_libdir)/|g" -i "${D}/etc/env.d/20php5"
-}
-
-pkg_postinst() {
-       # Output some general info to the user
-       if use apache2 ; then
-               APACHE2_MOD_DEFINE="PHP5"
-               if use concurrentmodphp ; then
-                       APACHE2_MOD_CONF="70_mod_php5_concurr"
-               else
-                       APACHE2_MOD_CONF="70_mod_php5"
-               fi
-               apache-module_pkg_postinst
-       fi
-
-       # Update Apache2 to use mod_php
-       if use apache2 ; then
-               "${ROOT}/usr/sbin/php-select" -t apache2 php5 > /dev/null 2>&1
-               exitStatus=$?
-               if [[ ${exitStatus} == 2 ]] ; then
-                       php-select apache2 php5
-               elif [[ ${exitStatus} == 4 ]] ; then
-                       ewarn
-                       ewarn "Apache2 is configured to load a different version of PHP."
-                       ewarn "To make Apache2 use PHP v5, use php-select:"
-                       ewarn
-                       ewarn "    php-select apache2 php5"
-                       ewarn
-               fi
-       fi
-
-       # Create the symlinks for php-cli
-       if use cli || phpconfutils_usecheck cli ; then
-               "${ROOT}/usr/sbin/php-select" -t php php5 > /dev/null 2>&1
-               exitStatus=$?
-               if [[ ${exitStatus} == 5 ]] ; then
-                       php-select php php5
-               elif [[ ${exitStatus} == 4 ]] ; then
-                       ewarn
-                       ewarn "/usr/bin/php links to a different version of PHP."
-                       ewarn "To make /usr/bin/php point to PHP v5, use php-select:"
-                       ewarn
-                       ewarn "    php-select php php5"
-                       ewarn
-               fi
-       fi
-
-       # Create the symlinks for php-cgi
-       if use cgi ; then
-               "${ROOT}/usr/sbin/php-select" -t php-cgi php5 > /dev/null 2>&1
-               exitStatus=$?
-               if [[ ${exitStatus} == 5 ]] ; then
-                       php-select php-cgi php5
-               elif [[ ${exitStatus} == 4 ]] ; then
-                       ewarn
-                       ewarn "/usr/bin/php-cgi links to a different version of PHP."
-                       ewarn "To make /usr/bin/php-cgi point to PHP v5, use php-select:"
-                       ewarn
-                       ewarn "    php-select php-cgi php5"
-                       ewarn
-               fi
-       fi
-
-       # Create the symlinks for php-devel
-       "${ROOT}/usr/sbin/php-select" -t php-devel php5 > /dev/null 2>&1
-       exitStatus=$?
-       if [[ $exitStatus == 5 ]] ; then
-               php-select php-devel php5
-       elif [[ $exitStatus == 4 ]] ; then
-               ewarn
-               ewarn "/usr/bin/php-config and/or /usr/bin/phpize are linked to a"
-               ewarn "different version of PHP. To make them point to PHP v5, use"
-               ewarn "php-select:"
-               ewarn
-               ewarn "    php-select php-devel php5"
-               ewarn
-       fi
-
-       php5_2-sapi_pkg_postinst
-}
-
-src_test() {
-       echo ">>> Test phase [test]: ${CATEGORY}/${PF}"
-       if [[ ! -x "${S}"/php-cli ]]; then
-               ewarn "Running the php test suite requires USE=cli"
-               return
-       fi
-
-       export TEST_PHP_EXECUTABLE="${S}"/php-cli
-       if [[ -x "${S}"/php-cgi ]]; then
-               export TEST_PHP_CGI_EXECUTABLE="${S}"/php-cgi
-       fi
-       REPORT_EXIT_STATUS=1 "${S}"/php-cli -n "${S}"/run-tests.php -n
-
-       if [[ $? != 0 ]] ; then
-               eerror "Not all tests were successful!"
-       fi
-}