summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorOle Markus With <olemarkus@gentoo.org>2011-03-16 16:50:42 +0000
committerOle Markus With <olemarkus@gentoo.org>2011-03-16 16:50:42 +0000
commitb53c3e2bf6248843f916ecf37255b471a04e20a6 (patch)
treea9ea4637d445b0bb40a55f23a145833eb0c1389a /dev-lang
parentVersion bump for dev channel release. Fix bug #358745 by Mike Gilbert <floppy... (diff)
downloadgentoo-2-b53c3e2bf6248843f916ecf37255b471a04e20a6.tar.gz
gentoo-2-b53c3e2bf6248843f916ecf37255b471a04e20a6.tar.bz2
gentoo-2-b53c3e2bf6248843f916ecf37255b471a04e20a6.zip
Reordered the SAPIs so that embed is always the first sapi to be built if selected. Fixes #358687
(Portage version: 2.1.9.41/cvs/Linux x86_64)
Diffstat (limited to 'dev-lang')
-rw-r--r--dev-lang/php/ChangeLog6
-rw-r--r--dev-lang/php/php-5.3.6_rc3.ebuild4
2 files changed, 7 insertions, 3 deletions
diff --git a/dev-lang/php/ChangeLog b/dev-lang/php/ChangeLog
index d0a0b095d120..2e8076b84859 100644
--- a/dev-lang/php/ChangeLog
+++ b/dev-lang/php/ChangeLog
@@ -1,6 +1,10 @@
# 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.474 2011/03/13 09:48:06 olemarkus Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/php/ChangeLog,v 1.475 2011/03/16 16:50:42 olemarkus Exp $
+
+ 16 Mar 2011; <olemarkus@gentoo.org> php-5.3.6_rc3.ebuild:
+ Reordered the SAPIs so that embed is always the first sapi to be built if
+ selected. Fixes #358687
13 Mar 2011; <olemarkus@gentoo.org> +files/eblits/src_prepare-v3.eblit,
php-5.3.6_rc3.ebuild:
diff --git a/dev-lang/php/php-5.3.6_rc3.ebuild b/dev-lang/php/php-5.3.6_rc3.ebuild
index efc1a28f34bf..8ce2684ad5fa 100644
--- a/dev-lang/php/php-5.3.6_rc3.ebuild
+++ b/dev-lang/php/php-5.3.6_rc3.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.3.6_rc3.ebuild,v 1.3 2011/03/14 22:31:20 olemarkus Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/php/php-5.3.6_rc3.ebuild,v 1.4 2011/03/16 16:50:42 olemarkus Exp $
EAPI=2
@@ -84,7 +84,7 @@ SLOT="$(get_version_component_range 1-2)"
S="${WORKDIR}/${PHP_P}"
# We can build the following SAPIs in the given order
-SAPIS="cli cgi fpm embed apache2"
+SAPIS="embed cli cgi fpm apache2"
# Gentoo-specific, common features
IUSE="kolab"