diff options
author | 2005-04-12 23:34:27 +0000 | |
---|---|---|
committer | 2005-04-12 23:34:27 +0000 | |
commit | da7f9cd6e6a92c9b44a6892427083739841be2e4 (patch) | |
tree | cfe247f57463f2347e2247d82f32e64492ee1dc0 /dev-php | |
parent | Initial import of dev-util/ald ebuild contributed by Miles Lubin <miles@lubin... (diff) | |
download | gentoo-2-da7f9cd6e6a92c9b44a6892427083739841be2e4.tar.gz gentoo-2-da7f9cd6e6a92c9b44a6892427083739841be2e4.tar.bz2 gentoo-2-da7f9cd6e6a92c9b44a6892427083739841be2e4.zip |
completing the mod_php<->apache dependency hell
(Portage version: 2.0.51.19)
Diffstat (limited to 'dev-php')
-rw-r--r-- | dev-php/mod_php/ChangeLog | 6 | ||||
-rw-r--r-- | dev-php/mod_php/mod_php-4.3.10-r1.ebuild | 8 | ||||
-rw-r--r-- | dev-php/mod_php/mod_php-4.3.11-r1.ebuild | 4 |
3 files changed, 11 insertions, 7 deletions
diff --git a/dev-php/mod_php/ChangeLog b/dev-php/mod_php/ChangeLog index b4db393f7675..f23980be5801 100644 --- a/dev-php/mod_php/ChangeLog +++ b/dev-php/mod_php/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for dev-php/mod_php # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-php/mod_php/ChangeLog,v 1.217 2005/04/12 23:20:06 trapni Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-php/mod_php/ChangeLog,v 1.218 2005/04/12 23:34:27 trapni Exp $ + + 12 Apr 2005; Christian Parpart <trapni@gentoo.org> + mod_php-4.3.10-r1.ebuild, mod_php-4.3.11-r1.ebuild: + completing the mod_php<->apache dependency hell 12 Apr 2005; Christian Parpart <trapni@gentoo.org> mod_php-4.3.11-r1.ebuild: diff --git a/dev-php/mod_php/mod_php-4.3.10-r1.ebuild b/dev-php/mod_php/mod_php-4.3.10-r1.ebuild index 1f7faf2d21ea..91163d5117e6 100644 --- a/dev-php/mod_php/mod_php-4.3.10-r1.ebuild +++ b/dev-php/mod_php/mod_php-4.3.10-r1.ebuild @@ -1,10 +1,10 @@ # Copyright 1999-2005 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-php/mod_php/mod_php-4.3.10-r1.ebuild,v 1.4 2005/04/10 17:11:21 trapni Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-php/mod_php/mod_php-4.3.10-r1.ebuild,v 1.5 2005/04/12 23:34:27 trapni Exp $ IUSE="${IUSE} apache2" -KEYWORDS="~x86 ~ppc ~sparc ~alpha ~hppa ~amd64 ~ia64 ~s390 ~ppc64 ~mips" +KEYWORDS="~x86 ~ppc ~sparc ~alpha ~hppa ~amd64 ~ia64 ~ppc64" detectapache() { local domsg= @@ -53,8 +53,8 @@ inherit php-sapi eutils apache-module flag-o-matic DESCRIPTION="Apache module for PHP" -DEPEND_EXTRA=">=net-www/apache-1.3.26-r2 - apache2? ( >=net-www/apache-2.0.43-r1 )" +DEPEND_EXTRA=">=net-www/apache-1.3.33-r2 + apache2? ( >=net-www/apache-2.0.52-r3 )" DEPEND="${DEPEND} ${DEPEND_EXTRA}" RDEPEND="${RDEPEND} ${DEPEND_EXTRA}" IUSE="${IUSE} debug" diff --git a/dev-php/mod_php/mod_php-4.3.11-r1.ebuild b/dev-php/mod_php/mod_php-4.3.11-r1.ebuild index beffd87b58dc..8b126ba00029 100644 --- a/dev-php/mod_php/mod_php-4.3.11-r1.ebuild +++ b/dev-php/mod_php/mod_php-4.3.11-r1.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2005 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-php/mod_php/mod_php-4.3.11-r1.ebuild,v 1.3 2005/04/12 23:20:06 trapni Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-php/mod_php/mod_php-4.3.11-r1.ebuild,v 1.4 2005/04/12 23:34:27 trapni Exp $ IUSE="${IUSE} apache2" @@ -53,7 +53,7 @@ inherit php-sapi eutils apache-module flag-o-matic DESCRIPTION="Apache module for PHP" -DEPEND_EXTRA=">=net-www/apache-1.3.26-r2 +DEPEND_EXTRA=">=net-www/apache-1.3.33-r2 apache2? ( >=net-www/apache-2.0.52-r3 )" DEPEND="${DEPEND} ${DEPEND_EXTRA}" RDEPEND="${RDEPEND} ${DEPEND_EXTRA}" |