Version bump

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

diff --git a/dev-lang/php/ChangeLog b/dev-lang/php/ChangeLog
index 142323a6819b647ad75f464dc84afd1a15cf39e6..c21bdd9295676c942b2d5eede6c2507fd4e636bc 100644 (file)
--- a/dev-lang/php/ChangeLog
+++ b/dev-lang/php/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-lang/php
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/php/ChangeLog,v 1.535 2012/01/06 20:54:59 olemarkus Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/php/ChangeLog,v 1.536 2012/01/11 06:35:28 olemarkus Exp $
+
+*php-5.3.9 (11 Jan 2012)
+
+  11 Jan 2012; Ole Markus With <olemarkus@gentoo.org> +php-5.3.9.ebuild:
+  Version bump
 
 *php-5.4.0_rc5 (06 Jan 2012)
 

diff --git a/dev-lang/php/Manifest b/dev-lang/php/Manifest
index 5a03280cd08bb9dce4002418bc10384ac7253355..bbca18e5a563feb526044180e497e1a7f0183862 100644 (file)
--- a/dev-lang/php/Manifest
+++ b/dev-lang/php/Manifest
@@ -23,6 +23,7 @@ AUX php-fpm-r4.init 1157 RMD160 19b129c9254efcbba39d4bf3f77745681497a34d SHA1 0b
 AUX php5-ldvs 22 RMD160 5846dab2745b68a88175dd4e72d0b8cf4756dd46 SHA1 592398c92575adb14ec972847ce2aca28a7b9c2c SHA256 b79d0e52b1b3b4543b31ad45525ae1c2814a27ea8e676772ab10bf6fb12dfe79
 DIST php-5.2.17.tar.bz2 9092312 RMD160 567fa8d718b93fb83a89494c83a8bec224ac99e9 SHA1 d68f3b09f766990d815a3c4c63c157db8dab8095 SHA256 e81beb13ec242ab700e56f366e9da52fd6cf18961d155b23304ca870e53f116c
 DIST php-5.3.8.tar.bz2 11190060 RMD160 f18a18e2dfd7ea7885760eec2a05b3c4a15ad9db SHA1 8f29029e092f262876bfdd2ce56f6867e2b74b85 SHA256 a1dd06fd5593e97d9a5bd9818d6501d28d3ee8f09b83f0ec78f7cdfc060f3ea2
+DIST php-5.3.9.tar.bz2 11704944 RMD160 428ed51982637f092c43369cf5cfb284d58da3f6 SHA1 fe0626735c3d9dd370cef9bdcfe9506629449f51 SHA256 4bc54e1aa9010f09d2c6597844c984adecf9e1153c913a853c7725905ddb4dd7
 DIST php-5.3.9RC1.tar.bz2 11230477 RMD160 d00734de38b5cc2e719f5f80ac609e4362f6dfad SHA1 34306d0a7926a21ba15ee29ab37bbab44633b3fa SHA256 6d76af052c1575765d9bf03d8963415d437209fd790f74d85b523799f1dd718d
 DIST php-5.3.9RC2.tar.bz2 11415643 RMD160 2051cd223e30b49c93cd4282c4f4c51b45909547 SHA1 6699803c03f789cf9d311a9a0daab9d14515d5be SHA256 aac16a868056d2a19cb44b5b5732efb974a30dadc000d729c6374f3208005634
 DIST php-5.3.9RC3.tar.bz2 11438806 RMD160 c81ef1da6f1b269af772e3731cc93e7d00082edb SHA1 0667cb87857b294bd5cc912b139dba2b45f346ed SHA256 eb54bd0f42125086c7ee9ae82bf8155e80a8d084a56584b17bf6c6ab08c7ae33
