Bumped the php snapshot version

Package-Manager: portage-2.1.9.46/cvs/Linux x86_64

5 files changed, 303 insertions, 36 deletions

diff --git a/dev-lang/php/ChangeLog b/dev-lang/php/ChangeLog
index 7fd61e1e94f0..736bb33bb812 100644
--- a/dev-lang/php/ChangeLog
+++ b/dev-lang/php/ChangeLog
@@ -1,6 +1,18 @@
 # ChangeLog for dev-lang/php
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/php/ChangeLog,v 1.488 2011/05/01 20:15:53 olemarkus Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/php/ChangeLog,v 1.489 2011/05/15 19:17:23 olemarkus Exp $
+
+*php-5.4.0_pre201105151030 (15 May 2011)
+
+  15 May 2011; <olemarkus@gentoo.org> -php-5.4.0_pre201104301030.ebuild,
+  +php-5.4.0_pre201105151030.ebuild,
+  +files/eblits/src_configure-snapshots.eblit:
+  Bumped the php snapshot version
+
+  08 May 2011; <olemarkus@gentoo.org> php-5.4.0_pre201104301030.ebuild,
+  +files/eblits/src_configure-snapshots.eblit:
+  Remove sqlite2 support and the sqlite3 USE flag. sqlite USE flag now enabled
+  sqlite3
 
 *php-5.4.0_pre201104301030 (01 May 2011)
 
diff --git a/dev-lang/php/Manifest b/dev-lang/php/Manifest
index fcd02c1a3885..70e32b167a46 100644
--- a/dev-lang/php/Manifest
+++ b/dev-lang/php/Manifest
@@ -13,13 +13,14 @@ AUX eblits/pkg_postinst-v2.eblit 2371 RMD160 7d0b3404e44c5989b6f708156fa77443533
 AUX eblits/pkg_setup-v1.eblit 648 RMD160 ff9606a7a1d264d74346bfb32224b2f2301e6fbc SHA1 55931051c1f2622e8264427a0791dc9f769f1665 SHA256 6a3cb75ca657b521320b124bac77586026be826ae1947a2d988137212f3f3d6a
 AUX eblits/pkg_setup-v2.eblit 393 RMD160 430ab1f0227011172d422886862bd59d3886034a SHA1 2fdb587135cd0fe84ea51bfee8cf4ea9fd67dcb5 SHA256 17f9316065960ff0ca56aeec918c2c9e6c80ffdf951a238f7271a589753e320c
 AUX eblits/src_compile-v1.eblit 1283 RMD160 83fbb374e2dfaa9d164e6b32b57c268ed06bf519 SHA1 09124cbc9008bfb72eb24cd24b2319d22df52c2c SHA256 5ec76ae24304c5f803a615a98394c219018da1b1ce2018f92f6ac8c5becf6c99
+AUX eblits/src_configure-snapshots.eblit 10639 RMD160 b46a407286aa32077662fa4f75345466681943bd SHA1 3375592869e274a9668a9e7c20ae4046d1e11244 SHA256 ee92ea71f6c766f6f10fda63aab36885265c95e245e8107fb2e9c10573f6e2ba
 AUX eblits/src_configure-v1.eblit 10979 RMD160 c20ce6476380cf1b355f1c957f8e0bfdf166e220 SHA1 bd2f51283e01bf838bbb1946a9879ac337c6e90c SHA256 dc769b7c5846248fdd5d1a930a3e9b614d550bfcc78f09ecd1c08607796f0206
 AUX eblits/src_configure-v2.eblit 10855 RMD160 27c70744216912e79707c6861bc7d00a379d690a SHA1 7629d985421b756aa57bcce51d378ff14db675c8 SHA256 cd3002b6c9bd91dc9d7471e416cc631247fb2ad9d7b68981b26a3f83f84c916a
 AUX eblits/src_configure-v52.eblit 11017 RMD160 4a804e4b021d2454c81c33644a744b72eec1e65d SHA1 f30392f1727592ad5de79934042d9d0b09c4ba41 SHA256 784ec5482362cc8f0725ca30a186e08958d7e8e752a238af043cfa8c7a68ed85
 AUX eblits/src_configure-v521.eblit 10844 RMD160 90513f59b5f17d680004d3e74581d9eedc8af490 SHA1 a369e2cf7816799f7e2bead8b6eccc2115d0ecdc SHA256 ad875ca45e9ad975c0d7a3cbedc27c5035aa048d7aa935221a15e47cbca63c3d
 AUX eblits/src_install-v1.eblit 5146 RMD160 24127823735939101dcb00585a5ed69adedffed2 SHA1 36ab2648abaae12d1a86c97db82cd2ea86497b2d SHA256 3bddd375764b0ed00cb30e65036c67f96c56ea0ebfd70bcdc61b7465d1500d36
 AUX eblits/src_install-v2.eblit 4986 RMD160 b5f409b505212d20058c6ba9e817a67878bef20e SHA1 31253a50f89f7a082bae99a3f47e435610cd1c69 SHA256 22a135acec8b7cc0f5521f2354617471e245b2300e99b39768e8785dee10c4ee
