Bump of 5.4 RC

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

3 files changed, 407 insertions, 5 deletions

diff --git a/dev-lang/php/ChangeLog b/dev-lang/php/ChangeLog
index 2dd640e63492..528c3cd996a4 100644
--- 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.543 2012/01/17 05:18:51 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/php/ChangeLog,v 1.544 2012/01/20 14:40:05 olemarkus Exp $
+
+*php-5.4.0_rc6 (20 Jan 2012)
+
+  20 Jan 2012; Ole Markus With <olemarkus@gentoo.org> +php-5.4.0_rc6.ebuild:
+  Bump of 5.4 RC
 
   17 Jan 2012; Jeroen Roovers <jer@gentoo.org> php-5.3.9.ebuild:
   Stable for HPPA (bug #384301).
diff --git a/dev-lang/php/Manifest b/dev-lang/php/Manifest
index d7e9328b842f..81d01b3da000 100644
--- a/dev-lang/php/Manifest
+++ b/dev-lang/php/Manifest
@@ -31,6 +31,7 @@ DIST php-5.3.9RC4.tar.bz2 11711811 RMD160 30041f935004fd423db399f657dae4c85063e7
 DIST php-5.4.0RC3.tar.bz2 11444398 RMD160 9549bbeb1fd719f6c3d20bda7ede23c5059805a3 SHA1 875e36522020ddab5b2b82efefe49de3979ef650 SHA256 23f9bac36ff7a3ce9f367e313c2b89a03483238d44ff8a590ae829c7ee1fc748
 DIST php-5.4.0RC4.tar.bz2 11437821 RMD160 f360e34753f4fbf53bd9727b6e2a2ba43e48ed56 SHA1 dd5884bed553334d1fa36a90c088cde05ed1ecbf SHA256 7d51d2f141b93e6e3b043d14dddbcbca550abbeddf442e4aa05b993cdbfd707c
 DIST php-5.4.0RC5.tar.bz2 11450622 RMD160 afa69be764c921ce6e5b9b135758b3b8a27d0658 SHA1 290ff90415dc9d78d349a52ff9ebe69bf81e442d SHA256 660298da371f4827714aad10f1e28e19fcae290c6abb7478207bfbcef0827028
+DIST php-5.4.0RC6.tar.bz2 11439696 RMD160 5104a36ca5f7f0e425af43e8144ca2b56980ce8a SHA1 b2da77d0c0cb08d579ada7372427d907e0b8a913 SHA256 f09a8627aade37f40aafe637f1a041e2b8c6dc9d64f2e613d92f1864e7e0db95
 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
@@ -41,6 +42,7 @@ DIST php-patchset-5.3.9_rc4-r0.tar.bz2 7517 RMD160 8e36f129dbb02ba47b1e7b55bbabc
 DIST php-patchset-5.4.0_rc3-r0.tar.bz2 6001 RMD160 0200e6ada41e471a30bfddeeb166d3254a9e2856 SHA1 3b1f71255db1c003f452c2fe41f93284a50967c4 SHA256 06834d624ce6269aa8005a28ccc0e55b2e8d500af57e4392e641978d5993a3ea
 DIST php-patchset-5.4.0_rc4-r0.tar.bz2 6001 RMD160 0200e6ada41e471a30bfddeeb166d3254a9e2856 SHA1 3b1f71255db1c003f452c2fe41f93284a50967c4 SHA256 06834d624ce6269aa8005a28ccc0e55b2e8d500af57e4392e641978d5993a3ea
 DIST php-patchset-5.4.0_rc5-r0.tar.bz2 6001 RMD160 0200e6ada41e471a30bfddeeb166d3254a9e2856 SHA1 3b1f71255db1c003f452c2fe41f93284a50967c4 SHA256 06834d624ce6269aa8005a28ccc0e55b2e8d500af57e4392e641978d5993a3ea
+DIST php-patchset-5.4.0_rc6-r0.tar.bz2 6001 RMD160 0200e6ada41e471a30bfddeeb166d3254a9e2856 SHA1 3b1f71255db1c003f452c2fe41f93284a50967c4 SHA256 06834d624ce6269aa8005a28ccc0e55b2e8d500af57e4392e641978d5993a3ea
 DIST suhosin-patch-5.2.16-0.9.7.patch.gz 23069 RMD160 b28b70faf136b3e04c5b483da0f4c2279378f43a SHA1 fec10b2b81582d06bb0d0a96ea55c525afc8ab29 SHA256 aae115a318d80b3f32cedf876e7a8e4b932febb1b0c743c0b398003ebe122f91
 DIST suhosin-patch-5.3.7-0.9.10.patch.gz 41175 RMD160 19f789bf49a5fed2cd88b199fd8ac5d1ffa9bdc8 SHA1 3c38e873584b8f9e325a813cc9b197a342595099 SHA256 0a0dac0e4343596f2bfcef27dcf7180524b78bb1d2d2ca878370a7d0f8313d26
 DIST suhosin-patch-5.3.9-0.9.10-gentoo.patch.gz 42028 RMD160 bcb3cf4fb983a67c83985fe1ddcf4f543b53d110 SHA1 fd3253e49e180345410bb14ecb1a7e924e300a97 SHA256 1d334e82d922eaa0415d3d3fe5bf3cf2a4ca6481dd528a73771d26b52d999454
@@ -54,12 +56,17 @@ 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 92620 RMD160 0daf2a51bb28b53b0b033ee1df86244239b7724c SHA1 0f2dbd5ceea5b4f2bdaf56399c9f91e638f12540 SHA256 dd77e2d059b6a4175d0e9383d35529b4eadafea149671e20a5e001dad614b9db
+EBUILD php-5.4.0_rc6.ebuild 10615 RMD160 5b6df72057c3849a8b3489e5b8e528d39a164210 SHA1 b953436b72e0f24829b056ae52756586f4353bd7 SHA256 f111954bfd07ade453715d53a0e3d44996a5bbb8608698eba01e3ff04cf4c51d
+MISC ChangeLog 92751 RMD160 ba0ebc2f335a7749209a349362f52da41e2efee6 SHA1 f79ae440f16c8326c85d598b8fa6a4959ffe64d8 SHA256 b1c4676c256021d4df2952b8483eabf51fba0f4c71038fb04f19b9a17bc94123
 MISC metadata.xml 2075 RMD160 e2eb44e39169dc2ff8e099d670a222e7102b1aea SHA1 9cebbc373dc8441aa0374132a3b5d87df6d37ffc SHA256 3d8bc9305be300ef7ef92d18ba5476927ec90a5b6d43c2408936229590ff5ac5
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iEYEARECAAYFAk8VBMEACgkQVWmRsqeSphNo5gCfa99k8ENK+ein47M0Jq+6a3NB
-QtEAn3JrZ2PAhXLQh3J9xt7pl1TqCsCl
-=XRN/
+iQEcBAEBAgAGBQJPGXz8AAoJEGurSuXEqSv1IwEH/RarZZ7a5ZexJ9NAh4YM59u3
+K0sHt2lHhX6NcYf3aj+8RjlMWlvj0oqKWwDRSUVrmms1K93jNIlYDEjMilClgnpq
+qBXDaOp1I/p8F4lfdAlCpXL0mpkBlfIVhDbgmR2ZzPXW4f4unY4bt+hTPzNk41+A
+FN7TpIryZFyrh6VD9iwuBj41FGm3WfGUs9U4I5NG9j8y5r7A7XBDDSpuG0bAMqv7
+ZgsYI+xMU5Ixvuwc1IueUtqKLFiF7GnXyK53sSDtbIBGqXaMf3scM70J19Katdmn
+WKnxYfAEYd3G4NopMdfbPIKO5LzQdCcaubGcsLvZX9Q7nXT3JKA9AnyZVXCwii0=
+=jGX8
 -----END PGP SIGNATURE-----
diff --git a/dev-lang/php/php-5.4.0_rc6.ebuild b/dev-lang/php/php-5.4.0_rc6.ebuild
new file mode 100644
index 000000000000..106649e71477
--- /dev/null
+++ b/dev-lang/php/php-5.4.0_rc6.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.4.0_rc6.ebuild,v 1.1 2012/01/20 14:40:05 olemarkus Exp $
+
+EAPI=4
+
+inherit eutils autotools flag-o-matic versionator depend.apache apache-module db-use libtool
+
+SUHOSIN_VERSION=""
+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-stas")
+			echo "http://downloads.php.net/stas/${2}"
+		;;
+		"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_PV="${PHP_PV/_alpha/alpha}"
+PHP_PV="${PHP_PV/_beta/beta}"
+PHP_RELEASE="php-stas"
+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 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 )
+	sqlite3? ( >=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 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-php/pecl-enchant )
+	fileinfo? ( !<dev-php/pecl-fileinfo-1.0.4-r2 )
+	filter? ( !dev-php/pecl-filter )
+	json? ( !dev-php/pecl-json )
+	phar? ( !dev-php/pecl-phar )
+	zip? ( !dev-php/pecl-zip )"
+
+[[ -n $SUHOSIN_VERSION ]] && RDEPEND="${RDEPEND} suhosin? (
+=${CATEGORY}/${PN}-${SLOT}*[unicode] )"
+
+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 v4 ; }
+src_configure() { eblit-run src_configure v54 ; }
+src_compile() { eblit-run src_compile v2 ; }
+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-php/suhosin"
+		ewarn
+	fi
+}