summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--dev-lang/php/ChangeLog5
-rw-r--r--dev-lang/php/php-5.3.11.ebuild4
2 files changed, 6 insertions, 3 deletions
diff --git a/dev-lang/php/ChangeLog b/dev-lang/php/ChangeLog
index 0686f93fb9e2..c71fcfddef33 100644
--- a/dev-lang/php/ChangeLog
+++ b/dev-lang/php/ChangeLog
@@ -1,6 +1,9 @@
# 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.578 2012/04/28 15:59:35 mabi Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/php/ChangeLog,v 1.579 2012/04/29 17:39:29 nativemad Exp $
+
+ 29 Apr 2012; Andreas Schuerch <nativemad@gentoo.org> php-5.3.11.ebuild:
+ x86 stable, see bug 410857
28 Apr 2012; Matti Bickel <mabi@gentoo.org> php-5.3.11.ebuild:
custom suhosin patch no longer needed, revert back to upstream one (fixes
diff --git a/dev-lang/php/php-5.3.11.ebuild b/dev-lang/php/php-5.3.11.ebuild
index 0b73db895be9..2e56aade043d 100644
--- a/dev-lang/php/php-5.3.11.ebuild
+++ b/dev-lang/php/php-5.3.11.ebuild
@@ -1,6 +1,6 @@
# 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.11.ebuild,v 1.2 2012/04/28 15:54:33 mabi Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/php/php-5.3.11.ebuild,v 1.3 2012/04/29 17:39:29 nativemad Exp $
EAPI=4
@@ -14,7 +14,7 @@ SUHOSIN_VERSION="5.3.9-0.9.10"
FPM_VERSION="builtin"
EXPECTED_TEST_FAILURES=""
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc x86"
function php_get_uri ()
{