@@ -32,6 +33,7 @@ DIST php-5.4.0RC4.tar.bz2 11437821 RMD160 f360e34753f4fbf53bd9727b6e2a2ba43e48ed
 DIST php-5.4.0RC5.tar.bz2 11450622 RMD160 afa69be764c921ce6e5b9b135758b3b8a27d0658 SHA1 290ff90415dc9d78d349a52ff9ebe69bf81e442d SHA256 660298da371f4827714aad10f1e28e19fcae290c6abb7478207bfbcef0827028
 DIST php-patchset-5.2.17-r0.tar.bz2 8369 RMD160 544af4eb2de8e4478e675810f18a5b494b59709b SHA1 7b3c56437b435f60f72f7af08112e77c01e2f827 SHA256 fb159a02faf5120dd9bc620bd3f3094735f181aa6893273bb7dd29771b8b23b2
 DIST php-patchset-5.3.8-r0.tar.bz2 7518 RMD160 3b9fc4063202b0a83b76a8c0f5bcfeb2ab358a50 SHA1 8b20057a68c9f6f4554ab96a884e874707fcd2e5 SHA256 a4677d75648529ccec61fc0edaa2684ad72c0b15bc81dc0770a6cbc927337686
+DIST php-patchset-5.3.9-r0.tar.bz2 7515 RMD160 b0f9951ab905e7eee2314ad09cf2af458a1c312d SHA1 9cd9d9624165329fe6b776aaa6686768de526403 SHA256 0224215adeee798109ef5ea5ab27543ba2687620d181b046464c2a49fa143029
 DIST php-patchset-5.3.9_rc1-r0.tar.bz2 7522 RMD160 4bf3d9bb26d86858ab26be0aa0466eaef4001553 SHA1 cd0dd6704b0c0b04cc1c78027efdfbcc5a9d182c SHA256 95863c23bd9a72013729dcdd005dc585ad5b3d689082503a3702f20df514362f
 DIST php-patchset-5.3.9_rc2-r0.tar.bz2 7515 RMD160 c3aca464d04df468fc8aaf6237be49bd891822b8 SHA1 228617dba2801397a5b51ca66fc9c90cf224a768 SHA256 afa2d477c630c2bdd2c3cd5eec24d7eb3e3a7cfd9819b4f4f328c1aad5335612
 DIST php-patchset-5.3.9_rc3-r0.tar.bz2 7510 RMD160 fbfb4ea98d88e32a04743238c3f293528f16deec SHA1 fa9d8d551c2b6062850a7495823f9346c68f358c SHA256 24a61a4bc14f76897a810f7b691f1ccfcf8225a92cb0d174f4e1b82c53df15e2
@@ -43,6 +45,7 @@ DIST suhosin-patch-5.2.16-0.9.7.patch.gz 23069 RMD160 b28b70faf136b3e04c5b483da0
 DIST suhosin-patch-5.3.7-0.9.10.patch.gz 41175 RMD160 19f789bf49a5fed2cd88b199fd8ac5d1ffa9bdc8 SHA1 3c38e873584b8f9e325a813cc9b197a342595099 SHA256 0a0dac0e4343596f2bfcef27dcf7180524b78bb1d2d2ca878370a7d0f8313d26
 EBUILD php-5.2.17.ebuild 11388 RMD160 13e05493c05d46ff503788226ddfc57c94066cbe SHA1 36fbc0193ba05f1600c6509aeb61739c1fbf1222 SHA256 90dad7f95742df4ac3f45c50ba059851b0c1e7b52fc550744290b005bfe3abc0
 EBUILD php-5.3.8.ebuild 11627 RMD160 ba0e75c495295b27c725db1bc1a3e3a7ff9c628f SHA1 5b79321fe0b37ef88b70bb971a8b74f2d4b0c85e SHA256 6ce6b8947720c94fe2b2883c38844bea3ad1dfc93026bda92ff275383c0bced3
