Version bump

Package-Manager: portage-2.1.12.2/cvs/Linux x86_64
Manifest-Sign-Key: 0xC4A92BF5

3 files changed, 806 insertions, 10 deletions

diff --git a/dev-lang/php/ChangeLog b/dev-lang/php/ChangeLog
index b0644fd60904..ed7ae8b2ce73 100644
--- a/dev-lang/php/ChangeLog
+++ b/dev-lang/php/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-lang/php
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/php/ChangeLog,v 1.773 2013/10/18 11:10:49 olemarkus Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/php/ChangeLog,v 1.774 2013/10/29 07:21:39 olemarkus Exp $
+
+*php-5.4.21 (29 Oct 2013)
+
+  29 Oct 2013; Ole Markus With <olemarkus@gentoo.org> +php-5.4.21.ebuild:
+  Version bump
 
 *php-5.5.5 (18 Oct 2013)
 
diff --git a/dev-lang/php/Manifest b/dev-lang/php/Manifest
index f8b0bfe565d6..16a334581c14 100644
--- a/dev-lang/php/Manifest
+++ b/dev-lang/php/Manifest
@@ -20,6 +20,7 @@ DIST php-5.4.17.tar.bz2 11697434 SHA256 dc49935387a5d1f6ac798a3bb4902ca5020f3aa7
 DIST php-5.4.18.tar.bz2 11691676 SHA256 1d9409be15d651593456904140503367146923c347db4f471cde599192ff91d9 SHA512 e0376ca64e51b10c47eda4666edc68079a247d2a0b2e7fc4177ad7b461e5fa851b230ea52868e912417166a2db17e5b8ca86027f583d6ece6800d26a9ab10458 WHIRLPOOL 7644af6dd2cc441f5ebf4180ae2c969729663b13524b9282ec89c01ef349ef250175ba4ab9c1411b7955ed3113ee483d76424c45e85de3b6c1bfc963c2ab3f4b
 DIST php-5.4.19.tar.bz2 11692563 SHA256 7a565360e64c5be5102ef948e7c732778a40850e709270e64be7a3a3207c029b SHA512 290f5e7d1e2d5a40b6154290d2203d4d14fcf8365ae3d85c206802e7f3d4ffd692b550ac525e9c5ca0bf26dd5d7a6224b16175817c7bd98cbdef79aac4975ad0 WHIRLPOOL cef167a3d45f85f6f722eaee5202cd58e11807df22e9f8836a0ed2ca0179bb44b76f41f946e02710d4381f1cab27ce6e573c6e8d1809e11b4b2e8b1da7d6f11d
 DIST php-5.4.20.tar.bz2 11700446 SHA256 cd0e42cf8b01b2fe23d5acbb30e04d64e8df21b0b4093e28aef36743646759e1 SHA512 952cbeaf60813104be2ee03aaa4a402b2a52f3ea3eb706532318afc6c4f7ce642ab92e30108167ca08124da5d26d8181ecd395bdff8d75fdaaf6e9293f06380f WHIRLPOOL a292c5ef4e4a693c89b252b735d37db41c971a6fa02b3b090ed82aafd6c4e59561010ac26e630eb75243a725c28d299da3b278b7dd57bf6c7045d749d5b1ae28
+DIST php-5.4.21.tar.bz2 11703043 SHA256 ea8f7cee1adcc6f3c850f17334563c4a229f8792c18ca215517253b0dec656ec SHA512 7fcc8d3d4369f447bc4ec041ed5b15620d4f99537b636ee9d9486e9d1ee072839e03a54e445494d6a74362c72247d56037ea62d7577e0cf1d48c91581e7ebeac WHIRLPOOL 574541bc5a3706bf3fa84acb3ae06d722e8eb770b5a401d0e5d5fae78260719003cc68ab0acc18a92c0c1922979dd147a4cd652809296018912061c58041ff41
 DIST php-5.5.2.tar.bz2 12292281 SHA256 e72aaf1fa96eac0bff127bfc74c174d1de50cd3f66d7e0e1ee919674ab463bb7 SHA512 87b0f0dd07b4efdc0c7dc6069081f7f02344d29372cc38bf0b1d1d9c1b73f56f62ee0b80f98cef37e2e13d41b30be256f1a8bff9a4f0fd7eb855d74e1376f261 WHIRLPOOL b88c03ec49c9269804e1f5aa5b5f499669f409c3fd76868d315c93c0acf4dd24d928836dd46cb948ce61c6553cc599d4bd377715d8534a6c71395e6f59e5878a
 DIST php-5.5.3.tar.bz2 12030241 SHA256 93080dd06dff7c4e54254f4bd6910e7cc4049d6226e6ac4c9bc52c16ebd5939a SHA512 2e2785775dde5987aca24c9f211048d583d42b49b67ac634a3ff2dc862ce1b9756f76bdf5c446d971d44a3926be024316ebe272806c665726302dceeb5e8c8bf WHIRLPOOL 6da8a4a9a23bc92d114bfce26c16642edbd6543b70b9bf8076be99dd53f25b9c8beee093a88b9d1cc17140ec97bc73a8634e23af6d7a93ac22c18c1cb0a2cef5
 DIST php-5.5.4.tar.bz2 12047184 SHA256 49f87e8cf0bbec53a6e7f1c8ab132fcec37bb09990404c7c959f81dfb1637439 SHA512 69c4c6279c0a74da7d500ffc14f5dd60e13600b69957f0d8b8ec6e94ffb65510c0a970eaa574dfc1fa89d4e9179543313d47d1a67efa100be0b1570b653237ba WHIRLPOOL b185bc615f78aa736519e6d019bc4d4df600ffdb283f25b47a74d497cc556cc7e312f53eda596a74fec4c7f10f54e6b20d56e0ed189bb36835f471c2051633d4