-AUX eblits/src_prepare-snapshots.eblit 2659 RMD160 150885679ba149a3cf5cdf49724e0595c6172203 SHA1 1f31ead076439b236bd6385825e470e915c684be SHA256 7605f33a16f084d36458bcf47f1b5dc2973131267de5f5b1fdd9eab8879f82ca
+AUX eblits/src_prepare-snapshots.eblit 2238 RMD160 d82ee01ee6cc6bae7b7199296e32bcac093f2fae SHA1 deebebf641b935e4fdcda63f3f9ce9df01bdb037 SHA256 411ce9d56008461da4592dcf623fcff40c33aac479d13544f84cc974c5c232ea
 AUX eblits/src_prepare-v1.eblit 2616 RMD160 ccff64d09cc90ada1ea5d1311457cf9a05f12f8e SHA1 7db40d0ca7ef01e5b61962f261511803f768f1bc SHA256 915b9755a37f7670f6e436fe5072dae8f5e6b437ccdfbff835e26bb2f9d22b1e
 AUX eblits/src_prepare-v2.eblit 2604 RMD160 379dbca3e2ae8c1f09f608220ec9c98d099cb792 SHA1 42afae4e07633535ecea49817f5badd559f10ff1 SHA256 fe7534260fb81a012b8021b5d555756ce8733ad192bf51cedd94f12963811790
 AUX eblits/src_prepare-v3.eblit 2649 RMD160 5f01f42eef528535866c3b5ade0ded592d1ffd48 SHA1 1bdc640ab548f4e8b78acc305fdd6ceab225daf8 SHA256 7ea3a5351fabeb050161e64c09b98ff945bbdb8b4d1a7fb83d6b4645f277b486
@@ -43,8 +44,8 @@ DIST php-patchset-5.3.3-r2.tar.bz2 9796 RMD160 6620cae9768e6a2c415ad6ed1fe9d5665
 DIST php-patchset-5.3.5-r0.tar.bz2 9479 RMD160 e8b90a8f064d3053a5fe233c758d34bedc450b25 SHA1 e8158b6741017c306f7f092a7592ee7007169df9 SHA256 29097986de2f19713c2aa530bcc1cd873f77aeacacba5405f325c460cfd46219
 DIST php-patchset-5.3.5-r1.tar.bz2 10272 RMD160 79ef53cdea8099eba93bfdf9dfe7af989d5f9146 SHA1 8a7ff781fcd37ce4591aeff619681f7ff5af57c6 SHA256 1cdc2b5eef4efdef154dc8cc60faac0566f72617de7432636f9053e412d99a46
 DIST php-patchset-5.3.6-r0.tar.bz2 10033 RMD160 352290d674cfc3bb76c4ee44b90e3ef7a231c405 SHA1 cd9e5ae79595adf7ca42d6e2fe81dd275a8b7575 SHA256 544aae373fcff288bf22706a30f06da6bcc29695d0014dc7768585197c80aaeb