+EBUILD php-5.3.9.ebuild 10704 RMD160 3b80f5f5d415eaca65f062e9e37569c82e5e9494 SHA1 f2f29c534948188760971b175d450d8cdda5937d SHA256 9d7b6e4150d35e248944ff0a46df214834750d4003de81f0863c86cc25282ac4
 EBUILD php-5.3.9_rc1.ebuild 11649 RMD160 97f3550b242af2e4c53f54b06960467d5e813922 SHA1 654f0c7259e90cf0e041367af9b84aaa6b858acf SHA256 7c6bd39881d6b846aa2e5eb0b50a1d174d7aba1c4eb60a0660408f2f24160658
 EBUILD php-5.3.9_rc2.ebuild 11649 RMD160 56a12297d94a7482790e8e7ae0f3c4e3e1f8c421 SHA1 b0e12600d9ce4ce8714fd1199fc673f3133a10bc SHA256 05551ed04efcd6ea761fdfe4810e11dc581dae3c29ebba446ca55ca90cd92e62
 EBUILD php-5.3.9_rc3.ebuild 10712 RMD160 c694576f65bb9d362f5b0486d0dc6bd79be47796 SHA1 3b03d2d7aa8aa4bb1cc1f455e3eec7e67adf57d8 SHA256 936e02eff0da1d820dbaa2748ff7c66cbb9202e6cc419118960828de3eeec8e2
@@ -50,16 +53,16 @@ EBUILD php-5.3.9_rc4.ebuild 10712 RMD160 018db844f3374de2ebf37eca4e18a20964efe47
 EBUILD php-5.4.0_rc3.ebuild 10615 RMD160 69a9589de898d4b929e71214072327dec58d5d79 SHA1 8886c2b9ff1786802704a57de6d7a0d953417c7e SHA256 5782b13d1a9ffcce62f956355f8f60fd1778ccc8c6405ce789653eab04581447
 EBUILD php-5.4.0_rc4.ebuild 10615 RMD160 f4ca78a2ce6a1003e591c168a754662c702d7286 SHA1 6de09cd11e90bb1b3020198194cd42c089aa39b4 SHA256 4febeec71b4cd436ce239b45f3582d4d7f78f4794f78e0b81b098aec3e75476f
 EBUILD php-5.4.0_rc5.ebuild 10615 RMD160 b637a41cebaffa9e3ddedd573ac9d5c7852cad8a SHA1 db1a07b03c04fe519303eadb5727ec6fc41c9111 SHA256 ac5f416e219216ff50692cfcfdfff54261dc642869cbe1b93ec04adf02b5da4c
-MISC ChangeLog 91677 RMD160 0031502cef56ae6466f72ee5f4e724f127d6c8d1 SHA1 b3e7cd5de0f901d63be81a329286424f4156fe90 SHA256 18bd99dcf724dc3afbe66692944ba9ce7c7068b8227b314f6d304bbda2dbbe5b
+MISC ChangeLog 91792 RMD160 a31c3738f40a224f072080598c8e4f0452b4d128 SHA1 378dec2e7a0e3f0b00b8b96fa7c3e23101eee73e SHA256 20f6df0f67ab319f9373329b382dfc26985144265865857ef30eba3515156d61
 MISC metadata.xml 2075 RMD160 e2eb44e39169dc2ff8e099d670a222e7102b1aea SHA1 9cebbc373dc8441aa0374132a3b5d87df6d37ffc SHA256 3d8bc9305be300ef7ef92d18ba5476927ec90a5b6d43c2408936229590ff5ac5
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iQEcBAEBAgAGBQJPB1+/AAoJEGurSuXEqSv1eq4H/jCyBCKFObFnHbrXE4Ln/bI5
-Ieeq6jQtjqjPk6Jc8Cn5zdH8faupEeUdEiBym0yu4a9WqK7a9j0QJjQut8V8SEkl
-/IRGHKTCtSp1+6Drfw/U9mjTgtLeZDsZ/cW+yLHJIOrp1Jl1U0gOjLGw9Y02sb0U
-7sxqvB6ZgRL7b95Bho2U6oxfam9cxPNlDvg18B70g1xc6ITwEs+IzfIVR3zoq+Bv
-vM96sBT7Pg85y4Jt/HKDfK6tiR8YYbwrk+tGLlUu29uWX0qYBYuIhot/iiSIXIce
-XQEExfZF3QRh3RsZ69SNkf8NPHlplMwoPP6M1DwwMGJlJJEASufzqdR5i9Bgyr4=
-=/wgf
+iQEcBAEBAgAGBQJPDS3PAAoJEGurSuXEqSv18FsIAKZ8EoI8sB/i8UVMVYh1Ybb1
+SP7S+08xRLRc6r06nmxpNzwFXCaf7KdBd+eY9/sgik2EnGNsMN+61mizbL02Mjem
+5QtBtBh2AdL150EEK0vw7oWfwXwFmgOrZ2sZMTV0/tjPC2t+pZNDmnMR8RscfGG7
+mjKWDvR9u/bWcK0fl4EJn5a8A3M+6dzI/CwnXOjELa7FJHhLWD6btWZz8qS/Toik
+O9YRDFa+EHTZ/Lz89xMJaA5cg4rpfTF9RELpaGBVY1FMjTsAaIXWDVlPVF1Kamlh
+YYverUawJVciXieDVtIB5IBFTxaZtISakRxQqRcqVDJLllGnZ4adA2wij+slWJQ=
+=XXlY
 -----END PGP SIGNATURE-----