@@ -31,24 +32,25 @@ EBUILD php-5.4.17.ebuild 22212 SHA256 38fda892fae11f0eea6aa5eec215fd517b39c6780d
 EBUILD php-5.4.18.ebuild 22222 SHA256 0e6d0200a53fc317e504cd0737737b8a3978b91c27958138f5ffd58ecd6d8fce SHA512 55596e447349614d2294ca3e0e1df34be4d73122dbb07f5f6c4746214c7d8f7587a0c285d37dd1cd970238b4505a47ba0ef6eed81e7daef03eec02f49c6067bb WHIRLPOOL 323a508dd81ae264afdb4054cc7242d27b51b9fb3d866d71e6e64b5b158eb02da9ba00d3f562bff0296e7be2da4b267912d481f4600f2cf28d57b155e60491d3
 EBUILD php-5.4.19.ebuild 22222 SHA256 f5e9f42e4fc2ff39cea6873e160086851f18699b279ee90f23efbf1c8bc2046b SHA512 8661d09f0969f00a96dd2ea136831f10b167c32cd1716603bd22139f8354b8d023f2404dc3d2258ff08f84f06d4b1cba5e420201436ae377ce14f0488c67d790 WHIRLPOOL e78c6ac2d771b177994d3ae6919299037465bc4eef1525ca4c2e73833987eecfe1490e335170adf8f706e7324caf550a9283ff0eda4495ebd49dd1ecb9f29914
 EBUILD php-5.4.20.ebuild 22006 SHA256 629dc560ed569c16f134578b897a436c2841cc6c35c67af720306247ecf1d43b SHA512 be4a8d661de561176f69578f40450e4ce635351df9ec1d21072c053f5596f4e3ebe57876f9b409f7f975480860d153f83541fa65652076a79fa4647bd42b97fc WHIRLPOOL 75f90d13cef8681784dea83404ae7c5fcaae0d7838cb31575ccc4fa60cdfe40a58cb1fc93e7775aedba2a0cf7d6bcb7d347a4408378f8e67870f52c9a54cdbf4
+EBUILD php-5.4.21.ebuild 22020 SHA256 dec6f2a85d098b8696cf1d7ac55f52bf5b0b0114a73a94da726ed3ed59052149 SHA512 9fe7b9691556ac43d842757ae983f933c61ee9958ea120a73fe9bbf8c2d8199d7d064de1fb0995008c3effa6862a23ee6e40504456cea67e0d1a9fb38da2ddf4 WHIRLPOOL 95f7eb19baa96714d39b8a9d0babdc90eb2bb5f216f1f5a500a52358ba59f74fd40735d5e1a8d71834f3009dd0f3c332290f003910c94222287413b792de5fc8
 EBUILD php-5.5.2.ebuild 21996 SHA256 2876ab1cc77491871f23b4ffdde60e235026939bd64142e0752209639ff2a7c4 SHA512 3de61de19ad8f3266dadd18ae5d0739aa311621330ed5eb1e7c1c60a10a059de9e2322c1df5242517bd59f7958236c52e08787c7383d9190874008c0c18a4d07 WHIRLPOOL d34329ad2e926c6b10db7c97d66fe3a2ba22d8be923d41fb16539253aad0d337915985af3ab95c88e20e33297df0bfb9f6e73701d417bbc805adf22ae62ec856
 EBUILD php-5.5.3-r1.ebuild 22170 SHA256 b5d3435393a937d96e1602d83810ec872e60fb2f466737bc382f6a4f1337ff18 SHA512 8c8ab1db09f06a57c5ff1ef14876f3c6c941efe83ae9b75a4d9a76dc459d97aadfdc8f25ea1a37bc24d4475e890d23b511bce25522fb5e4dc181ce4533abe8e2 WHIRLPOOL 4e2ff64ffe7666406af8b11e258292ee54b57542308a37a5c8d88717e28d07d99c477d29eb1f006185274218dda60c69d20a5639ea6bd5987932bb086f8401ad
 EBUILD php-5.5.3.ebuild 22005 SHA256 d76c2c9f26e908dc3d9b4056a277677a71f99e485b4b53b748e0463f7fd8ebb5 SHA512 7d6f94418332e00a6d4235e8848bf3d794286d57943eafa50a8b1fa3b01d31e7f839ad48cf53f394bf6b39dc0fa380758e7b28394f685c9aaba8f0d8d587fea8 WHIRLPOOL 28ae666cff81e2fc794c09a0658c51e6957bf774ed9676991b356b160ff28ce405c9e6f5ad0835a18f498bb427c77b2c12c9c1aeeb34678918d66481438818fa
 EBUILD php-5.5.4.ebuild 21847 SHA256 0779368479aec975aad71d98ab3bc1a53751de9e6fcd24b56bb414e718e3a2ea SHA512 bbe997c82ae9922ee562af4e43e0d86c4892478414d7f34fdaa2a490566ee69f3b4e1d969f819bd0692f28315c69187255e81fa8cb6d8c4c386c47c6f7a247ac WHIRLPOOL c3106adb2ab7d72ffcc15e3eacf5b4403d054c36fd935996c1fb57cad80f2eab88ccdb7583eeef96e8c1cea27dda2e829bb8103985c1db980d2fcc28dbf19451
 EBUILD php-5.5.5.ebuild 21858 SHA256 2ca06c5767fcd1031d291a9764813b894aaf58ab8f85f408303e4c977acf13ff SHA512 ec096ea07a64f26932ce090ccc0e07cbd04c3f3006e1d2ac40b58e23497c10218868d7cb1d6029fa650c1b7ceee7624f21883fd21f50dc4b158cb0b57b3d82e9 WHIRLPOOL 6b4922a0b969498b3e9c5e0ed9f4fd830a4a2b1c85bd15715ae335b7d8353644d386334d783b94891c5ea916ba57b9b508990597947c28995ba7dc22df8ceaeb
