diff options
| author |   Ole Markus With <olemarkus@gentoo.org> | 2010-12-25 09:19:08 +0000 |
|---|---|---|
| committer | Ole Markus With <olemarkus@gentoo.org> | 2010-12-25 09:19:08 +0000 |
| commit | 053520e1e3b659fcde1e8db5c0cf240a64180800 (patch) | |
| tree | 84c27d615a261a681400175302062f752fcd9ed5 /dev-lang | |
| parent | clean up (diff) | |
| download | gentoo-2-053520e1e3b659fcde1e8db5c0cf240a64180800.tar.gz gentoo-2-053520e1e3b659fcde1e8db5c0cf240a64180800.tar.bz2 gentoo-2-053520e1e3b659fcde1e8db5c0cf240a64180800.zip | |
Prevented the fpm sapi from force-enabling the cli sapi (bug 349122)
(Portage version: 2.1.9.25/cvs/Linux x86_64)
Diffstat (limited to 'dev-lang')
| -rw-r--r-- | dev-lang/php/ChangeLog | 5 | ||||
| -rw-r--r-- | dev-lang/php/php-5.3.4.ebuild | 4 |
2 files changed, 6 insertions, 3 deletions
diff --git a/dev-lang/php/ChangeLog b/dev-lang/php/ChangeLog index 7d67ec2916c2..2b55b9b63067 100644 --- a/dev-lang/php/ChangeLog +++ b/dev-lang/php/ChangeLog @@ -1,6 +1,9 @@ # ChangeLog for dev-lang/php # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-lang/php/ChangeLog,v 1.446 2010/12/21 09:09:17 mabi Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-lang/php/ChangeLog,v 1.447 2010/12/25 09:19:08 olemarkus Exp $ + + 25 Dec 2010; <olemarkus@gentoo.org> php-5.3.4.ebuild: + Prevented the fpm sapi from force-enabling the cli sapi (bug 349122) 21 Dec 2010; Matti Bickel <mabi@gentoo.org> +files/php-fpm.conf, files/eblits/src_configure-v2.eblit, files/php-fpm-r3.init: diff --git a/dev-lang/php/php-5.3.4.ebuild b/dev-lang/php/php-5.3.4.ebuild index 706adb559571..8bc3520697ca 100644 --- a/dev-lang/php/php-5.3.4.ebuild +++ b/dev-lang/php/php-5.3.4.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2010 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-lang/php/php-5.3.4.ebuild,v 1.3 2010/12/20 00:46:38 hwoarang Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-lang/php/php-5.3.4.ebuild,v 1.4 2010/12/25 09:19:08 olemarkus Exp $ EAPI=2 @@ -238,7 +238,7 @@ RDEPEND="${DEPEND} firebird? ( $php[-interbase] ) sharedmem? ( $php[-threads] ) - !cli? ( !cgi? ( !apache2? ( !embed? ( $php[cli] ) ) ) ) + !cli? ( !cgi? ( !fpm? ( !apache2? ( !embed? ( $php[cli] ) ) ) ) ) enchant? ( !dev-php${PHP_MV}/pecl-enchant ) fileinfo? ( !<dev-php${PHP_MV}/pecl-fileinfo-1.0.4-r2 ) |