Mercurial > hg > portage

changeset 235:a3713bbcd1b6

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
php postgresql dependencies are fixed
author holger
date Wed, 28 Jul 2010 11:08:21 +0200
parents 8be68a037e29
children eee42ea7ddfb
files dev-lang/php/Manifest dev-lang/php/files/20php5-envd dev-lang/php/files/70_mod_php5.conf-apache2 dev-lang/php/files/70_mod_php5_concurr.conf-apache2 dev-lang/php/files/eblits/common-v1.eblit dev-lang/php/files/eblits/pkg_postinst-v1.eblit dev-lang/php/files/eblits/pkg_setup-v1.eblit dev-lang/php/files/eblits/src_compile-v1.eblit dev-lang/php/files/eblits/src_configure-v1.eblit dev-lang/php/files/eblits/src_install-v1.eblit dev-lang/php/files/eblits/src_prepare-v1.eblit dev-lang/php/files/eblits/src_test-v1.eblit dev-lang/php/files/php5-ldvs dev-lang/php/metadata.xml dev-lang/php/php-5.3.2.ebuild
diffstat 15 files changed, 0 insertions(+), 1099 deletions(-) [+]
line wrap: on
line diff
--- a/dev-lang/php/Manifest	Sun Jul 18 00:32:16 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,17 +0,0 @@
-AUX 20php5-envd 145 RMD160 8c81fb7dc1d1ddf16fd956d748514db3bcb27603 SHA1 f1cef57c0def8e2c5422aaf136f40b4ff47801d2 SHA256 efaae9e6ae5f7010e073c2ab6d8a9dda009f0707c7d7b0c027e142c94f7041a4
-AUX 70_mod_php5.conf-apache2 348 RMD160 9f3f49a52ebf92c2650501c5ceb6f95ce4bb2e76 SHA1 62992e793446b4a9a64900d1ecba7bae06873382 SHA256 5bb8a45570582b4389a7d3feea0398e1c13ed4ced96e559b9406ed8c965dea8c
-AUX 70_mod_php5_concurr.conf-apache2 348 RMD160 9f3f49a52ebf92c2650501c5ceb6f95ce4bb2e76 SHA1 62992e793446b4a9a64900d1ecba7bae06873382 SHA256 5bb8a45570582b4389a7d3feea0398e1c13ed4ced96e559b9406ed8c965dea8c
-AUX eblits/common-v1.eblit 376 RMD160 524d38035ef01b215c6dc06699c41550c246de9d SHA1 b85091f9e56b20217e5c2d3e25cef055642cd088 SHA256 d395752919fe05fa64a0e09deaf690e008a04f2c580f42233b5a854a1012045e
-AUX eblits/pkg_postinst-v1.eblit 2184 RMD160 ce65ba811eab10862d067c7e2b4bdc8d2b0aee56 SHA1 11c14f2235041cfb08e33cf2550bebef2037e92b SHA256 9e1cd81be4f051f3156de0ce5398a338b2ab6f8e73047c5983beda47f2f762b0
-AUX eblits/pkg_setup-v1.eblit 643 RMD160 b0ac84af7c2cddaca058ca0562306cdc8ddff108 SHA1 88572e5da2d10b2bcbfa3f35a2d39366cbabb364 SHA256 6b7181294ce309d5cdee68e1f7e7c9365910c940db4391ae1ca62e0d6eb9b27e
-AUX eblits/src_compile-v1.eblit 1851 RMD160 64e65a7647907da821a277da9a4df970ae3bda0b SHA1 c22b8c4526ce081fb7de8234d93cc8cfa2616414 SHA256 da47bc9f75ba4de64c1848b07ea1324b707301421431f469296f32a8f2369648
-AUX eblits/src_configure-v1.eblit 9853 RMD160 f254f602a885bea556768250445d70156ae34a8d SHA1 8895766562f0045f057a95d918308232005dfd61 SHA256 b954cb2bfaa4fc6fe55e3752f5491282db0a5d48966e1a3cd6f55fed1eb63bcc
-AUX eblits/src_install-v1.eblit 4025 RMD160 150514ec274f0892ee271466015116493eb4a74e SHA1 91b7bffec8fccf4b3230e2072e0ccf555b4c671e SHA256 2b1da468a1ecfa1507b9ab51e626203d421e5c4a3b694d77b01c065e3ae4fcff
-AUX eblits/src_prepare-v1.eblit 2616 RMD160 ccff64d09cc90ada1ea5d1311457cf9a05f12f8e SHA1 7db40d0ca7ef01e5b61962f261511803f768f1bc SHA256 915b9755a37f7670f6e436fe5072dae8f5e6b437ccdfbff835e26bb2f9d22b1e
-AUX eblits/src_test-v1.eblit 1480 RMD160 68ef731042ef236efee923649b318239c0219d52 SHA1 81c047f180e43eb1e6b0309ee8d6751950ce1b97 SHA256 ddc836ca2e7b2abac20450fc6eb8c7d30277c567d23051016b903ece1d07a6b2
-AUX php5-ldvs 22 RMD160 5846dab2745b68a88175dd4e72d0b8cf4756dd46 SHA1 592398c92575adb14ec972847ce2aca28a7b9c2c SHA256 b79d0e52b1b3b4543b31ad45525ae1c2814a27ea8e676772ab10bf6fb12dfe79
-DIST php-5.3.2.tar.bz2 10477662 RMD160 60a8aac0d51511ecaf8dcad9d31bdf072c0c99cf SHA1 79ea4ee3da3a7542d1e348ac963a5b38bcbb4b6b SHA256 9a380a574adcb3a9abe3226e7c3a9bae619e8a1b90842ec2a7edf0ad92afdeda
-DIST php-patchset-5.3.2-r1.tar.bz2 9702 RMD160 40cdb57493dc44640cf0b9ab545d0206e24e2316 SHA1 c60b29edb9cc28658b8da63a82800cd90eef12d4 SHA256 5c75dd05000c90e55a11295ead6aae5aea238001d852c14cb821abd2730aef67
-DIST suhosin-patch-5.3.2-0.9.9.1.patch.gz 40847 RMD160 64d8b7ec2ec91fd7a43b0cd95c0aa0df5b666768 SHA1 c48d3f24341d3b0214ca3e980320b23864aa93ba SHA256 a61f081022888bf78997e434744d6c0604194c73a00e70c1165524a0a6329de2
-EBUILD php-5.3.2.ebuild 9323 RMD160 980e6e3e2db0b3d0153e1aa102f2a07e1df3dd9a SHA1 f5b97fedae62c5078889064cbf22a6da1edf8ead SHA256 cb62037598de43a55f5e1b7d34e7bf379c9ddd6a5cbe9c15f378cc1e43920f83
-MISC metadata.xml 2185 RMD160 2e1d4afa19f7370b62080f3f62bc0f8e525b82bd SHA1 2b758e52eb1e1130fffe162e6cd2122deaf18bf3 SHA256 8a8be20f80edd56dd9f16b90f4ff91fde426b05861e737750664223801e2c667
--- a/dev-lang/php/files/20php5-envd	Sun Jul 18 00:32:16 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,2 +0,0 @@
-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/"
--- a/dev-lang/php/files/70_mod_php5.conf-apache2	Sun Jul 18 00:32:16 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,14 +0,0 @@
-<IfDefine PHP5>
-	# Load the module first
-	<IfModule !mod_php5.c>
-		LoadModule php5_module    modules/libphp5.so
-	</IfModule>
-
-	# Set it to handle the files
-	<IfModule mod_mime.c>
-		AddHandler application/x-httpd-php .php .php5 .phtml
-		AddHandler application/x-httpd-php-source .phps
-	</IfModule>
-
-	DirectoryIndex index.php index.phtml
-</IfDefine>
--- a/dev-lang/php/files/70_mod_php5_concurr.conf-apache2	Sun Jul 18 00:32:16 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,14 +0,0 @@
-<IfDefine PHP5>
-	# Load the module first
-	<IfModule !mod_php5.c>
-		LoadModule php5_module    modules/libphp5.so
-	</IfModule>
-
-	# Set it to handle the files
-	<IfModule mod_mime.c>
-		AddHandler application/x-httpd-php .php .php5 .phtml
-		AddHandler application/x-httpd-php-source .phps
-	</IfModule>
-
-	DirectoryIndex index.php index.phtml
-</IfDefine>
--- a/dev-lang/php/files/eblits/common-v1.eblit	Sun Jul 18 00:32:16 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,9 +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/files/eblits/common-v1.eblit,v 1.1 2010/05/27 23:05:04 mabi Exp $
-
-php_set_ini_dir() {
-	PHP_INI_DIR="/etc/php/${1}-php${PHP_MV}"
-	PHP_EXT_INI_DIR="${PHP_INI_DIR}/ext"
-	PHP_EXT_INI_DIR_ACTIVE="${PHP_INI_DIR}/ext-active"
-}
--- a/dev-lang/php/files/eblits/pkg_postinst-v1.eblit	Sun Jul 18 00:32:16 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,72 +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/files/eblits/pkg_postinst-v1.eblit,v 1.1 2010/05/27 23:05:04 mabi Exp $
-
-eblit-php-pkg_postinst() {
-	# Output some general info to the user
-	if use apache2 ; then
-		APACHE2_MOD_DEFINE="PHP${PHP_MV}"
-		if use concurrentmodphp ; then
-			APACHE2_MOD_CONF="70_mod_php${PHP_MV}_concurr"
-		else
-			APACHE2_MOD_CONF="70_mod_php${PHP_MV}"
-		fi
-		apache-module_pkg_postinst
-	fi
-
-	# Update Apache2 to use mod_php
-	if use apache2 ; then
-		"${ROOT}/usr/sbin/php-select" -t apache2 php${PHP_MV} > /dev/null 2>&1
-		exitStatus=$?
-		if [[ ${exitStatus} == 2 ]] ; then
-			php-select apache2 php${PHP_MV}
-		elif [[ ${exitStatus} == 4 ]] ; then
-			ewarn "To make Apache2 use php-${PHP_MV}, use"
-			ewarn "    php-select apache2 php${PHP_MV}"
-			ewarn
-		fi
-	fi
-
-	# Create the symlinks for php-cli
-	if use cli ; then
-		"${ROOT}/usr/sbin/php-select" -t php php${PHP_MV} > /dev/null 2>&1
-		exitStatus=$?
-		if [[ ${exitStatus} == 5 ]] ; then
-			php-select php php${PHP_MV}
-		elif [[ ${exitStatus} == 4 ]] ; then
-			ewarn "To make usr/bin/php point to php-${PHP_MV}, use"
-			ewarn "    php-select php php${PHP_MV}"
-			ewarn
-		fi
-	fi
-
-	# Create the symlinks for php-cgi
-	if use cgi ; then
-		"${ROOT}/usr/sbin/php-select" -t php-cgi php${PHP_MV} > /dev/null 2>&1
-		exitStatus=$?
-		if [[ ${exitStatus} == 5 ]] ; then
-			php-select php-cgi php${PHP_MV}
-		elif [[ ${exitStatus} == 4 ]] ; then
-			ewarn "To make usr/bin/php-cgi point to php-${PHP_MV}, use"
-			ewarn "    php-select php-cgi php${PHP_MV}"
-			ewarn
-		fi
-	fi
-
-	# Create the symlinks for php-devel
-	"${ROOT}/usr/sbin/php-select" -t php-devel php${PHP_MV} > /dev/null 2>&1
-	exitStatus=$?
-	if [[ $exitStatus == 5 ]] ; then
-		php-select php-devel php${PHP_MV}
-	elif [[ $exitStatus == 4 ]] ; then
-		ewarn "To make usr/bin/php-config and usr/bin/phpize point to php-${PHP_MV}, use"
-		ewarn "    php-select php-devel php${PHP_MV}"
-		ewarn
-	fi
-
-	ewarn "You may have to recompile third-party extensions now"
-	ewarn "(includes every dev-php5/pecl-* package and probably others in that category)"
-	ewarn
-}
-
-
--- a/dev-lang/php/files/eblits/pkg_setup-v1.eblit	Sun Jul 18 00:32:16 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,23 +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/files/eblits/pkg_setup-v1.eblit,v 1.1 2010/05/27 23:05:04 mabi Exp $
-
-eblit-php-pkg_setup() {
-	if use concurrentmodphp || use kolab ; then
-		ewarn "concurrentmodphp and kolab are Gentoo-specific experimental"
-		ewarn "patches. Before reporting any bugs to bugs.php.net, make sure to"
-		ewarn "rebuild PHP with those USE flags disabled"
-		ewarn
-	fi
-
-	# Mail support
-	php_check_mta
-
-	# Oracle support
-	php_check_oracle_8
-
-	phpconfutils_warn_about_external_deps
-	depend.apache_pkg_setup
-}
-
-
--- a/dev-lang/php/files/eblits/src_compile-v1.eblit	Sun Jul 18 00:32:16 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,87 +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/files/eblits/src_compile-v1.eblit,v 1.3 2010/06/11 17:15:29 mabi Exp $
-
-eblit-php-src_compile() {
-	SAPI_DIR="${WORKDIR}/sapis"
-	local is_first_sapi=1
-
-	for sapi in ${SAPIS} ; do
-		use "${sapi}" || continue
-		if [[ ${is_first_sapi} == 1 ]]; then
-			is_first_sapi=0
-		else
-			emake clean
-		fi
-
-		php_sapi_build "${sapi}"
-		php_sapi_copy "${sapi}"
-	done
-}
-
-php_sapi_build() {
-	local sapi="$1"
-	php_set_ini_dir "${sapi}"
-
-	mkdir -p "${SAPI_DIR}/${sapi}"
-
-	sapi_conf="${my_conf} --with-config-file-path=${PHP_INI_DIR}
-		--with-config-file-scan-dir=${PHP_EXT_INI_DIR_ACTIVE}"
-
-	for one_sapi in $SAPIS ; do
-		case "$one_sapi" in
-			cli|cgi|embed)
-				if [[ "${one_sapi}" == "${sapi}" ]] ; then
-					sapi_conf="${sapi_conf} --enable-${one_sapi}"
-				else
-					sapi_conf="${sapi_conf} --disable-${one_sapi}"
-				fi
-				;;
-
-			apache2)
-				if [[ "${one_sapi}" == "${sapi}" ]] ; then
-					sapi_conf="${sapi_conf} --with-apxs2=/usr/sbin/apxs"
-				else
-					sapi_conf="${sapi_conf} --without-apxs2"
-				fi
-				;;
-
-		esac
-	done
-
-	econf ${sapi_conf}
-	emake || die "emake failed"
-}
-
-php_sapi_copy() {
-	local sapi="$1"
-	local source=""
-
-	case "$sapi" in
-		cli)
-			source="sapi/cli/php"
-			;;
-		cgi)
-			source="sapi/cgi/php-cgi"
-			;;
-		embed)
-			source="libs/libphp${PHP_MV}.so"
-			;;
-
-		apache2)
-			# apache2 is a special case; the necessary files
-			# (yes, multiple) are copied by make install, not
-			# by the ebuild; that's the reason, why apache2 has
-			# to be the last sapi
-			emake INSTALL_ROOT="${SAPI_DIR}/${sapi}/" install-sapi
-			;;
-
-		*)
-			die "unhandled sapi in php_sapi_copy"
-			;;
-	esac
-
-	if [[ "${source}" ]] ; then
-		cp "$source" "${SAPI_DIR}/$sapi" || die "Unable to copy ${sapi} SAPI"
-	fi
-}
--- a/dev-lang/php/files/eblits/src_configure-v1.eblit	Sun Jul 18 00:32:16 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,239 +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/files/eblits/src_configure-v1.eblit,v 1.2 2010/06/11 17:15:29 mabi Exp $
-
-eblit-php-src_configure() {
-	PHP_DESTDIR="/usr/$(get_libdir)/php${PHP_MV}"
-
-	# This is a global variable and should be in caps. It isn't because the
-	# phpconfutils eclass relies on exactly this name...
-	my_conf="
-		--prefix="${PHP_DESTDIR}"
-		--mandir="${PHP_DESTDIR}"/man
-		--infodir="${PHP_DESTDIR}"/info
-		--libdir="${PHP_DESTDIR}"/lib
-		--without-pear
-		$(use_enable threads maintainer-zts)"
-
-	phpconfutils_init
-
-	#                             extension	      USE flag        shared
-	phpconfutils_extension_enable  "bcmath"       "bcmath"           1
-	phpconfutils_extension_with    "bz2"          "bzip2"            1
-	phpconfutils_extension_enable  "calendar"     "calendar"         1
-	phpconfutils_extension_disable "ctype"        "ctype"            0
-	phpconfutils_extension_with    "curl"         "curl"             1
-	phpconfutils_extension_with    "curlwrappers" "curlwrappers"     0
-	phpconfutils_extension_disable "dom"          "xml"              0
-	phpconfutils_extension_with    "enchant"      "enchant"          1 "/usr"
-	phpconfutils_extension_enable  "exif"         "exif"             1
-	phpconfutils_extension_disable "fileinfo"     "fileinfo"         1
-	phpconfutils_extension_disable "filter"       "filter"           0
-	phpconfutils_extension_enable  "ftp"          "ftp"              1
-	phpconfutils_extension_with    "gettext"      "nls"              1
-	phpconfutils_extension_with    "gmp"          "gmp"              1
-	phpconfutils_extension_disable "hash"         "hash"             0
-	phpconfutils_extension_without "iconv"        "iconv"            0
-	phpconfutils_extension_enable  "intl"         "intl"             1
-	phpconfutils_extension_disable "ipv6"         "ipv6"             0
-	phpconfutils_extension_disable "json"         "json"             0
-	phpconfutils_extension_with    "kerberos"     "kerberos"         0 "/usr"
-	phpconfutils_extension_disable "libxml"       "xml"              0
-	phpconfutils_extension_enable  "mbstring"     "unicode"          1
-	phpconfutils_extension_with    "mcrypt"       "crypt"            1
-	phpconfutils_extension_with    "mssql"        "mssql"            1
-	phpconfutils_extension_with    "onig"         "unicode"          0 "/usr"
-	phpconfutils_extension_with    "openssl"      "ssl"              0
-	phpconfutils_extension_with    "openssl-dir"  "ssl"              0 "/usr"
-	phpconfutils_extension_enable  "pcntl"        "pcntl"            1
-	phpconfutils_extension_disable "phar"         "phar"             1
-	phpconfutils_extension_disable "pdo"          "pdo"              0
-	phpconfutils_extension_with    "pgsql"        "postgres"         1
-	phpconfutils_extension_disable "posix"        "posix"            0
-	phpconfutils_extension_with    "pspell"       "spell"            1
-	phpconfutils_extension_with    "recode"       "recode"           1
-	phpconfutils_extension_disable "simplexml"    "simplexml"        0
-	phpconfutils_extension_enable  "shmop"        "sharedmem"        0
-	phpconfutils_extension_with    "snmp"         "snmp"             1
-	phpconfutils_extension_enable  "soap"         "soap"             1
-	phpconfutils_extension_enable  "sockets"      "sockets"          1
-	phpconfutils_extension_without "sqlite3"      "sqlite3"          1 "/usr"
-	phpconfutils_extension_with    "sybase-ct"    "sybase-ct"        1
-	phpconfutils_extension_enable  "sysvmsg"      "sysvipc"          1
-	phpconfutils_extension_enable  "sysvsem"      "sysvipc"          1
-	phpconfutils_extension_enable  "sysvshm"      "sysvipc"          1
-	phpconfutils_extension_with    "tidy"         "tidy"             1
-	phpconfutils_extension_disable "tokenizer"    "tokenizer"        0
-	phpconfutils_extension_enable  "wddx"         "wddx"             1
-	phpconfutils_extension_disable "xml"          "xml"              0
-	phpconfutils_extension_disable "xmlreader"    "xmlreader"        0
-	phpconfutils_extension_disable "xmlwriter"    "xmlwriter"        0
-	phpconfutils_extension_with    "xmlrpc"       "xmlrpc"           1
-	phpconfutils_extension_with    "xsl"          "xsl"              1
-	phpconfutils_extension_enable  "zip"          "zip"              1
-	phpconfutils_extension_with    "zlib"         "zlib"             1
-	phpconfutils_extension_enable  "debug"        "debug"            0
-
-	# DBA support
-	if use cdb || use berkdb || use flatfile || use gdbm || use inifile \
-		|| use qdbm ; then
-		my_conf="${my_conf} --enable-dba${shared}"
-	fi
-
-	# DBA drivers support
-	phpconfutils_extension_with   "cdb"        "cdb"      0
-	phpconfutils_extension_with   "db4"        "berkdb"   0
-	phpconfutils_extension_enable "flatfile"   "flatfile" 0
-	phpconfutils_extension_with   "gdbm"       "gdbm"     0
-	phpconfutils_extension_enable "inifile"    "inifile"  0
-	phpconfutils_extension_with   "qdbm"       "qdbm"     0
-
-	# Support for the GD graphics library
-	if use gd-external ; then
-		phpconfutils_extension_with   "freetype-dir" "truetype"    0 "/usr"
-		phpconfutils_extension_with   "t1lib"        "truetype"    0 "/usr"
-		phpconfutils_extension_enable "gd-jis-conv"  "cjk"         0
-		phpconfutils_extension_with   "gd"           "gd-external" 1 "/usr"
-	else
-		phpconfutils_extension_with   "freetype-dir" "truetype"    0 "/usr"
-		phpconfutils_extension_with   "t1lib"        "truetype"    0 "/usr"
-		phpconfutils_extension_enable "gd-jis-conv"  "cjk"         0
-		phpconfutils_extension_with   "jpeg-dir"     "gd"          0 "/usr"
-		phpconfutils_extension_with   "png-dir"      "gd"          0 "/usr"
-		phpconfutils_extension_with   "xpm-dir"      "xpm"         0 "/usr"
-		# enable gd last, so configure can pick up the previous settings
-		phpconfutils_extension_with   "gd"           "gd"          0
-	fi
-
-	# IMAP support
-	if use imap ; then
-		phpconfutils_extension_with "imap"     "imap" 1
-		phpconfutils_extension_with "imap-ssl" "ssl"  0
-	fi
-
-	phpconfutils_extension_with "interbase"	"interbase"	0 "/opt"
-	phpconfutils_extension_with	"interbase"	"firebird"	0 "/usr"
-
-	# LDAP support
-	if use ldap ; then
-		if use oci8 ; then
-			phpconfutils_extension_with "ldap" "ldap" 1 "${ORACLE_HOME}"
-		else
-			phpconfutils_extension_with "ldap"      "ldap"      1
-			phpconfutils_extension_with "ldap-sasl" "ldap-sasl" 0
-		fi
-	fi
-
-	# MySQL support
-	if use mysql ; then
-		if use mysqlnd ; then
-			phpconfutils_extension_with "mysql"      "mysql" 1 "mysqlnd"
-		else
-			phpconfutils_extension_with "mysql"      "mysql" 1 "/usr"
-		fi
-		phpconfutils_extension_with "mysql-sock" "mysql" 0 "/var/run/mysqld/mysqld.sock"
-	fi
-
-	# MySQLi support
-	if use mysqlnd ; then
-		phpconfutils_extension_with "mysqli" "mysqli" 1 "mysqlnd"
-	else
-		phpconfutils_extension_with "mysqli" "mysqli" 1 "/usr/bin/mysql_config"
-	fi
-
-	# ODBC support
-	if use odbc ; then
-		phpconfutils_extension_with "unixODBC" "odbc"     1 "/usr"
-		phpconfutils_extension_with "adabas"   "adabas"   1
-		phpconfutils_extension_with "birdstep" "birdstep" 1
-		phpconfutils_extension_with "dbmaker"  "dbmaker"  1
-		phpconfutils_extension_with "empress"  "empress"  1
-		if use empress ; then
-			phpconfutils_extension_with "empress-bcs" "empress-bcs" 0
-		fi
-		phpconfutils_extension_with "esoob"   "esoob" 1
-		phpconfutils_extension_with "ibm-db2" "db2"   1
-		phpconfutils_extension_with "sapdb"   "sapdb" 1
-		phpconfutils_extension_with "solid"   "solid" 1
-	fi
-
-	if use iodbc ; then
-		phpconfutils_extension_with "iodbc"   "iodbc" 1 "/usr"
-	fi
-
-	# Oracle support
-	phpconfutils_extension_with "oci8" "oci8" 1
-	if use oci8-instant-client ; then
-		OCI8IC_PKG="$(best_version dev-db/oracle-instantclient-basic | \
-			sed -e 's|dev-db/oracle-instantclient-basic-||g' | \
-			sed -e 's|-r.*||g')"
-
-		phpconfutils_extension_with "oci8" "oci8-instant-client" 1 \
-			"instantclient,/usr/lib/oracle/${OCI8IC_PKG}/client/lib"
-	fi
-
-	# PDO support
-	if use pdo ; then
-		phpconfutils_extension_with "pdo-dblib"  "mssql"    1
-		if use mysqlnd ; then
-			phpconfutils_extension_with "pdo-mysql"  "mysql"    1 "mysqlnd"
-		else
-			phpconfutils_extension_with "pdo-mysql"  "mysql"    1 "/usr"
-		fi
-		phpconfutils_extension_with "pdo-pgsql"  "postgres"	1
-		phpconfutils_extension_with "pdo-sqlite" "sqlite"   1 "/usr"
-		phpconfutils_extension_with "pdo-odbc"   "odbc"     1 "unixODBC,/usr"
-		if use oci8 ; then
-			phpconfutils_extension_with "pdo-oci" "oci8" 1
-		fi
-		if use oci8-instant-client ; then
-			phpconfutils_extension_with "pdo-oci" "oci8-instant-client" 1 \
-				"instantclient,/usr,${OCI8IC_PKG}"
-		fi
-	fi
-
-	# readline/libedit support
-	phpconfutils_extension_with "readline" "readline" 0
-	phpconfutils_extension_with "libedit"  "libedit"  0
-
-	# Session support
-	if use session ; then
-		phpconfutils_extension_with "mm" "sharedmem" 0
-	else
-		phpconfutils_extension_disable "session" "session" 0
-	fi
-
-	# SQLite support
-	if use sqlite ; then
-		phpconfutils_extension_with   "sqlite"      "sqlite"  0 "/usr"
-		phpconfutils_extension_enable "sqlite-utf8" "unicode" 0
-	else
-		phpconfutils_extension_without "sqlite" "sqlite" 0
-	fi
-
-	if use pic ; then
-		my_conf="${my_conf} --with-pic"
-	fi
-
-	# we use the system copy of pcre
-	# --with-pcre-regex affects ext/pcre
-	# --with-pcre-dir affects ext/filter and ext/zip
-	my_conf="${my_conf} --with-pcre-regex=/usr --with-pcre-dir=/usr"
-
-	# Catch CFLAGS problems
-	php_check_cflags
-
-	# Support user-passed configuration parameters
-	my_conf="${my_conf} ${EXTRA_ECONF:-}"
-
-	# Support the Apache2 extras, they must be set globally for all
-	# SAPIs to work correctly, especially for external PHP extensions
-	if use apache2 ; then
-		# Concurrent PHP Apache2 modules support
-		if use concurrentmodphp ; then
-			append-ldflags "-Wl,--version-script=${FILESDIR}/php${PHP_MV}-ldvs"
-		fi
-	fi
-}
-
-
--- a/dev-lang/php/files/eblits/src_install-v1.eblit	Sun Jul 18 00:32:16 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,128 +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/files/eblits/src_install-v1.eblit,v 1.3 2010/06/14 17:03:22 mabi Exp $
-
-eblit-php-src_install() {
-	# Makefile forgets to create this before trying to write to it...
-	dodir "${PHP_DESTDIR}/bin"
-
-	# Install php environment (without any sapis)
-	emake INSTALL_ROOT="${D}" \
-		install-build install-headers install-programs \
-		|| die "emake install failed"
-
-	local extension_dir="$("${D}/${PHP_DESTDIR}/bin/php-config" --extension-dir)"
-
-	# And install the modules to it
-	if use sharedext ; then
-		insinto "${extension_dir}"
-		doins "${S}/modules/"*.so
-	fi
-
-	# Generate the USE file for PHP
-	phpconfutils_generate_usefile
-
-	# Create the directory where we'll put version-specific php scripts
-	keepdir /usr/share/php${PHP_MV}
-
-	local sapi="", file=""
-	local sapi_list=""
-
-	for sapi in ${SAPIS}; do
-		if use "${sapi}" ; then
-			einfo "Installing SAPI: ${sapi}"
-			# needed each time, php_install_ini would reset it
-			into "${PHP_DESTDIR}"
-			file=$(find "${SAPI_DIR}/${sapi}/" -type f | head -n 1)
-
-			if [[ "${file: -3}" == ".so" ]]; then 
-				if [[ "${sapi}" == "apache2" ]]; then
-					insinto "${PHP_DESTDIR}/../apache2/modules/"
-					newins "${file}" "${file/*\/}"
-				else
-					dolib.so "${file}" || die "Unable to install ${sapi} sapi"
-				fi
-			else
-				dobin "${file}" || die "Unable to install ${sapi} sapi"
-			fi
-
-			php_install_ini "${sapi}"
-
-			# construct correct SAPI string for php-config
-			# thanks to ferringb for the bash voodoo
-			if [[ "${sapi}" == "apache2" ]]; then
-			    sapi_list="${sapi_list:+${sapi_list} }apache2handler"
-			else
-				sapi_list="${sapi_list:+${sapi_list} }${sapi}"
-			fi
-		fi
-	done
-
-	# Install env.d files
-	newenvd "${FILESDIR}/20php${PHP_MV}-envd" \
-		"20php${PHP_MV}"
-	sed -e "s|/lib/|/$(get_libdir)/|g" -i \
-		"${D}/etc/env.d/20php${PHP_MV}"
-
-	# set php-config variable correctly (bug #278439)
-	sed -e "s:^\(php_sapis=\)\".*\"$:\1\"${sapi_list}\":" -i \
-		"${D}/usr/$(get_libdir)/php5/bin/php-config"
-}
-
-php_install_ini() {
-	local phpsapi="${1}"
-
-	# work out where we are installing the ini file
-	php_set_ini_dir "${phpsapi}"
-
-	local phpinisrc="${PHP_INI_UPSTREAM}-${phpsapi}"
-	cp "${PHP_INI_UPSTREAM}" "${phpinisrc}"
-
-	# default to expose_php=Off, bug 300695
-	sed -e 's|^expose_php .*|expose_php = Off|g' -i "${phpinisrc}"
-
-	# Set the extension dir
-	sed -e "s|^extension_dir .*$|extension_dir = ${extension_dir}|g" -i "${phpinisrc}"
-
-	# Set the include path to point to where we want to find PEAR packages
-	sed -e 's|^;include_path = ".:/php/includes".*|include_path = ".:/usr/share/php'${PHP_MV}':/usr/share/php"|' -i "${phpinisrc}"
-
-	dodir "${PHP_INI_DIR}"
-	insinto "${PHP_INI_DIR}"
-	newins "${phpinisrc}" "${PHP_INI_FILE}"
-
-	dodir "${PHP_EXT_INI_DIR}"
-	dodir "${PHP_EXT_INI_DIR_ACTIVE}"
-
-	# Install any extensions built as shared objects
-	if use sharedext ; then
-		insinto "${PHP_EXT_INI_DIR}"
-		for extension in "${D}/${extension_dir}/"*.so ; do
-			extension="${extension##*/}"
-			inifilename="${extension/.so/.ini}"
-			echo "extension=${extension}" > "${S}/modules/$inifilename"
-			doins "${S}/modules/$inifilename"
-			dosym "${PHP_EXT_INI_DIR}/${inifilename}" "${PHP_EXT_INI_DIR_ACTIVE}/${inifilename}"
-		done
-	fi
-
-	# SAPI-specific handling
-	if [[ "${sapi}" == "apache2" ]] ; then
-		if use concurrentmodphp ; then
-			einfo "Installing Apache2 config file 70_mod_php${PHP_MV}_concurr.conf"
-			insinto "${APACHE_MODULES_CONFDIR}"
-			newins "${FILESDIR}/70_mod_php${PHP_MV}_concurr.conf-apache2" \
-				"70_mod_php${PHP_MV}_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}/php${PHP_MV}-ldvs"
-		else
-			einfo "Installing Apache2 config 70_mod_php${PHP_MV}.conf)"
-			insinto ${APACHE_MODULES_CONFDIR}
-			newins "${FILESDIR}/70_mod_php${PHP_MV}.conf-apache2" \
-				"70_mod_php${PHP_MV}.conf"
-		fi
-	fi
-}
--- a/dev-lang/php/files/eblits/src_prepare-v1.eblit	Sun Jul 18 00:32:16 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,70 +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/files/eblits/src_prepare-v1.eblit,v 1.3 2010/06/01 16:17:05 mabi Exp $
-
-eblit-php-src_prepare() {
-	# USE=sharedmem (session/mod_mm to be exact) tries to mmap() this path
-	# ([empty session.save_path]/session_mm_[sapi][gid].sem)
-	# there is no easy way to circumvent that, all php calls during
-	# install use -n, so no php.ini file will be used.
-	# As such, this is the easiest way to get around
-	addpredict /session_mm_cli250.sem
-	addpredict /session_mm_cli0.sem
-
-	# Concurrent PHP Apache2 modules support
-	use apache2 && use concurrentmodphp && \
-		epatch "${WORKDIR}/${PV}/opt/concurrent_apache_modules.patch"
-
-	# kolab support (support for imap annotations)
-	use kolab && epatch "${WORKDIR}/${PV}/opt/imap-kolab-annotations.patch"
-
-	# Change PHP branding
-	sed -re	"s|^(PHP_EXTRA_VERSION=\").*(\")|\1${PHP_EXTRA_BRANDING}-pl${PR/r/}-gentoo\2|g" \
-		-i configure.in || die "Unable to change PHP branding"
-
-	# Apply generic PHP patches
-	EPATCH_SOURCE="${WORKDIR}/${PV}/generic" EPATCH_SUFFIX="patch" \
-		EPATCH_FORCE="yes" \
-		EPATCH_MULTI_MSG="Applying generic patches and fixes from upstream..." epatch
-
-	# Patch PHP to show Gentoo as the server platform
-	sed -e 's/PHP_UNAME=`uname -a | xargs`/PHP_UNAME=`uname -s -n -r -v | xargs`/g' \
-		-i configure.in || die "Failed to fix server platform name"
-
-	# Prevent PHP from activating the Apache config,
-	# as we will do that ourselves
-	sed -i \
-		-e "s,-i -a -n php${PHP_MV},-i -n php${PHP_MV},g" \
-		-e "s,-i -A -n php${PHP_MV},-i -n php${PHP_MV},g" \
-		configure sapi/apache2filter/config.m4 sapi/apache2handler/config.m4
-
-	# Patch PHP to support heimdal instead of mit-krb5
-	if has_version "app-crypt/heimdal" ; then
-		sed -e 's|gssapi_krb5|gssapi|g' -i acinclude.m4 \
-			|| die "Failed to fix heimdal libname"
-		sed -e 's|PHP_ADD_LIBRARY(k5crypto, 1, $1)||g' -i acinclude.m4 \
-			|| die "Failed to fix heimdal crypt library reference"
-	fi
-
-	# Suhosin support
-	if use suhosin ; then
-		epatch "${WORKDIR}/${SUHOSIN_PATCH}"
-	fi
-
-	# rebuild the whole autotools stuff as we are heavily patching it
-	# (suhosin, fastbuild, ...)
-
-	# eaclocal doesn't accept --force, so we try to force re-generation
-	# this way
-	rm aclocal.m4
-
-	# work around divert() issues with newer autoconf, bug #281697
-	if has_version '>=sys-devel/autoconf-2.64' ; then
-		sed -i -r \
-			-e 's:^((m4_)?divert)[(]([0-9]*)[)]:\1(600\3):' \
-			$(grep -l divert $(find . -name '*.m4') configure.in) || die
-	fi
-	eautoreconf --force -W no-cross
-}
-
-
--- a/dev-lang/php/files/eblits/src_test-v1.eblit	Sun Jul 18 00:32:16 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,54 +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/files/eblits/src_test-v1.eblit,v 1.1 2010/05/27 23:05:04 mabi Exp $
-
-eblit-php-src_test() {
-	vecho ">>> Test phase [test]: ${CATEGORY}/${PF}"
-
-	if [[ ! -x "${S}/sapi/cli/php" ]] ; then
-		ewarn "Test phase requires USE=cli, skipping"
-		return
-	else
-		export TEST_PHP_EXECUTABLE="${S}/sapi/cli/php"
-	fi
-
-	if [[ -x "${S}/sapi/cgi/php-cgi" ]] ; then
-		export TEST_PHP_CGI_EXECUTABLE="${S}/sapi/cgi/php-cgi"
-	fi
-	
-	
-	REPORT_EXIT_STATUS=1 "${TEST_PHP_EXECUTABLE}" -n  -d "session.save_path=${T}" \
-		"${S}/run-tests.php" -n -q -d "session.save_path=${T}"
-
-	for name in ${EXPECTED_TEST_FAILURES}; do
-		mv "${name}.out" "${name}.out.orig" 2>/dev/null
-	done
-
-	local failed="$(find -name '*.out')"
-	if [[ ${failed} != "" ]] ; then
-		ewarn "The following test cases failed unexpectedly:"
-		for name in ${failed}; do
-			ewarn "  ${name/.out/}"
-		done
-	else
-		einfo "No unexpected test failures, all fine"
-	fi
-
-	if [[ ${PHP_SHOW_UNEXPECTED_TEST_PASS} == "1" ]] ; then
-		local passed=""
-		for name in ${EXPECTED_TEST_FAILURES}; do
-			[[ -f "${name}.diff" ]] && continue
-			passed="${passed} ${name}"
-		done
-		if [[ ${passed} != "" ]] ; then
-			einfo "The following test cases passed unexpectedly:"
-			for name in ${passed}; do
-				ewarn "  ${passed}"
-			done
-		else
-			einfo "None of the known-to-fail tests passed, all fine"
-		fi
-	fi
-}
-
-
--- a/dev-lang/php/files/php5-ldvs	Sun Jul 18 00:32:16 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-PHP_5 { global: *; };
--- a/dev-lang/php/metadata.xml	Sun Jul 18 00:32:16 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,33 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<herd>php</herd>
-	<use>
-		<flag name='cli'>Enable CLI SAPI</flag>
-		<flag name='concurrentmodphp'>Make it possible to load both mod_php4 and mod_php5 into the same Apache2 instance (experimental)</flag>
-		<flag name='discard-path'>Switch on common security setting for CGI SAPI</flag>
-		<flag name='embed'>Enable embed SAPI</flag>
-		<flag name='enchant'>Add supports Enchant spelling library.</flag>
-		<flag name='fastbuild'>Build PHP quicker (experimental)</flag>
-		<flag name='fdftk'>Add supports for Adobe's FDF toolkit.</flag>
-		<flag name='fileinfo'>Add fileinfo extension support</flag>
-		<flag name='filter'>Add filter extension support</flag>
-		<flag name='force-cgi-redirect'>Switch on common security setting for CGI SAPI</flag>
-		<flag name='hash'>Enable the hash extension</flag>
-		<flag name='intl'>Enables the intl extension for extended internalization support</flag>
-		<flag name='java-external'>Use the external java extension rather than the bundled one</flag>
-		<flag name='json'>Enable JSON support</flag>
-		<flag name='ldap-sasl'>Add SASL support for the PHP LDAP extension</flag>
-		<flag name='mysqlnd'>Use native driver for mysql, mysqli, PDO_Mysql</flag>
-		<flag name='pcre'>Adds support for Perl Compatible Regular Expressions  (deprecated: always "on" in php 5.3)</flag>
-		<flag name='pic'>Force shared modules to build as PIC on x86 (speed tradeoff with memory usage)</flag>
-		<flag name='pdo'>Enable the bundled PDO extensions</flag>
-		<flag name='phar'>Enables the phar extension to provide phar archive support</flag>
-		<flag name='reflection'>Enable the reflection extension (Reflection API) (deprecated: always "on" in php 5.3)</flag>
-		<flag name='spl'>Adds support for the Standard PHP Library (deprecated: always "on" in php 5.3)</flag>
-		<flag name='suhosin'>Add Suhosin support (patch and extension from http://www.suhosin.org/)</flag>
-		<flag name='xmlreader'>Enable XMLReader support</flag>
-		<flag name='xmlwriter'>Enable XMLWriter support</flag>
-		<flag name='zip'>Enable ZIP file support</flag>
-	</use>
-</pkgmetadata>
--- a/dev-lang/php/php-5.3.2.ebuild	Sun Jul 18 00:32:16 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,336 +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.3.2.ebuild,v 1.10 2010/07/04 22:40:19 mabi Exp $
-
-EAPI=2
-
-PHPCONFUTILS_MISSING_DEPS="adabas birdstep db2 dbmaker empress empress-bcs esoob interbase oci8 sapdb solid"
-
-inherit eutils autotools flag-o-matic versionator depend.apache apache-module db-use phpconfutils php-common-r1 libtool
-
-PHP_PATCHSET="1"
-SUHOSIN_VERSION="$PV-0.9.9.1"
-EXPECTED_TEST_FAILURES=""
-
-KEYWORDS="~amd64 ~x86"
-
-function php_get_uri ()
-{
-	case "${1}" in
-		"php-pre")
-			echo "http://downloads.php.net/johannes/${2}"
-		;;
-		"php")
-			echo "http://www.php.net/distributions/${2}"
-		;;
-		"suhosin")
-			echo "http://download.suhosin.org/${2}"
-		;;
-		"gentoo")
-			echo "mirror://gentoo/${2}"
-		;;
-		*)
-			die "unhandled case in php_get_uri"
-		;;
-	esac
-}
-
-PHP_MV="$(get_major_version)"
-
-# alias, so we can handle different types of releases (finals, rcs, alphas,
-# betas, ...) w/o changing the whole ebuild
-PHP_PV="${PV}"
-PHP_RELEASE="php"
-PHP_P="${PN}-${PHP_PV}"
-PHP_SRC_URI="$(php_get_uri "${PHP_RELEASE}" "${PHP_P}.tar.bz2")"
-
-PHP_PATCHSET="${PHP_PATCHSET:-${PR/r/}}"
-PHP_PATCHSET_URI="
-	$(php_get_uri gentoo "php-patchset-${PV}-r${PHP_PATCHSET}.tar.bz2")"
-
-if [[ ${SUHOSIN_VERSION} == *-gentoo ]]; then
-	# in some cases we use our own suhosin patch (very recent version,
-	# patch conflicts, etc.)
-	SUHOSIN_TYPE="gentoo"
-else
-	SUHOSIN_TYPE="suhosin"
-fi
-
-SUHOSIN_PATCH="suhosin-patch-${SUHOSIN_VERSION}.patch"
-SUHOSIN_URI="$(php_get_uri ${SUHOSIN_TYPE} ${SUHOSIN_PATCH}.gz )"
-
-SRC_URI="
-	${PHP_SRC_URI}
-	${PHP_PATCHSET_URI}
-	suhosin? ( ${SUHOSIN_URI} )"
-
-DESCRIPTION="The PHP language runtime engine: CLI, CGI, Apache2 and embed SAPIs."
-HOMEPAGE="http://php.net/"
-LICENSE="PHP-3"
-
-# We can build the following SAPIs in the given order
-SAPIS="cli cgi embed apache2"
-
-# Gentoo-specific, common features
-IUSE="kolab"
-
-# SAPIs and SAPI-specific USE flags (cli SAPI is default on):
-IUSE="${IUSE}
-	+${SAPIS}
-	concurrentmodphp threads"
-
-IUSE="${IUSE} adabas bcmath berkdb birdstep bzip2 calendar cdb cjk
-	crypt +ctype curl curlwrappers db2 dbmaker debug doc empress
-	empress-bcs enchant esoob exif frontbase +fileinfo +filter firebird
-	flatfile ftp gd gd-external gdbm gmp +hash +iconv imap inifile
-	interbase intl iodbc ipv6 +json kerberos ldap ldap-sasl libedit
-	mssql mysql mysqlnd mysqli nls oci8
-	oci8-instant-client odbc pcntl pdo +phar pic +posix postgres qdbm
-	readline recode sapdb +session sharedext sharedmem
-	+simplexml snmp soap sockets solid spell sqlite sqlite3 ssl suhosin
-	sybase-ct sysvipc tidy +tokenizer truetype unicode wddx
-	xml xmlreader xmlwriter xmlrpc xpm xsl zip zlib"
-
-DEPEND="app-admin/php-toolkit
-	>=dev-libs/libpcre-7.9[unicode]
-	adabas? ( >=dev-db/unixODBC-1.8.13 )
-	apache2? ( www-servers/apache[threads=] )
-	berkdb? ( =sys-libs/db-4* )
-	birdstep? ( >=dev-db/unixODBC-1.8.13 )
-	bzip2? ( app-arch/bzip2 )
-	cdb? ( || ( dev-db/cdb dev-db/tinycdb ) )
-	cjk? ( !gd? ( !gd-external? (
-		>=media-libs/jpeg-6b
-		media-libs/libpng
-		sys-libs/zlib
-	) ) )
-	crypt? ( >=dev-libs/libmcrypt-2.4 )
-	curl? ( >=net-misc/curl-7.10.5 )
-	db2? ( >=dev-db/unixODBC-1.8.13 )
-	dbmaker? ( >=dev-db/unixODBC-1.8.13 )
-	empress? ( >=dev-db/unixODBC-1.8.13 )
-	empress-bcs? ( >=dev-db/unixODBC-1.8.13 )
-	enchant? ( app-text/enchant )
-	esoob? ( >=dev-db/unixODBC-1.8.13 )
-	exif? ( !gd? ( !gd-external? (
-		>=media-libs/jpeg-6b
-		media-libs/libpng
-		sys-libs/zlib
-	) ) )
-	firebird? ( dev-db/firebird )
-	gd? ( >=media-libs/jpeg-6b media-libs/libpng sys-libs/zlib )
-	gd-external? ( media-libs/gd )
-	gdbm? ( >=sys-libs/gdbm-1.8.0 )
-	gmp? ( >=dev-libs/gmp-4.1.2 )
-	iconv? ( virtual/libiconv )
-	imap? (
-		virtual/imap-c-client[ssl=]
-		virtual/imap-c-client[kolab=]
-	)
-	intl? ( dev-libs/icu )
-	iodbc? ( dev-db/libiodbc )
-	kerberos? ( virtual/krb5 )
-	kolab? ( >=net-libs/c-client-2004g-r1 )
-	ldap? ( !oci8? ( >=net-nds/openldap-1.2.11 ) )
-	ldap-sasl? ( !oci8? ( dev-libs/cyrus-sasl >=net-nds/openldap-1.2.11 ) )
-	libedit? ( || ( sys-freebsd/freebsd-lib dev-libs/libedit ) )
-	mssql? ( dev-db/freetds[mssql] )
-	!mysqlnd? (
-		mysql? ( virtual/mysql )
-		mysqli? ( >=virtual/mysql-4.1 )
-	)
-	nls? ( sys-devel/gettext )
-	oci8-instant-client? ( dev-db/oracle-instantclient-basic )
-	odbc? ( >=dev-db/unixODBC-1.8.13 )
-	postgres? (
-		|| (
-			>=dev-db/postgresql-base-7.1
-			(
-				|| (
-					<dev-db/libpq-8
-					>=dev-db/libpq-8[threads=]
-				)
-			)
-		)
-	)
-	qdbm? ( dev-db/qdbm )
-	readline? ( sys-libs/readline )
-	recode? ( app-text/recode )
-	sapdb? ( >=dev-db/unixODBC-1.8.13 )
-	sharedmem? ( dev-libs/mm )
-	simplexml? ( >=dev-libs/libxml2-2.6.8 )
-	snmp? ( >=net-analyzer/net-snmp-5.2 )
-	soap? ( >=dev-libs/libxml2-2.6.8 )
-	solid? ( >=dev-db/unixODBC-1.8.13 )
-	spell? ( >=app-text/aspell-0.50 )
-	sqlite? ( =dev-db/sqlite-2* pdo? ( =dev-db/sqlite-3* ) )
-	sqlite3? ( =dev-db/sqlite-3* )
-	ssl? ( >=dev-libs/openssl-0.9.7 )
-	sybase-ct? ( dev-db/freetds )
-	tidy? ( app-text/htmltidy )
-	truetype? (
-		=media-libs/freetype-2*
-		>=media-libs/t1lib-5.0.0
-		!gd? ( !gd-external? (
-			>=media-libs/jpeg-6b media-libs/libpng sys-libs/zlib ) )
-	)
-	unicode? ( dev-libs/oniguruma )
-	wddx? ( >=dev-libs/libxml2-2.6.8 )
-	xml? ( >=dev-libs/libxml2-2.6.8 )
-	xmlrpc? ( >=dev-libs/libxml2-2.6.8 virtual/libiconv )
-	xmlreader? ( >=dev-libs/libxml2-2.6.8 )
-	xmlwriter? ( >=dev-libs/libxml2-2.6.8 )
-	xpm? (
-		x11-libs/libXpm
-		>=media-libs/jpeg-6b
-		media-libs/libpng sys-libs/zlib
-	)
-	xsl? ( dev-libs/libxslt >=dev-libs/libxml2-2.6.8 )
-	zip? ( sys-libs/zlib )
-	zlib? ( sys-libs/zlib )
-	virtual/mta
-"
-
-php="=${CATEGORY}/${PF}"
-RDEPEND="${DEPEND}
-	truetype? ( || ( $php[gd] $php[gd-external] ) )
-	cjk? ( || ( $php[gd] $php[gd-external] ) )
-	exif? ( || ( $php[gd] $php[gd-external] ) )
-
-	xpm? ( $php[gd] )
-	gd? ( $php[zlib,-gd-external] )
-	gd-external? ( $php[-gd] )
-	simplexml? ( $php[xml] )
-	soap? ( $php[xml] )
-	wddx? ( $php[xml] )
-	xmlrpc? ( || ( $php[xml] $php[iconv] ) )
-	xmlreader? ( $php[xml] )
-	xsl? ( $php[xml] )
-	ldap-sasl? ( $php[ldap,-oci8] )
-	suhosin? ( $php[unicode] )
-	adabas? ( $php[odbc] )
-	birdstep? ( $php[odbc] )
-	dbmaker? ( $php[odbc] )
-	empress-bcs? ( $php[empress] )
-	empress? ( $php[odbc] )
-	esoob? ( $php[odbc] )
-	db2? ( $php[odbc] )
-	sapdb? ( $php[odbc] )
-	solid? ( $php[odbc] )
-	kolab? ( $php[imap] )
-	phar? ( $php[hash] )
-	mysqlnd? ( || (
-		$php[mysql]
-		$php[mysqli]
-		$php[pdo]
-	) )
-
-	oci8? ( $php[-oci8-instant-client,-ldap-sasl] )
-	oci8-instant-client? ( $php[-oci8] )
-
-	qdbm? ( $php[-gdbm] )
-	readline? ( $php[-libedit] )
-	recode? ( $php[-imap,-mysql,-mysqli] )
-	firebird? ( $php[-interbase] )
-	sharedmem? ( $php[-threads] )
-
-	!cli? ( !cgi? ( !apache2? ( !embed? ( $php[cli] ) ) ) )
-
-	enchant? ( !dev-php${PHP_MV}/pecl-enchant )
-	fileinfo? ( !dev-php${PHP_MV}/pecl-fileinfo )
-	filter? ( !dev-php${PHP_MV}/pecl-filter )
-	json? ( !dev-php${PHP_MV}/pecl-json )
-	phar? ( !dev-php${PHP_MV}/pecl-phar )
-	zip? ( !dev-php${PHP_MV}/pecl-zip )"
-
-DEPEND="${DEPEND}
-	sys-devel/flex
-	>=sys-devel/m4-1.4.3
-	>=sys-devel/libtool-1.5.18"
-
-# They are in PDEPEND because we need PHP installed first!
-PDEPEND="doc? ( app-doc/php-docs )
-	suhosin? ( dev-php${PHP_MV}/suhosin )"
-
-# 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"
-
-SLOT="${PHP_MV}"
-S="${WORKDIR}/${PHP_P}"
-
-PHP_INI_FILE="php.ini"
-PHP_INI_UPSTREAM="php.ini-production"
-
-want_apache
-
-# eblit-core
-# Usage: <function> [version] [eval]
-# Main eblit engine
-eblit-core() {
-	[[ -z $FILESDIR ]] && FILESDIR="$(dirname $EBUILD)/files"
-	local e v func=$1 ver=$2 eval_=$3
-	for v in ${ver:+-}${ver} -${PVR} -${PV} "" ; do
-		e="${FILESDIR}/eblits/${func}${v}.eblit"
-		if [[ -e ${e} ]] ; then
-			. "${e}"
-			[[ ${eval_} == 1 ]] && eval "${func}() { eblit-run ${func} ${ver} ; }"
-			return 0
-		fi
-	done
-	return 1
-}
-
-# eblit-include
-# Usage: [--skip] <function> [version]
-# Includes an "eblit" -- a chunk of common code among ebuilds in a given
-# package so that its functions can be sourced and utilized within the
-# ebuild.
-eblit-include() {
-	local skipable=false r=0
-	[[ $1 == "--skip" ]] && skipable=true && shift
-	[[ $1 == pkg_* ]] && skipable=true
-
-	[[ -z $1 ]] && die "Usage: eblit-include <function> [version]"
-	eblit-core $1 $2
-	r="$?"
-	${skipable} && return 0
-	[[ "$r" -gt "0" ]] && die "Could not locate requested eblit '$1' in ${FILESDIR}/eblits/"
-}
-
-# eblit-run-maybe
-# Usage: <function>
-# Runs a function if it is defined in an eblit
-eblit-run-maybe() {
-	[[ $(type -t "$@") == "function" ]] && "$@"
-}
-
-# eblit-run
-# Usage: <function> [version]
-# Runs a function defined in an eblit
-eblit-run() {
-	eblit-include --skip common "${*:2}"
-	eblit-include "$@"
-	eblit-run-maybe eblit-$1-pre
-	eblit-${PN}-$1
-	eblit-run-maybe eblit-$1-post
-}
-
-# eblit-pkg
-# Usage: <phase> [version]
-# Includes the given functions AND evals them so they're included in the binpkgs
-eblit-pkg() {
-	[[ -z $1 ]] && die "Usage: eblit-pkg <phase> [version]"
-	eblit-core $1 $2 1
-}
-
-eblit-pkg pkg_setup v1
-
-src_prepare() { eblit-run src_prepare v1 ; }
-src_configure() { eblit-run src_configure v1 ; }
-src_compile() { eblit-run src_compile v1 ; }
-src_install() { eblit-run src_install v1 ; }
-src_test() { eblit-run src_test v1 ; }
-
-eblit-pkg pkg_postinst v1