-MISC ChangeLog 16877 SHA256 e881aa6630a9516dd31a2b33ab9eb02cc28c1737850155a4d6b1a03b8006493b SHA512 d5dbaaf92b8a4559eaf8f21d8ec34e77e35c7bb8ad17024eb90a67c3c3928bceb4aeb54e1e7ed1f3cd3bcc341e4be5b0997eedbc1f943b1a1989b13b0151e56f WHIRLPOOL 2d93f0adbe880219a1d62740446c19fae186b6caddde4d7eee28e10cd607858b0dcb4f109be7ec95da97959edb9edc1729f4a45144fb7fcfd9845d643f0104d4
+MISC ChangeLog 16994 SHA256 3e807bbc1295531202a2984070a8d8f3b2473ee55619451667c94165c399ef7f SHA512 f3a869eb8f2a22cde65283d04c930f1665bf14fdc9861f1e2f139a83ed12eda354c88c5d8fd8f1263917ba5c930136b47b33294613c906b2962420676df20613 WHIRLPOOL d34ecf3b0a7153ee6489e61d99255eafc96818203ba41090c2f3dc7d4a2efd04f7451639e5dbfac7b01d31583d3f8d697f61930cfe11d5dd805ccf56107fe460
 MISC ChangeLog-2012 108488 SHA256 c2eea36502d34eadc7995d546f78aaa553ba07beeb51ea738715ad7f2e51b08d SHA512 eb25224993eff1ea42ea133302991a3ffad3adda0bc524cfa4fae49574230a8e65b35b08750d780c11cc9c152435fadbf2c416241fac28dcbb025e060e96cd7a WHIRLPOOL 82f627853fa961f3f3707fb2c8757acbc8fc644e89121d78703b40ff0f668aa7d0f1aa26c77f8f503e4f6da22ed865e4cb7c02d5d112c89488b12aa6b0d80568
 MISC metadata.xml 1547 SHA256 2ce287830b8238e330c0585ef3023f86a9e5d46204619c92588244c5d7fa2f77 SHA512 a3a1c2dfddb4d0d92eafa33d74dc0bb90f1a9976e1d2fe0d3717a0d94149d3023dfdc9e68d42d440873561b2e6c34969ae86cec24ac0f0bddcf9ba14103ba450 WHIRLPOOL d9d877b3ae1b304ff89f7b0dd3a1f23d78062280ee935eaaa02c44e8e1dc2fd78bf2c6336cfebb2d9e8dddc03414a7744114ecebee6e364e962c49ff5e2bdf57
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.20 (GNU/Linux)
 
-iQF8BAEBCABmBQJSYRc9XxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+iQF8BAEBCABmBQJSb2IIXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
 ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQyOEZEMjNGNzBENkE5N0Q2Q0ZFMkFDNDA2
-QkFCNEFFNUM0QTkyQkY1AAoJEGurSuXEqSv1Tp4H/A2B1uSLDuNTqW3q1mcfttOQ
-ncH5LmUT1FcI0DfOH8gmA+doOIf+fHnbubmslSg8mrObsICnQIooNTzR+C25Gwp4
-kp5Z4b8C5gP9aFMe/SuvfGUpUnS6uqLKdbmCGShKwFev5jdxROuDuyPzKuCSer/c
-glCTR/e/QkpFULoGcUCCZ7KctcurQ29JeY9ckHug9oJT2dcsj+EYS0/r7AT3UDV/
-V31zecmV9wVIZYwNLreiNkv59mswuaiEYomnb3RwReb2gAYZSNjOZTlUoercLRtS
-WpMeSEkXQw7BEbq0kdbWjS0xEtPkMVK+QtbHDamy7mOd/sJW8sZMbJiFaJbp9Uc=
-=kd/g
+QkFCNEFFNUM0QTkyQkY1AAoJEGurSuXEqSv1b1sIALalK4Y4YCwrkwxIb0zTAkhZ
+WKQQ5sBDbEO3wC9rp350csD6jmScmtOTf/9X6f9qMJnbxs7m1u0/rW1vBQMFc0Mg
+K1hz5yh9n4jFJ4MPMhrBhwLzAHPmX8n3hHtfBFiwhv7mlydF3UTPFJ2Ts5b2/7HE
+ej1ODscJQVhZLNiWy9NonsII4Dj0Ydz3LNvdnou7YrGizy8DMEo5+uU8Ax9003Rg
+aQkFsG5H3OT6R4nF7RKkeK53+dA57zt8U/e9I+camHNdPlpEkTGWp/EW95u538mu
+LfbU9wEZY+Hhme08PmKoVHuw6WqrxG9+eM0MC8oNfe7z0jH4Cj3mqkfgFCn1gUg=
+=cGGV
 -----END PGP SIGNATURE-----