diff --git a/dev-lang/php/php-5.3.9.ebuild b/dev-lang/php/php-5.3.9.ebuild
new file mode 100644 (file)
index 0000000..4154d92
--- /dev/null
+++ b/dev-lang/php/php-5.3.9.ebuild
@@ -0,0 +1,390 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/php/php-5.3.9.ebuild,v 1.1 2012/01/11 06:35:28 olemarkus Exp $
+
+EAPI=4
+
+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 libtool
+
+SUHOSIN_VERSION="5.3.7-0.9.10"
+FPM_VERSION="builtin"
+EXPECTED_TEST_FAILURES=""
+
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~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}"
+               ;;
+               "olemarkus")
+                       echo "http://olemarkus.org/~olemarkus/gentoo/${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/_rc/RC}"
+PHP_RELEASE="php"
+PHP_P="${PN}-${PHP_PV}"
+
+PHP_PATCHSET_LOC="olemarkus"
+
+PHP_SRC_URI="$(php_get_uri "${PHP_RELEASE}" "${PHP_P}.tar.bz2")"
+
+PHP_PATCHSET="0"
+PHP_PATCHSET_URI="
+       $(php_get_uri "${PHP_PATCHSET_LOC}" "php-patchset-${PV}-r${PHP_PATCHSET}.tar.bz2")"
+
+PHP_FPM_INIT_VER="4"
+PHP_FPM_CONF_VER="1"
+
+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
+
+if [[ -n ${SUHOSIN_VERSION} ]]; then
+       SUHOSIN_PATCH="suhosin-patch-${SUHOSIN_VERSION}.patch";
+       SUHOSIN_URI="$(php_get_uri ${SUHOSIN_TYPE} ${SUHOSIN_PATCH}.gz )"
+fi
+
+SRC_URI="
+       ${PHP_SRC_URI}
+       ${PHP_PATCHSET_URI}"
+
+if [[ -n ${SUHOSIN_VERSION} ]]; then
+       SRC_URI="${SRC_URI}
+               suhosin? ( ${SUHOSIN_URI} )"
+fi
+
+DESCRIPTION="The PHP language runtime engine: CLI, CGI, FPM/FastCGI, Apache2 and embed SAPIs."
+HOMEPAGE="http://php.net/"
+LICENSE="PHP-3"
+
+SLOT="$(get_version_component_range 1-2)"
+S="${WORKDIR}/${PHP_P}"
+
+# We can build the following SAPIs in the given order
+SAPIS="embed cli cgi fpm apache2"
+
+# Gentoo-specific, common features
+IUSE="kolab"
+
+# 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 doc
+       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 pic +posix postgres qdbm
+       readline recode +session sharedmem
+       +simplexml snmp soap sockets spell sqlite sqlite3 ssl
+       sybase-ct sysvipc tidy +tokenizer truetype unicode wddx
+       +xml xmlreader xmlwriter xmlrpc xpm xsl zip zlib"
+
+# Enable suhosin if available
+[[ -n $SUHOSIN_VERSION ]] && IUSE="${IUSE} suhosin"
+
+DEPEND="!dev-lang/php:5
+       >=app-admin/eselect-php-0.6.2
+       >=dev-libs/libpcre-8.12[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
+               media-libs/libpng
+               sys-libs/zlib
+       ) )
+       crypt? ( >=dev-libs/libmcrypt-2.4 )
+       curl? ( >=net-misc/curl-7.10.5 )
+       enchant? ( app-text/enchant )
+       exif? ( !gd? (
+               virtual/jpeg
+               media-libs/libpng
+               sys-libs/zlib
+       ) )
+       firebird? ( dev-db/firebird )
+       gd? ( virtual/jpeg media-libs/libpng 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 )
+       kolab? ( >=net-libs/c-client-2004g-r1 )
+       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-2* pdo? ( >=dev-db/sqlite-3.7.7.1 ) )
+       sqlite3? ( >=dev-db/sqlite-3.7.7.1 )
+       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 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
+               virtual/jpeg
+               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}"
+
+REQUIRED_USE="
+       truetype? ( gd )
+       cjk? ( gd )
+       exif? ( gd  )
+
+       xpm? ( gd )
+       gd? ( zlib )
+       simplexml? ( xml )
+       soap? ( xml )
+       wddx? ( xml )
+       xmlrpc? ( || ( xml iconv ) )
+       xmlreader? ( xml )
+       xsl? ( xml )
+       ldap-sasl? ( ldap )
+       kolab? ( imap )
+       mhash? ( hash )
+       phar? ( hash )
+       mysqlnd? ( || (
+               mysql
+               mysqli
+               pdo
+       ) )
+
+       qdbm? ( !gdbm )
+       readline? ( !libedit )
+       recode? ( !imap !mysql !mysqli )
+       sharedmem? ( !threads )
+
+       !cli? ( !cgi? ( !fpm? ( !apache2? ( !embed? ( cli ) ) ) ) )"
+
+DEPEND="${DEPEND}
+       enchant? ( !dev-php5/pecl-enchant )
+       fileinfo? ( !<dev-php5/pecl-fileinfo-1.0.4-r2 )
+       filter? ( !dev-php5/pecl-filter )
+       json? ( !dev-php5/pecl-json )
+       phar? ( !dev-php5/pecl-phar )
+       zip? ( !dev-php5/pecl-zip )"
+
+[[ -n $SUHOSIN_VERSION ]] && RDEPEND="${RDEPEND} suhosin? (
+=${CATEGORY}/${PN}-${SLOT}*[unicode] )"
+
+RDEPEND="${DEPEND}"
+
+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 )"
+
+# No longer depend on the extension. The suhosin USE flag only installs the
+# patch
+#[[ -n $SUHOSIN_VERSION ]] && PDEPEND="${PDEPEND} suhosin? ( dev-php${PHP_MV}/suhosin )"
+
+# 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
+
+# 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 "v2"
+       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 v3
+
+src_prepare() { eblit-run src_prepare v3 ; }
+src_configure() { eblit-run src_configure v53 ; }
+src_compile() { eblit-run src_compile v1 ; }
+src_install() { eblit-run src_install v3 ; }
+src_test() { eblit-run src_test v1 ; }
+
+#Do not use eblit for this because it will not get sourced when installing from
+#binary package (bug #380845)
+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 /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 /etc/make.conf"
+       ewarn "Both versions of php.ini can be found in /usr/share/doc/${PF}"
+
+       # check for not yet migrated old style config dirs
+       ls "${ROOT}"/etc/php/*-php5 &>/dev/null
+       if [[ $? -eq 0 ]]; then
+               ewarn "Make sure to migrate your config files, starting with php-5.3.4 and php-5.2.16 config"
+               ewarn "files are now kept at ${ROOT}etc/php/{apache2,cli,cgi,fpm}-php5.x"
+       fi
+       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
+
+       if ( [[ -z SUHOSIN_VERSION ]] && use suhosin && version_is_at_least 5.3.6_rc1 ) ; then
+               ewarn "The suhosin USE flag now only installs the suhosin patch!"
+               ewarn "If you want the suhosin extension, make sure you install"
+               ewarn " dev-php5/suhosin"
+               ewarn
+       fi
+}