-DIST php-patchset-5.4.0_pre201104301030-r0.tar.bz2 9532 RMD160 8ef9cafc7652db45aef4421bafd51928f07dabff SHA1 44d7720208895b00a713e0f9ee777ea40a8fcf8a SHA256 3c348d8e09545beb33971c018ff948f4534766349821a477bd28c1b088b09b65
-DIST php-trunk-201104301030.tar.bz2 10808277 RMD160 0f5fdf9eae436c3fba1758035d512cdde61a58e2 SHA1 ce715c3f886580cb16fa53a9479cdabafa7b7fe7 SHA256 4e08eaeda27d9d502b1f303f8fd182d3ce3d0da2150cc3d0bcea0de12f86bfa3
+DIST php-patchset-5.4.0_pre201105151030-r0.tar.bz2 9258 RMD160 b80665c2bf43dcb1128dff47c9b8f09009967068 SHA1 6a22c58fdd757a5496e566d015e47ca236e915b1 SHA256 d15d6073ed3005db8fbd7726d96fc00dd3fc1c21e1b7f899efa27c5397bda654
+DIST php-trunk-201105151030.tar.bz2 11158835 RMD160 67e4840b643a717f4d1c3d957b1818436f9837b5 SHA1 8b1b8281248c218ac0c29a7b8ae6733ef27397da SHA256 3fae7b54a8ffb663efc8ebdf47b8409b7a8c364d06535325f87dd9f9ca300f77
 DIST suhosin-patch-5.2.14-0.9.7.patch.gz 23057 RMD160 bc7790cd36dc4101322684b754db3ca2d4385ba6 SHA1 0a12d3589f9c26dc7d6b6452ef7987b2e6527a30 SHA256 bd03ade44673f7e6fa116d746350f16c60be7170d6c41816a2d51faaeb5a31ae
 DIST suhosin-patch-5.2.16-0.9.7.patch.gz 23069 RMD160 b28b70faf136b3e04c5b483da0f4c2279378f43a SHA1 fec10b2b81582d06bb0d0a96ea55c525afc8ab29 SHA256 aae115a318d80b3f32cedf876e7a8e4b932febb1b0c743c0b398003ebe122f91
 DIST suhosin-patch-5.3.3-0.9.10.patch.gz 41298 RMD160 8dcd8b51ea0357b6cc51e70e495e18f341c62f7c SHA1 76675242cfdeff763767900213346af622002490 SHA256 f48489ff7d3fd3fc30429f7349f181c84caf2e03e672eb2d2b55b46adf6f602c
@@ -56,17 +57,17 @@ EBUILD php-5.3.5-r1.ebuild 9762 RMD160 f39618b8a72db38f6500ba49afe8db963817b135
 EBUILD php-5.3.5.ebuild 9712 RMD160 ea2e619e8ed6e055ea3fbc131008657c39c2eab7 SHA1 3450722d844e367dd017e72e64d23e365eba9cf8 SHA256 58a8483120fb62019d2bfbf537db60ea83ab9ed862cedf6b7c516518afe7d46e
 EBUILD php-5.3.6-r1.ebuild 9538 RMD160 e7365ce71f94f06b5732d497b9fc94b93f12945d SHA1 ccdd5c0fdcd169b4819d924ff0f5f5a6caaf934b SHA256 97ffbe697c6d607b748b89044baed1b4a91fc7a09790d0abfce6acc47ca45703
 EBUILD php-5.3.6.ebuild 9794 RMD160 9be2d19b4cfc93aa0f6920958f7868198b254427 SHA1 ab4f7dfd77ce61441901e4ae6834c6563a1bf96c SHA256 f97847b13e3f5a09f686006401f816ba823850541da4d2ab58a9c7289651809e
-EBUILD php-5.4.0_pre201104301030.ebuild 9587 RMD160 1ff192a7a6e2e4a33609d0dce4a7ca759a2ceff6 SHA1 f5842822da14b0a722337f783af8a632125ae34b SHA256 ed9c00e6c882e7b7bdd37daaf50798b036934a533dadfd4511007867eae6b32f
-MISC ChangeLog 82639 RMD160 5e1328d994c0f46e546a7e21928b58830da83f06 SHA1 7ba391b01146f095fc4540eb499c74040b1c4212 SHA256 9be42759eea319f8517af4b8b4656f7443bb39ec6d84f267289e9edde3530f55
+EBUILD php-5.4.0_pre201105151030.ebuild 9523 RMD160 53106de73323ebee6e808ac07656cd638b22103c SHA1 dc53283bc577b5c3a07e9bce11d28947a23eafbd SHA256 eeb735bb6064859442ac25018d06724949c75d8c01526bb55e026f1fd009d3dd
+MISC ChangeLog 83082 RMD160 729689cc38b22f5d64d8588d8efdbb6efc8dc4cb SHA1 749d227fa9a937a026e159502318459dd6997dc5 SHA256 d9f595938b9d88d07ea2302b7cb942f52e7b76bb02d950829a2855ac08de997f
 MISC metadata.xml 2212 RMD160 e26ea7f6831acb23854f018fe6d00c213bf62e5a SHA1 25500969d6ef6c1918a8e6abbb04e0553806dee2 SHA256 6fdbba214ce15fae4a1e2eb086586008377fff85e67e38b1e2232a9745432674
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.16 (GNU/Linux)
 