diff --git a/dev-lang/php/php-5.4.21.ebuild b/dev-lang/php/php-5.4.21.ebuild
new file mode 100644
index 000000000000..5660edf81b30
--- /dev/null
+++ b/dev-lang/php/php-5.4.21.ebuild
@@ -0,0 +1,789 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/php/php-5.4.21.ebuild,v 1.1 2013/10/29 07:21:39 olemarkus Exp $
+
+EAPI=5
+
+inherit eutils autotools flag-o-matic versionator depend.apache apache-module db-use libtool
+
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-freebsd ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+
+function php_get_uri ()
+{
+	case "${1}" in
+		"php-pre")
+			echo "http://downloads.php.net/stas/${2}"
+		;;
+		"php")
+			echo "http://www.php.net/distributions/${2}"
+		;;
+		"olemarkus")
+			echo "http://dev.gentoo.org/~olemarkus/php/${2}"
+		;;
+		"gentoo")
+			echo "mirror://gentoo/${2}"
+		;;
+		*)
+			die "unhandled case in php_get_uri"
+		;;
+	esac
+}
+
+PHP_MV="$(get_major_version)"
+SLOT="$(get_version_component_range 1-2)"
+
+# alias, so we can handle different types of releases (finals, rcs, alphas,
+# betas, ...) w/o changing the whole ebuild
+PHP_PV="${PV/_rc/RC}"
+PHP_PV="${PHP_PV/_alpha/alpha}"
+PHP_PV="${PHP_PV/_beta/beta}"
+PHP_RELEASE="php"
+[[ ${PV} == ${PV/_alpha/} ]] || PHP_RELEASE="php-pre"
+[[ ${PV} == ${PV/_beta/} ]] || PHP_RELEASE="php-pre"
+[[ ${PV} == ${PV/_rc/} ]] || PHP_RELEASE="php-pre"
+PHP_P="${PN}-${PHP_PV}"
+
+PHP_PATCHSET_LOC="olemarkus"
+
+PHP_SRC_URI="$(php_get_uri "${PHP_RELEASE}" "${PHP_P}.tar.bz2")"
+
+PHP_PATCHSET="2"
+PHP_PATCHSET_URI="
+	$(php_get_uri "${PHP_PATCHSET_LOC}" "php-patchset-${SLOT}-r${PHP_PATCHSET}.tar.bz2")"
+
+PHP_FPM_INIT_VER="4"
+PHP_FPM_CONF_VER="1"
+
+SRC_URI="
+	${PHP_SRC_URI}
+	${PHP_PATCHSET_URI}"
+
+DESCRIPTION="The PHP language runtime engine: CLI, CGI, FPM/FastCGI, Apache2 and embed SAPIs."
+HOMEPAGE="http://php.net/"
+LICENSE="PHP-3"
+
+S="${WORKDIR}/${PHP_P}"
+
+# We can build the following SAPIs in the given order
+SAPIS="embed cli cgi fpm apache2"
+
+# SAPIs and SAPI-specific USE flags (cli SAPI is default on):
+IUSE="${IUSE}
+	${SAPIS/cli/+cli}
+	threads"
+
+IUSE="${IUSE} bcmath berkdb bzip2 calendar cdb cjk
+	crypt +ctype curl curlwrappers debug
+	enchant exif frontbase +fileinfo +filter firebird
+	flatfile ftp gd gdbm gmp +hash +iconv imap inifile
+	intl iodbc ipv6 +json kerberos ldap ldap-sasl libedit mhash
+	mssql mysql mysqlnd mysqli nls
+	oci8-instant-client odbc pcntl pdo +phar +posix postgres qdbm
+	readline recode selinux +session sharedmem
+	+simplexml snmp soap sockets spell sqlite ssl
+	sybase-ct sysvipc tidy +tokenizer truetype unicode wddx
+	+xml xmlreader xmlwriter xmlrpc xpm xslt zip zlib"
+
+DEPEND="
+	>=app-admin/eselect-php-0.7.0[apache2?,fpm?]
+	>=dev-libs/libpcre-8.32[unicode]
+	apache2? ( www-servers/apache[threads=] )
+	berkdb? ( =sys-libs/db-4* )
+	bzip2? ( app-arch/bzip2 )
+	cdb? ( || ( dev-db/cdb dev-db/tinycdb ) )
+	cjk? ( !gd? (
+		virtual/jpeg:0
+		media-libs/libpng:0=
+		sys-libs/zlib
+	) )
+	crypt? ( >=dev-libs/libmcrypt-2.4 )
+	curl? ( >=net-misc/curl-7.10.5 )
+	enchant? ( app-text/enchant )
+	exif? ( !gd? (
+		virtual/jpeg:0
+		media-libs/libpng:0=
+		sys-libs/zlib
+	) )
+	firebird? ( dev-db/firebird )
+	gd? ( virtual/jpeg:0 media-libs/libpng:0= sys-libs/zlib )
+	gdbm? ( >=sys-libs/gdbm-1.8.0 )
+	gmp? ( >=dev-libs/gmp-4.1.2 )
+	iconv? ( virtual/libiconv )
+	imap? ( virtual/imap-c-client[ssl=] )
+	intl? ( dev-libs/icu:= )
+	iodbc? ( dev-db/libiodbc )
+	kerberos? ( virtual/krb5 )
+	ldap? ( >=net-nds/openldap-1.2.11 )
+	ldap-sasl? ( 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 )
+	qdbm? ( dev-db/qdbm )
+	readline? ( sys-libs/readline )
+	recode? ( app-text/recode )
+	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 )
+	spell? ( >=app-text/aspell-0.50 )
+	sqlite? ( >=dev-db/sqlite-3.7.6.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? (
+			virtual/jpeg:0 media-libs/libpng:0= 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
+		virtual/jpeg:0
+		media-libs/libpng:0= sys-libs/zlib
+	)
+	xslt? ( dev-libs/libxslt >=dev-libs/libxml2-2.6.8 )
+	zip? ( sys-libs/zlib )
+	zlib? ( sys-libs/zlib )
+	virtual/mta
+"
+
+php="=${CATEGORY}/${PF}"
+
+REQUIRED_USE="
+	truetype? ( gd )
+	cjk? ( gd )
+	exif? ( gd )
+
+	xpm? ( gd )
+	gd? ( zlib )
+	simplexml? ( xml )
+	soap? ( xml )
+	wddx? ( xml )
+	xmlrpc? ( || ( xml iconv ) )
+	xmlreader? ( xml )
+	xslt? ( xml )
+	ldap-sasl? ( ldap )
+	mhash? ( hash )
+	phar? ( hash )
+	mysqlnd? ( || (
+		mysql
+		mysqli
+		pdo
+	) )
+
+	qdbm? ( !gdbm )
+	readline? ( !libedit )
+	recode? ( !imap !mysql !mysqli )
+	sharedmem? ( !threads )
+
+	!cli? ( !cgi? ( !fpm? ( !apache2? ( !embed? ( cli ) ) ) ) )"
+
+RDEPEND="${DEPEND}"
+
+RDEPEND="${RDEPEND} fpm? ( selinux? ( sec-policy/selinux-phpfpm ) )"
+
+DEPEND="${DEPEND}
+	sys-devel/flex
+	>=sys-devel/m4-1.4.3
+	>=sys-devel/libtool-1.5.18"
+
+# Allow users to install production version if they want to
+
+case "${PHP_INI_VERSION}" in
+	production|development)
+		;;
+	*)
+		PHP_INI_VERSION="development"
+		;;
+esac
+
+PHP_INI_UPSTREAM="php.ini-${PHP_INI_VERSION}"
+PHP_INI_FILE="php.ini"
+
+want_apache
+
+pkg_setup() {
+	depend.apache_pkg_setup
+}
+
+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 /tmp for save_path, bug #282768
+	sed -e 's|^;session.save_path .*$|session.save_path = "'"${EPREFIX}"'/tmp"|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 = ".:'"${EPREFIX}"'/usr/share/php'${PHP_MV}':'"${EPREFIX}"'/usr/share/php"|' -i "${phpinisrc}"
+
+	if use_if_iuse opcache; then
+		elog "Adding opcache to ${phpinisrc}"
+		echo "zend_extension=${PHP_DESTDIR}/$(get_libdir)/opcache.so" >> ${phpinisrc}
+	fi
+
+	dodir "${PHP_INI_DIR#${EPREFIX}}"
+	insinto "${PHP_INI_DIR#${EPREFIX}}"
+	newins "${phpinisrc}" "${PHP_INI_FILE}"
+
+	elog "Installing php.ini for ${phpsapi} into ${PHP_INI_DIR#${EPREFIX}}"
+	elog
+
+	dodir "${PHP_EXT_INI_DIR#${EPREFIX}}"
+	dodir "${PHP_EXT_INI_DIR_ACTIVE#${EPREFIX}}"
+
+	# SAPI-specific handling
+
+	if [[ "${sapi}" == "fpm" ]] ; then
+		[[ -z ${PHP_FPM_CONF_VER} ]] && PHP_FPM_CONF_VER=0
+		einfo "Installing FPM CGI config file php-fpm.conf"
+		insinto "${PHP_INI_DIR#${EPREFIX}}"
+		newins "${FILESDIR}/php-fpm-r${PHP_FPM_CONF_VER}.conf" php-fpm.conf
+
+		# Remove bogus /etc/php-fpm.conf.default (bug 359906)
+		[[ -f "${ED}/etc/php-fpm.conf.default" ]] && rm "${ED}/etc/php-fpm.conf.default"
+	fi
+
+	# Install PHP ini files into /usr/share/php
+
+	dodoc php.ini-development
+	dodoc php.ini-production
+
+}
+
+php_set_ini_dir() {
+	PHP_INI_DIR="${EPREFIX}/etc/php/${1}-php${SLOT}"
+	PHP_EXT_INI_DIR="${PHP_INI_DIR}/ext"
+	PHP_EXT_INI_DIR_ACTIVE="${PHP_INI_DIR}/ext-active"
+}
+
+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
+
+	# Change PHP branding
+	# Get the alpha/beta/rc version
+	sed -re	"s|^(PHP_EXTRA_VERSION=\").*(\")|\1-pl${PR/r/}-gentoo\2|g" \
+		-i configure.in || die "Unable to change PHP branding"
+
+	# 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
+
+	#Add user patches #357637
+	epatch_user
+
+	#force rebuilding aclocal.m4
+	rm aclocal.m4
+	eautoreconf
+
+	if [[ ${CHOST} == *-darwin* ]] ; then
+		# http://bugs.php.net/bug.php?id=48795, bug #343481
+		sed -i -e '/BUILD_CGI="\\$(CC)/s/CC/CXX/' configure || die
+	fi
+}
+
+src_configure() {
+	addpredict /usr/share/snmp/mibs/.index
+	addpredict /var/lib/net-snmp/mib_indexes
+
+	PHP_DESTDIR="${EPREFIX}/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)"
+
+	#                             extension		  USE flag        shared
+	my_conf+="
+	$(use_enable bcmath bcmath )
+	$(use_with bzip2 bz2 "${EPREFIX}"/usr)
+	$(use_enable calendar calendar )
+	$(use_enable ctype ctype )
+	$(use_with curl curl "${EPREFIX}"/usr)
+	$(use_with curlwrappers curlwrappers "${EPREFIX}"/usr)
+	$(use_enable xml dom )
+	$(use_with enchant enchant "${EPREFIX}"/usr)
+	$(use_enable exif exif )
+	$(use_enable fileinfo fileinfo )
+	$(use_enable filter filter )
+	$(use_enable ftp ftp )
+	$(use_with nls gettext "${EPREFIX}"/usr)
+	$(use_with gmp gmp "${EPREFIX}"/usr)
+	$(use_enable hash hash )
+	$(use_with mhash mhash "${EPREFIX}"/usr)
+	$(use_with iconv iconv $(use elibc_glibc || echo "${EPREFIX}"/usr))
+	$(use_enable intl intl )
+	$(use_enable ipv6 ipv6 )
+	$(use_enable json json )
+	$(use_with kerberos kerberos "${EPREFIX}"/usr)
+	$(use_enable xml libxml )
+	$(use_with xml libxml-dir "${EPREFIX}"/usr)
+	$(use_enable unicode mbstring )
+	$(use_with crypt mcrypt "${EPREFIX}"/usr)
+	$(use_with mssql mssql "${EPREFIX}"/usr)
+	$(use_with unicode onig "${EPREFIX}"/usr)
+	$(use_with ssl openssl "${EPREFIX}"/usr)
+	$(use_with ssl openssl-dir "${EPREFIX}"/usr)
+	$(use_enable pcntl pcntl )
+	$(use_enable phar phar )
+	$(use_enable pdo pdo )
+	$(use_with postgres pgsql "${EPREFIX}"/usr)
+	$(use_enable posix posix )
+	$(use_with spell pspell "${EPREFIX}"/usr)
+	$(use_with recode recode "${EPREFIX}"/usr)
+	$(use_enable simplexml simplexml )
+	$(use_enable sharedmem shmop )
+	$(use_with snmp snmp "${EPREFIX}"/usr)
+	$(use_enable soap soap )
+	$(use_enable sockets sockets )
+	$(use_with sqlite sqlite3 "${EPREFIX}"/usr)
+	$(use_with sybase-ct sybase-ct "${EPREFIX}"/usr)
+	$(use_enable sysvipc sysvmsg )
+	$(use_enable sysvipc sysvsem )
+	$(use_enable sysvipc sysvshm )
+	$(use_with tidy tidy "${EPREFIX}"/usr)
+	$(use_enable tokenizer tokenizer )
+	$(use_enable wddx wddx )
+	$(use_enable xml xml )
+	$(use_enable xmlreader xmlreader )
+	$(use_enable xmlwriter xmlwriter )
+	$(use_with xmlrpc xmlrpc)
+	$(use_with xslt xsl "${EPREFIX}"/usr)
+	$(use_enable zip zip )
+	$(use_with zlib zlib "${EPREFIX}"/usr)
+	$(use_enable debug debug )"
+
+	# 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
+	my_conf+="
+	$(use_with cdb cdb)
+	$(use_with berkdb db4 ${EPREFIX}/usr)
+	$(use_enable flatfile flatfile )
+	$(use_with gdbm gdbm ${EPREFIX}/usr)
+	$(use_enable inifile inifile )
+	$(use_with qdbm qdbm ${EPREFIX}/usr)"
+
+	# Support for the GD graphics library
+	my_conf+="
+	$(use_with truetype freetype-dir ${EPREFIX}/usr)
+	$(use_with truetype t1lib ${EPREFIX}/usr)
+	$(use_enable cjk gd-jis-conv )
+	$(use_with gd jpeg-dir ${EPREFIX}/usr)
+	$(use_with gd png-dir ${EPREFIX}/usr)
+	$(use_with xpm xpm-dir ${EPREFIX}/usr)"
+	# enable gd last, so configure can pick up the previous settings
+	my_conf+="
+	$(use_with gd gd)"
+
+	# IMAP support
+	if use imap ; then
+		my_conf+="
+		$(use_with imap imap ${EPREFIX}/usr)
+		$(use_with ssl imap-ssl ${EPREFIX}/usr)"
+	fi
+
+	# Interbase/firebird support
+
+	if use firebird ; then
+		my_conf+="
+		$(use_with firebird interbase ${EPREFIX}/usr)"
+	fi
+
+	# LDAP support
+	if use ldap ; then
+		my_conf+="
+		$(use_with ldap ldap ${EPREFIX}/usr)
+		$(use_with ldap-sasl ldap-sasl ${EPREFIX}/usr)"
+	fi
+
+	# MySQL support
+	if use mysql ; then
+		if use mysqlnd ; then
+			my_conf+="
+			$(use_with mysql mysql mysqlnd)"
+		else
+			my_conf+="
+			$(use_with mysql mysql ${EPREFIX}/usr)"
+		fi
+		my_conf+="
+		$(use_with mysql mysql-sock ${EPREFIX}/var/run/mysqld/mysqld.sock)"
+	fi
+
+	# MySQLi support
+	if use mysqlnd ; then
+		my_conf+="
+		$(use_with mysqli mysqli mysqlnd)"
+	else
+		my_conf+="
+		$(use_with mysqli mysqli ${EPREFIX}/usr/bin/mysql_config)"
+	fi
+
+	# ODBC support
+	if use odbc ; then
+		my_conf+="
+		$(use_with odbc unixODBC ${EPREFIX}/usr)"
+	fi
+
+	if use iodbc ; then
+		my_conf+="
+		$(use_with iodbc iodbc ${EPREFIX}/usr)"
+	fi
+
+	# Oracle support
+	if use oci8-instant-client ; then
+		my_conf+="
+		$(use_with oci8-instant-client oci8)"
+	fi
+
+	# PDO support
+	if use pdo ; then
+		my_conf+="
+		$(use_with mssql pdo-dblib )"
+		if use mysqlnd ; then
+			my_conf+="
+			$(use_with mysqlnd pdo-mysql mysqlnd)"
+		else
+			my_conf+="
+			$(use_with mysql pdo-mysql ${EPREFIX}/usr)"
+		fi
+		my_conf+="
+		$(use_with postgres pdo-pgsql )
+		$(use_with sqlite pdo-sqlite ${EPREFIX}/usr)
+		$(use_with odbc pdo-odbc unixODBC,${EPREFIX}/usr)"
+		if use oci8-instant-client ; then
+			my_conf+="
+			$(use_with oci8-instant-client pdo-oci)"
+		fi
+	fi
+
+	# readline/libedit support
+	my_conf+="
+	$(use_with readline readline ${EPREFIX}/usr)
+	$(use_with libedit libedit ${EPREFIX}/usr)"
+
+	# Session support
+	if use session ; then
+		my_conf+="
+		$(use_with sharedmem mm ${EPREFIX}/usr)"
+	else
+		my_conf+="
+		$(use_enable session session )"
+	fi
+
+	# Use pic for shared modules such as apache2's mod_php
+	my_conf="${my_conf} --with-pic"
+
+	# 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=${EPREFIX}/usr --with-pcre-dir=${EPREFIX}/usr"
+
+	# Catch CFLAGS problems
+	# Fixes bug #14067.
+	# Changed order to run it in reverse for bug #32022 and #12021.
+	replace-cpu-flags "k6*" "i586"
+
+	# 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=${EPREFIX}/usr/sbin/apxs"
+					else
+						sapi_conf="${sapi_conf} --without-apxs2"
+					fi
+					;;
+			esac
+		done
+
+		econf ${sapi_conf}
+	done
+}
+
+src_compile() {
+	# snmp seems to run during src_compile, too (bug #324739)
+	addpredict /usr/share/snmp/mibs/.index
+	addpredict /var/lib/net-snmp/mib_indexes
+
+	for sapi in ${SAPIS} ; do
+		if use "${sapi}"; then
+			cd "${WORKDIR}/sapis-build/$sapi" || "Failed to change dir to ${WORKDIR}/sapis-build/$1"
+			emake || die "emake failed"
+		fi
+	done
+}
+
+src_install() {
+	# see bug #324739 for what happens when we don't have that
+	addpredict /usr/share/snmp/mibs/.index
+
+	# grab the first SAPI that got built and install common files from there
+	local first_sapi=""
+	for sapi in $SAPIS ; do
+		if use $sapi ; then
+			first_sapi=$sapi
+			break
+		fi
+	done
+
+	# Makefile forgets to create this before trying to write to it...
+	dodir "${PHP_DESTDIR#${EPREFIX}}/bin"
+
+	# Install php environment (without any sapis)
+	cd "${WORKDIR}/sapis-build/$first_sapi"
+	emake INSTALL_ROOT="${D}" \
+		install-build install-headers install-programs \
+		|| die "emake install failed"
+
+	local extension_dir="$("${ED}/${PHP_DESTDIR#${EPREFIX}}/bin/php-config" --extension-dir)"
+
+	# 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}"
+			cd "${WORKDIR}/sapis-build/${sapi}"
+
+			if [[ "${sapi}" == "apache2" ]] ; then
+				# We're specifically not using emake install-sapi as libtool
+				# may cause unnecessary relink failures (see bug #351266)
+				insinto "${PHP_DESTDIR#${EPREFIX}}/apache2/"
+				newins ".libs/libphp5$(get_libname)" "libphp${PHP_MV}$(get_libname)"
+				keepdir "/usr/$(get_libdir)/apache2/modules"
+			else
+				# needed each time, php_install_ini would reset it
+				local dest="${PHP_DESTDIR#${EPREFIX}}"
+				into "${dest}"
+				case "$sapi" in
+					cli)
+						source="sapi/cli/php"
+						;;
+					cgi)
+						source="sapi/cgi/php-cgi"
+						;;
+					fpm)
+						source="sapi/fpm/php-fpm"
+						;;
+					embed)
+						source="libs/libphp${PHP_MV}$(get_libname)"
+						;;
+					*)
+						die "unhandled sapi in src_install"
+						;;
+				esac
+
+				if [[ "${source}" == *"$(get_libname)" ]]; then
+					dolib.so "${source}" || die "Unable to install ${sapi} sapi"
+				else
+					dobin "${source}" || die "Unable to install ${sapi} sapi"
+					local name="$(basename ${source})"
+					dosym "${dest}/bin/${name}" "/usr/bin/${name}${SLOT}"
+				fi
+			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
+
+	# Installing opcache module
+	if use_if_iuse opcache ; then
+		dolib.so "modules/opcache$(get_libname)" || die "Unable to install opcache module"
+	fi
+
+	# Install env.d files
+	newenvd "${FILESDIR}/20php5-envd" \
+		"20php${SLOT}"
+	sed -e "s|/lib/|/$(get_libdir)/|g" -i \
+		"${ED}/etc/env.d/20php${SLOT}"
+	sed -e "s|php5|php${SLOT}|g" -i \
+		"${ED}/etc/env.d/20php${SLOT}"
+
+	# set php-config variable correctly (bug #278439)
+	sed -e "s:^\(php_sapis=\)\".*\"$:\1\"${sapi_list}\":" -i \
+		"${ED}/usr/$(get_libdir)/php${SLOT}/bin/php-config"
+}
+
+src_test() {
+	echo ">>> Test phase [test]: ${CATEGORY}/${PF}"
+	PHP_BIN="${WORKDIR}/sapis-build/cli/sapi/cli/php"
+	if [[ ! -x "${PHP_BIN}" ]] ; then
+		ewarn "Test phase requires USE=cli, skipping"
+		return
+	else
+		export TEST_PHP_EXECUTABLE="${PHP_BIN}"
+	fi
+
+	if [[ -x "${WORKDIR}/sapis/cgi/php-cgi" ]] ; then
+		export TEST_PHP_CGI_EXECUTABLE="${WORKDIR}/sapis/cgi/php-cgi"
+	fi
+
+	REPORT_EXIT_STATUS=1 "${TEST_PHP_EXECUTABLE}" -n  -d "session.save_path=${T}" \
+		"${WORKDIR}/sapis-build/cli/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
+}
+
+pkg_postinst() {
+	# Output some general info to the user
+	if use apache2 ; then
+		APACHE2_MOD_DEFINE="PHP5"
+		APACHE2_MOD_CONF="70_mod_php5"
+		apache-module_pkg_postinst
+	fi
+
+	# Create the symlinks for php
+	for m in ${SAPIS}; do
+		[[ ${m} == 'embed' ]] && continue;
+		if use $m ; then
+			local ci=$(eselect php show $m)
+			if [[ -z $ci ]]; then
+				eselect php set $m php${SLOT}
+				einfo "Switched ${m} to use php:${SLOT}"
+				einfo
+			elif [[ $ci != "php${SLOT}" ]] ; then
+				elog "To switch $m to use php:${SLOT}, run"
+				elog "    eselect php set $m php${SLOT}"
+				elog
+			fi
+		fi
+	done
+
+	elog "Make sure that PHP_TARGETS in ${EPREFIX}/etc/make.conf includes php${SLOT/./-} in order"
+	elog "to compile extensions for the ${SLOT} ABI"
+	elog
+	if ! use readline && use cli ; then
+		ewarn "Note that in order to use php interactivly, you need to enable"
+		ewarn "the readline USE flag or php -a will hang"
+	fi
+	elog
+	elog "This ebuild installed a version of php.ini based on php.ini-${PHP_INI_VERSION} version."
+	elog "You can chose which version of php.ini to install by default by setting PHP_INI_VERSION to either"
+	elog "'production' or 'development' in ${EPREFIX}/etc/make.conf"
+	elog "Both versions of php.ini can be found in ${EPREFIX}/usr/share/doc/${PF}"
+
+	elog
+	elog "For more details on how minor version slotting works (PHP_TARGETS) please read the upgrade guide:"
+	elog "http://www.gentoo.org/proj/en/php/php-upgrading.xml"
+	elog
+}
+
+pkg_prerm() {
+	eselect php cleanup
+}