diff --git a/dev-lang/php/Manifest b/dev-lang/php/Manifest
new file mode 100644
index 0000000..938cd91
--- /dev/null
+++ b/dev-lang/php/Manifest
@@ -0,0 +1,14 @@
+AUX 20php4-envd 145 RMD160 fb57b2d202ab1031303e7525a8ef5b353dc04ef8 SHA1 34ef066d2de22f147fc86bbe884692af7631f726 SHA256 17cd1a952434988b4c2125e4d1eef1df7114809f404605d35f255674419dd5d5
+AUX 20php5-envd 145 RMD160 8c81fb7dc1d1ddf16fd956d748514db3bcb27603 SHA1 f1cef57c0def8e2c5422aaf136f40b4ff47801d2 SHA256 efaae9e6ae5f7010e073c2ab6d8a9dda009f0707c7d7b0c027e142c94f7041a4
+AUX 70_mod_php5.conf-apache2 490 RMD160 745bdb5db622577f473703d5ee8dc7f3c66f8f0c SHA1 7daf9c9ec2e6d108f850981853f9f4f599be0b71 SHA256 5667d06cb7a18c30d11decd28d55b87e36287c76c4d3a450b1cb37271e7fdcd1
+AUX 70_mod_php5.conf-apache2-r1 374 RMD160 ca06cdc9d1a3dc4129a60c938ee3a1b542497fbb SHA1 4733066b6324c5870e716485484c44c7c26a9ff1 SHA256 815c1ca23c9afe8479568ceaac4057eb91ea5444fbd863866b29adb4eea2c82b
+AUX 70_mod_php5_concurr.conf-apache2 414 RMD160 1783b6c830119f021c3fb6cb35a631f43c4fa70c SHA1 09f9076f35bc84994fc8c687b4befc0400475f1a SHA256 ccc3bc073eafc83f98049679a411801e80f84620bd51c37c36de2b9ee9492aa2
+AUX 70_mod_php5_concurr.conf-apache2-r1 376 RMD160 4f7de5c0784b6191450b5c1a7de7ad941620e199 SHA1 c42a23bd7a1d3e8c7e0ac906f50f180116349f76 SHA256 c05f499d9c8927391c586b94716a9f59d63767165552ea527ec7ff63c36eaa40
+AUX php-5.2.10-pdo_dblib.patch 559 RMD160 062604e291113b2bb86044b5eeffb72fad210fbc SHA1 d59d26e6557dac86e582e1a6ed7bb4795cf150c6 SHA256 0548d63d7379cd19f7ade6ca1222b1b577f684b142ff6b0e8e23742b1f7f9794
+AUX php4-ldvs 22 RMD160 e70c565b3930d9d9e3253062b7c633346cb99a63 SHA1 8c66355dfb80e2ecc6ee6faae30bf7dbb1727651 SHA256 4aee18478b09cda7e925ccde157db6099ea0122b5c4efb0868e3761b65688dde
+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-patchset-5.2.10-r1.tar.bz2 11294 RMD160 1f23bbb661f40ac44ed4e39e51abc0a8d5d2b9a0 SHA1 66841d8f64058e6fdd74fb82dc686e75f5f36f6d SHA256 e32a9f08307707476dec5ad44a6923c7827d7635c2b723d3e70cc82eee1da1e3
+DIST suhosin-patch-5.2.10-0.9.7.patch.gz 23072 RMD160 18df1686a48d652f581591115b51461e9dacf5a4 SHA1 3768bbded0bb2376414322b26308342452cb927a SHA256 51d8496172b838c4bbb40f783b535162169b5e218cd6093ecc25cfcfa0c469f8
+EBUILD php-5.2.10-r2.ebuild 16837 RMD160 870d5cd011ae9ff2a3e9482b0c70995fb9ab6026 SHA1 5a568341061cdef5a9666c1dc12bcaf3b07c019e SHA256 db7c3e4a0d0c4ffafbb4c912ef001e386d6edc016b5a7b160a01ada4ff4a2569
+MISC metadata.xml 1494 RMD160 c8579965284d7e60e3bf12600eea425175e6c480 SHA1 24c24ff7bb2efb47c02f604f0896c99da87ffe67 SHA256 6a5df2911eff7c828d9da402914c08554b8c8752b0545a74af9ba6f8fa8f59a9
diff --git a/dev-lang/php/files/20php4-envd b/dev-lang/php/files/20php4-envd
new file mode 100644
index 0000000..ac444e9
--- /dev/null
+++ b/dev-lang/php/files/20php4-envd
@@ -0,0 +1,2 @@
+MANPATH="/usr/lib/php4/man/"
+CONFIG_PROTECT_MASK="/etc/php/cli-php4/ext-active/ /etc/php/cgi-php4/ext-active/ /etc/php/apache2-php4/ext-active/"
diff --git a/dev-lang/php/files/20php5-envd b/dev-lang/php/files/20php5-envd
new file mode 100644
index 0000000..f6033ae
--- /dev/null
+++ b/dev-lang/php/files/20php5-envd
@@ -0,0 +1,2 @@
+MANPATH="/usr/lib/php5/man/"
+CONFIG_PROTECT_MASK="/etc/php/cli-php5/ext-active/ /etc/php/cgi-php5/ext-active/ /etc/php/apache2-php5/ext-active/"
diff --git a/dev-lang/php/files/70_mod_php5.conf-apache2 b/dev-lang/php/files/70_mod_php5.conf-apache2
new file mode 100644
index 0000000..a825435
--- /dev/null
+++ b/dev-lang/php/files/70_mod_php5.conf-apache2
@@ -0,0 +1,18 @@
+
+ # Load the module first
+
+ LoadModule php5_module modules/libphp5.so
+
+
+ # Set it to handle the files
+
+ AddType application/x-httpd-php .php
+ AddType application/x-httpd-php .phtml
+ AddType application/x-httpd-php .php3
+ AddType application/x-httpd-php .php4
+ AddType application/x-httpd-php .php5
+ AddType application/x-httpd-php-source .phps
+
+
+ DirectoryIndex index.php index.phtml
+
diff --git a/dev-lang/php/files/70_mod_php5.conf-apache2-r1 b/dev-lang/php/files/70_mod_php5.conf-apache2-r1
new file mode 100644
index 0000000..50911ad
--- /dev/null
+++ b/dev-lang/php/files/70_mod_php5.conf-apache2-r1
@@ -0,0 +1,17 @@
+
+ # Load the module first
+
+ LoadModule php5_module modules/libphp5.so
+
+
+ # Set it to handle the files
+
+ SetHandler application/x-httpd-php
+
+
+
+ SetHandler application/x-httpd-php-source
+
+
+ DirectoryIndex index.php index.phtml
+
diff --git a/dev-lang/php/files/70_mod_php5_concurr.conf-apache2 b/dev-lang/php/files/70_mod_php5_concurr.conf-apache2
new file mode 100644
index 0000000..710e211
--- /dev/null
+++ b/dev-lang/php/files/70_mod_php5_concurr.conf-apache2
@@ -0,0 +1,16 @@
+
+ # Load the module first
+
+ LoadModule php5_module modules/libphp5.so
+
+
+ # Set it to handle the files
+
+ AddType application/x-httpd-php5 .php
+ AddType application/x-httpd-php5 .phtml
+ AddType application/x-httpd-php5 .php5
+ AddType application/x-httpd-php5-source .phps
+
+
+ DirectoryIndex index.php index.phtml
+
diff --git a/dev-lang/php/files/70_mod_php5_concurr.conf-apache2-r1 b/dev-lang/php/files/70_mod_php5_concurr.conf-apache2-r1
new file mode 100644
index 0000000..cd1c380
--- /dev/null
+++ b/dev-lang/php/files/70_mod_php5_concurr.conf-apache2-r1
@@ -0,0 +1,17 @@
+
+ # Load the module first
+
+ LoadModule php5_module modules/libphp5.so
+
+
+ # Set it to handle the files
+
+ SetHandler application/x-httpd-php5
+
+
+
+ SetHandler application/x-httpd-php5-source
+
+
+ DirectoryIndex index.php index.phtml
+
diff --git a/dev-lang/php/files/php-5.2.10-pdo_dblib.patch b/dev-lang/php/files/php-5.2.10-pdo_dblib.patch
new file mode 100644
index 0000000..e161a82
--- /dev/null
+++ b/dev-lang/php/files/php-5.2.10-pdo_dblib.patch
@@ -0,0 +1,16 @@
+diff -Naur php-5.2.10.old/ext/pdo_dblib/dblib_driver.c php-5.2.10/ext/pdo_dblib/dblib_driver.c
+--- php-5.2.10.old/ext/pdo_dblib/dblib_driver.c 2009-03-20 23:14:17.000000000 +0100
++++ php-5.2.10/ext/pdo_dblib/dblib_driver.c 2009-09-25 00:19:31.000000000 +0200
+@@ -230,9 +230,9 @@
+ goto cleanup;
+ }
+
+- if (DBSETOPT(H->link, DBTEXTLIMIT, "2147483647") == FAIL) {
+- goto cleanup;
+- }
++// if (DBSETOPT(H->link, DBTEXTLIMIT, "2147483647") == FAIL) {
++// goto cleanup;
++// }
+
+ if (vars[3].optval && FAIL == dbuse(H->link, vars[3].optval)) {
+ goto cleanup;
diff --git a/dev-lang/php/files/php4-ldvs b/dev-lang/php/files/php4-ldvs
new file mode 100644
index 0000000..01b4eeb
--- /dev/null
+++ b/dev-lang/php/files/php4-ldvs
@@ -0,0 +1 @@
+PHP_4 { global: *; };
diff --git a/dev-lang/php/files/php5-ldvs b/dev-lang/php/files/php5-ldvs
new file mode 100644
index 0000000..783b0f6
--- /dev/null
+++ b/dev-lang/php/files/php5-ldvs
@@ -0,0 +1 @@
+PHP_5 { global: *; };
diff --git a/dev-lang/php/metadata.xml b/dev-lang/php/metadata.xml
new file mode 100644
index 0000000..57468d4
--- /dev/null
+++ b/dev-lang/php/metadata.xml
@@ -0,0 +1,25 @@
+
+
+
+ php
+
+
diff --git a/dev-lang/php/php-5.2.10-r2.ebuild b/dev-lang/php/php-5.2.10-r2.ebuild
new file mode 100644
index 0000000..cf9677e
--- /dev/null
+++ b/dev-lang/php/php-5.2.10-r2.ebuild
@@ -0,0 +1,550 @@
+# Copyright 1999-2009 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.1 2009/09/24 23:36:54 cla 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() {
+ vecho ">>> 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
+}