diff options
| author |   Christian Hoffmann <hoffie@gentoo.org> | 2009-12-16 21:53:55 +0000 |
|---|---|---|
| committer | Christian Hoffmann <hoffie@gentoo.org> | 2009-12-16 21:53:55 +0000 |
| commit | 15b0a7e1ae6b99799b2cd4d8e5bc58cb921576fc (patch) | |
| tree | 14c670536649105eeb7070dc452e352fcbe5a951 /dev-lang/php | |
| parent | QA: Transfer prefix keywords (diff) | |
| download | gentoo-2-15b0a7e1ae6b99799b2cd4d8e5bc58cb921576fc.tar.gz gentoo-2-15b0a7e1ae6b99799b2cd4d8e5bc58cb921576fc.tar.bz2 gentoo-2-15b0a7e1ae6b99799b2cd4d8e5bc58cb921576fc.zip | |
trying to fix the circular dependency we are seeing with suhosin since 5.2.11 (where I added a version dependency without much thinking), bug 295871, thanks to Oleg Gawriloff <barzog@telecom.by>
(Portage version: 2.1.7.9/cvs/Linux x86_64)
Diffstat (limited to 'dev-lang/php')
| -rw-r--r-- | dev-lang/php/ChangeLog | 8 | ||||
| -rw-r--r-- | dev-lang/php/php-5.2.11-r1.ebuild | 7 | ||||
| -rw-r--r-- | dev-lang/php/php-5.2.11.ebuild | 7 |
3 files changed, 15 insertions, 7 deletions
diff --git a/dev-lang/php/ChangeLog b/dev-lang/php/ChangeLog index e85d55958a34..b5ea07ec2936 100644 --- a/dev-lang/php/ChangeLog +++ b/dev-lang/php/ChangeLog @@ -1,6 +1,12 @@ # ChangeLog for dev-lang/php # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-lang/php/ChangeLog,v 1.358 2009/11/21 19:53:36 nixnut Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-lang/php/ChangeLog,v 1.359 2009/12/16 21:53:55 hoffie Exp $ + + 16 Dec 2009; Christian Hoffmann <hoffie@gentoo.org> php-5.2.11.ebuild, + php-5.2.11-r1.ebuild: + trying to fix the circular dependency we are seeing with suhosin since + 5.2.11 (where I added a version dependency without much thinking), bug + 295871, thanks to Oleg Gawriloff <barzog@telecom.by> 21 Nov 2009; nixnut <nixnut@gentoo.org> php-5.2.11-r1.ebuild: ppc stable #292132 diff --git a/dev-lang/php/php-5.2.11-r1.ebuild b/dev-lang/php/php-5.2.11-r1.ebuild index 04e12924f743..fe9403279b7c 100644 --- a/dev-lang/php/php-5.2.11-r1.ebuild +++ b/dev-lang/php/php-5.2.11-r1.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2009 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-lang/php/php-5.2.11-r1.ebuild,v 1.7 2009/11/21 19:53:36 nixnut Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-lang/php/php-5.2.11-r1.ebuild,v 1.8 2009/12/16 21:53:55 hoffie Exp $ CGI_SAPI_USE="discard-path force-cgi-redirect" APACHE2_SAPI_USE="concurrentmodphp threads" @@ -42,8 +42,7 @@ DEPEND="app-admin/php-toolkit imap? ( >=virtual/imap-c-client-2006k ) pcre? ( >=dev-libs/libpcre-7.8 ) xml? ( >=dev-libs/libxml2-2.7.2-r2 ) - xmlrpc? ( >=dev-libs/libxml2-2.7.2-r2 virtual/libiconv ) - suhosin? ( >=dev-php5/suhosin-0.9.29 )" + xmlrpc? ( >=dev-libs/libxml2-2.7.2-r2 virtual/libiconv )" RDEPEND="${DEPEND}" if [[ -n "${KOLAB_PATCH}" ]] ; then @@ -52,6 +51,8 @@ if [[ -n "${KOLAB_PATCH}" ]] ; then kolab? ( >=net-libs/c-client-2004g-r1 )" fi +PDEPEND="suhosin? ( >=dev-php5/suhosin-0.9.29 )" + want_apache pkg_setup() { diff --git a/dev-lang/php/php-5.2.11.ebuild b/dev-lang/php/php-5.2.11.ebuild index 1ab0faa03966..eca80ea9efe1 100644 --- a/dev-lang/php/php-5.2.11.ebuild +++ b/dev-lang/php/php-5.2.11.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2009 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-lang/php/php-5.2.11.ebuild,v 1.8 2009/10/19 09:12:38 volkmar Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-lang/php/php-5.2.11.ebuild,v 1.9 2009/12/16 21:53:55 hoffie Exp $ CGI_SAPI_USE="discard-path force-cgi-redirect" APACHE2_SAPI_USE="concurrentmodphp threads" @@ -42,8 +42,7 @@ DEPEND="app-admin/php-toolkit imap? ( >=virtual/imap-c-client-2006k ) pcre? ( >=dev-libs/libpcre-7.8 ) xml? ( >=dev-libs/libxml2-2.7.2-r2 ) - xmlrpc? ( >=dev-libs/libxml2-2.7.2-r2 virtual/libiconv ) - suhosin? ( >=dev-php5/suhosin-0.9.29 )" + xmlrpc? ( >=dev-libs/libxml2-2.7.2-r2 virtual/libiconv )" RDEPEND="${DEPEND}" if [[ -n "${KOLAB_PATCH}" ]] ; then @@ -52,6 +51,8 @@ if [[ -n "${KOLAB_PATCH}" ]] ; then kolab? ( >=net-libs/c-client-2004g-r1 )" fi +PDEPEND="suhosin? ( >=dev-php5/suhosin-0.9.29 )" + want_apache pkg_setup() { |