diff options
author | Christian Parpart <trapni@gentoo.org> | 2005-04-12 23:34:27 +0000 |
---|---|---|
committer | Christian Parpart <trapni@gentoo.org> | 2005-04-12 23:34:27 +0000 |
commit | a6160af578bfabb8affc2328e6a10927ecbd57cf (patch) | |
tree | d7e315fc9ed326aa917371768d47b3b722b49dc1 /dev-php | |
parent | Initial import of dev-util/ald ebuild contributed by Miles Lubin <miles@lubin... (diff) | |
download | historical-a6160af578bfabb8affc2328e6a10927ecbd57cf.tar.gz historical-a6160af578bfabb8affc2328e6a10927ecbd57cf.tar.bz2 historical-a6160af578bfabb8affc2328e6a10927ecbd57cf.zip |
completing the mod_php<->apache dependency hell
Package-Manager: portage-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/Manifest | 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 |
4 files changed, 14 insertions, 10 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/Manifest b/dev-php/mod_php/Manifest index 594fd2b3c17c..94e17f557d51 100644 --- a/dev-php/mod_php/Manifest +++ b/dev-php/mod_php/Manifest @@ -2,7 +2,7 @@ MD5 dc2b446cde6865cfbccaef4a94db4aa2 mod_php-4.3.10.ebuild 6134 MD5 794be7f3942662541c6c0d25fb64161c mod_php-4.3.9.ebuild 6074 MD5 a431ba8439f0fced002aaf0f74a70e3f mod_php-4.3.8.ebuild 5963 MD5 5f347443c2b80bb26a91346b99501aca mod_php-5.0.3-r1.ebuild 4296 -MD5 32efc7a06341bd920982d6360239818c ChangeLog 37955 +MD5 16444b033c90f63cbe582972f303a7d6 ChangeLog 38113 MD5 8dcccea239186458cae823a2b62b80d0 mod_php-5.0.1.ebuild 4244 MD5 3da695dab52a3e7eeea983bf1c493fa1 mod_php-5.0.2.ebuild 4257 MD5 93afa9417917af1a31305b472ea8b70c mod_php-5.0.2-r1.ebuild 4177 @@ -12,9 +12,9 @@ MD5 ee8294251b178d776c61705a710347f1 mod_php-4.3.9_rc1.ebuild 6072 MD5 3b4db25bfe82d2967bc9c607cccdb12c mod_php-5.0.0-r1.ebuild 4179 MD5 f7e4a6694e3b06296830077b47d766da mod_php-5.0.0.ebuild 3995 MD5 38fe937e954ab7109395cefa86fcd2d4 metadata.xml 384 -MD5 95adde22fbb2ca003dd90ee037952e93 mod_php-4.3.10-r1.ebuild 6361 +MD5 940874a8b88c3614970e9e501f1dafaf mod_php-4.3.10-r1.ebuild 6349 MD5 5357393f40a578f7be2663a74f23640f mod_php-5.0.3.ebuild 4378 -MD5 ad85c196db7f671e8bdb9c55b9522898 mod_php-4.3.11-r1.ebuild 6289 +MD5 a423281d6b97a9dc2a285cd87f080635 mod_php-4.3.11-r1.ebuild 6289 MD5 cceddd5c262e0ffef31d45b7da269851 files/mod_php.conf 148 MD5 4792b645fe6b66cd3f1b1ec88d4d20e8 files/digest-mod_php-5.0.2-r1 63 MD5 286ce4ea00fde75122c14fd35c3d4672 files/digest-mod_php-4.3.9_rc1 208 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}" |