-iQEcBAEBAgAGBQJNvb90AAoJEGurSuXEqSv18KYH/1FaAdqG/GEV0cHd1gJUexST
-mHEZ3HLjgpGVQWkqLw4aWsmF2ZyUZ+A4DUg/xb47J8STN/OTmHDgjVAep+dHKe95
-NpeR2NuKU/HQMybM4EufmuSFk5DvowXCaU5DJaiDeOnEJDHc3wdXDANDyKSvDEur
-RSg4lLTMoQYF70b7l/ck05RlLqHEwbW91qWLAgykVcRHrOdg4AZoTew59dhnG9Si
-oa0PBX10F+iHNPx1uUGCWWDydCcpK7qO3POKyhubbYmJartFTqRO55waaKYVav/h
-bmKOBpb0uWmynvxBcuqHBAD2UqVfTEd3qxulX9pgsrmcupqCfQI7c08+dTxl5a4=
-=MJuc
+iQEcBAEBAgAGBQJN0CbPAAoJEGurSuXEqSv1v90IAKZW91mPFNkmE54mg5BfCc3o
+ZcjVERSTjzkszDVj1GM8XDrKBqVHmIkJ9x22Llq1WIBB7eYmTOUzAH6vvtCC26sM
+y1l6yGUaDnDJax+kOc079Dx3G9BoEzDHG6wERG0MrDyyhq7i1Elfsl/mkScgVC/R
+7M8IGa2BeaDzUV37ezdAOl0jorNfj9kwlcpflsQOIoIp5L381X2K7DKfMWGnJNCy
+0KvsMwXyKlMmH8tM1XQiaWbErXT6bPye3xElKNZUXjYvXcE8x5y+6fqFhdwRYwD2
+tC2El/3FtKceEAmirX271Q+M0ETiVzXOM3Iqtqs62l/th4yWaCrFQQLIYvKrI28=
+=OYXt
 -----END PGP SIGNATURE-----
diff --git a/dev-lang/php/files/eblits/src_configure-snapshots.eblit b/dev-lang/php/files/eblits/src_configure-snapshots.eblit
new file mode 100644
index 000000000000..d8682e80a520
--- /dev/null
+++ b/dev-lang/php/files/eblits/src_configure-snapshots.eblit
@@ -0,0 +1,268 @@
+# Copyright 1999-2011 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-snapshots.eblit,v 1.1 2011/05/15 19:17:23 olemarkus Exp $
+
+eblit-php-src_configure() {
+	PHP_DESTDIR="/usr/$(get_libdir)/php${SLOT}"
+
+	# This is a global variable and should be in caps. It isn't because the
+	# phpconfutils eclass relies on exactly this name...
+	# for --with-libdir see bug #327025
+	my_conf="
+		--prefix="${PHP_DESTDIR}"
+		--mandir="${PHP_DESTDIR}"/man
+		--infodir="${PHP_DESTDIR}"/info
+		--libdir="${PHP_DESTDIR}"/lib
+		--with-libdir=$(get_libdir)
+		--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_with    "mhash"        "mhash"            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"      "sqlite"           1 "/usr"
+	phpconfutils_extension_with    "sybase-ct"    "sybase-ct"        1 "/usr"
+	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
+
+	# Interbase/firebird support
+	if use interbase ; then
+		phpconfutils_extension_with "interbase"	"interbase"	0 "/opt"
+	fi
+
+	if use firebird ; then
+		phpconfutils_extension_with	"interbase"	"firebird"	0 "/usr"
+	fi
+
+	# 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
+		# Needed to run conftest for IBM DB2
+		[[ -n ${DB2_HOME} ]] && export LD_LIBRARY_PATH="${DB2_HOME}/`get_libdir`"
+		phpconfutils_extension_with "ibm-db2" "db2"   1 "${DB2_HOME}"
+		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
+
+	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
+
+	mkdir -p "${WORKDIR}/sapis-build"
+	for one_sapi in $SAPIS ; do
+		use "${one_sapi}" || continue
+		php_set_ini_dir "${one_sapi}"
+
+		cp -r "${S}" "${WORKDIR}/sapis-build/${one_sapi}"
+		cd "${WORKDIR}/sapis-build/${one_sapi}"
+
+		sapi_conf="${my_conf} --with-config-file-path=${PHP_INI_DIR}
+			--with-config-file-scan-dir=${PHP_EXT_INI_DIR_ACTIVE}"
+
+		for sapi in $SAPIS ; do
+			case "$sapi" in
+				cli|cgi|embed|fpm)
+					if [[ "${one_sapi}" == "${sapi}" ]] ; then
+						sapi_conf="${sapi_conf} --enable-${sapi}"
+					else
+						sapi_conf="${sapi_conf} --disable-${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}
+	done
+}
diff --git a/dev-lang/php/files/eblits/src_prepare-snapshots.eblit b/dev-lang/php/files/eblits/src_prepare-snapshots.eblit
index df238070d916..46d4393fe684 100644
--- a/dev-lang/php/files/eblits/src_prepare-snapshots.eblit
+++ b/dev-lang/php/files/eblits/src_prepare-snapshots.eblit
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 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-snapshots.eblit,v 1.1 2011/05/01 20:15:52 olemarkus Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/php/files/eblits/src_prepare-snapshots.eblit,v 1.2 2011/05/15 19:17:23 olemarkus Exp $
 
 eblit-php-src_prepare() {
 	# USE=sharedmem (session/mod_mm to be exact) tries to mmap() this path
@@ -32,7 +32,7 @@ eblit-php-src_prepare() {
 	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
+	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
@@ -53,21 +53,8 @@ eblit-php-src_prepare() {
 
 	#Add user patches #357637
 	epatch_user
-
-	# 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
+	
+	#force rebuilding aclocal.m4
 	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
+	eautoreconf
 }
-
-
diff --git a/dev-lang/php/php-5.4.0_pre201104301030.ebuild b/dev-lang/php/php-5.4.0_pre201105151030.ebuild
index cc44f1f93021..1a496e74269a 100644
--- a/dev-lang/php/php-5.4.0_pre201104301030.ebuild
+++ b/dev-lang/php/php-5.4.0_pre201105151030.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/php/php-5.4.0_pre201104301030.ebuild,v 1.1 2011/05/01 20:15:53 olemarkus Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/php/php-5.4.0_pre201105151030.ebuild,v 1.1 2011/05/15 19:17:23 olemarkus Exp $
 
 EAPI=4
 
@@ -105,7 +105,7 @@ IUSE="${IUSE} adabas bcmath berkdb birdstep bzip2 calendar cdb cjk
 	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
+	+simplexml snmp soap sockets solid spell sqlite ssl
 	sybase-ct sysvipc tidy +tokenizer truetype unicode wddx
 	xml xmlreader xmlwriter xmlrpc xpm xsl zip zlib"
 
@@ -172,8 +172,7 @@ DEPEND="!dev-lang/php:5
 	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.7.4 ) )
-	sqlite3? ( >=dev-db/sqlite-3.7.4 )
+	sqlite? ( >=dev-db/sqlite-3.7.4 )
 	ssl? ( >=dev-libs/openssl-0.9.7 )
 	sybase-ct? ( dev-db/freetds )
 	tidy? ( app-text/htmltidy )
@@ -347,7 +346,7 @@ eblit-pkg() {
 eblit-pkg pkg_setup v2
 
 src_prepare() { eblit-run src_prepare snapshots ; }
-src_configure() { eblit-run src_configure v2 ; }
+src_configure() { eblit-run src_configure snapshots ; }
 src_compile() { eblit-run src_compile v1 ; }
 src_install() { eblit-run src_install v2 ; }
 src_test() { eblit-run src_test v1 ; }