summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMike Frysinger <vapier@gentoo.org>2003-03-09 02:33:19 +0000
committerMike Frysinger <vapier@gentoo.org>2003-03-09 02:33:19 +0000
commit794766a26f581620f741c49a34a4986454485074 (patch)
tree7debf898be94857895547f7a2c57b76a4eaf5e01 /dev-php
parentVersion bump. (diff)
downloadhistorical-794766a26f581620f741c49a34a4986454485074.tar.gz
historical-794766a26f581620f741c49a34a4986454485074.tar.bz2
historical-794766a26f581620f741c49a34a4986454485074.zip
update apache DEPEND
Diffstat (limited to 'dev-php')
-rw-r--r--dev-php/mod_php/mod_php-4.2.3-r2.ebuild9
-rw-r--r--dev-php/mod_php/mod_php-4.3.0-r2.ebuild9
-rw-r--r--dev-php/mod_php/mod_php-4.3.1-r1.ebuild8
-rw-r--r--dev-php/mod_php/mod_php-4.3.1.ebuild8
4 files changed, 20 insertions, 14 deletions
diff --git a/dev-php/mod_php/mod_php-4.2.3-r2.ebuild b/dev-php/mod_php/mod_php-4.2.3-r2.ebuild
index 02515b988a9c..ff136fe65fc1 100644
--- a/dev-php/mod_php/mod_php-4.2.3-r2.ebuild
+++ b/dev-php/mod_php/mod_php-4.2.3-r2.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2003 Gentoo Technologies, Inc.
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-php/mod_php/mod_php-4.2.3-r2.ebuild,v 1.8 2003/03/06 04:26:49 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-php/mod_php/mod_php-4.2.3-r2.ebuild,v 1.9 2003/03/09 02:33:19 vapier Exp $
IUSE="java apache2 freetype postgres tiff libwww nls jpeg ssl gd oci8 mysql X gdbm curl imap png xml2 xml cjk pdflib qt snmp crypt flash odbc ldap berkdb freetds firebird pam"
@@ -18,9 +18,10 @@ PROVIDE="virtual/php"
# - rphillips
#>=dev-libs/gmp-3.1.1
-DEPEND="
- >=net-www/apache-1.3.26-r2
- apache2? ( >=net-www/apache-2.0.43-r1 )
+DEPEND="|| (
+ apache2? ( >=net-www/apache-2.0.43-r1 )
+ >=net-www/apache-1.3.26-r2
+ )
freetype? ( ~media-libs/freetype-1.3.1 >=media-libs/t1lib-1.3.1 )
jpeg? ( >=media-libs/jpeg-6b )
tiff? ( >=media-libs/tiff-3.5.5 )
diff --git a/dev-php/mod_php/mod_php-4.3.0-r2.ebuild b/dev-php/mod_php/mod_php-4.3.0-r2.ebuild
index f20ebfab4c58..4f5891bb4d5b 100644
--- a/dev-php/mod_php/mod_php-4.3.0-r2.ebuild
+++ b/dev-php/mod_php/mod_php-4.3.0-r2.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2003 Gentoo Technologies, Inc.
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-php/mod_php/mod_php-4.3.0-r2.ebuild,v 1.9 2003/03/06 04:26:49 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-php/mod_php/mod_php-4.3.0-r2.ebuild,v 1.10 2003/03/09 02:33:19 vapier Exp $
inherit flag-o-matic
@@ -23,9 +23,10 @@ replace-flags "-march=k6*" "-march=i586"
# - rphillips
#>=dev-libs/gmp-3.1.1
-DEPEND="
- >=net-www/apache-1.3.26-r2
- apache2? ( >=net-www/apache-2.0.43-r1 )
+DEPEND="|| (
+ apache2? ( >=net-www/apache-2.0.43-r1 )
+ >=net-www/apache-1.3.26-r2
+ )
truetype? ( ~media-libs/freetype-1.3.1 >=media-libs/t1lib-1.3.1 )
jpeg? ( >=media-libs/jpeg-6b )
tiff? ( >=media-libs/tiff-3.5.5 )
diff --git a/dev-php/mod_php/mod_php-4.3.1-r1.ebuild b/dev-php/mod_php/mod_php-4.3.1-r1.ebuild
index ad4f48a9e58b..00404cf3d036 100644
--- a/dev-php/mod_php/mod_php-4.3.1-r1.ebuild
+++ b/dev-php/mod_php/mod_php-4.3.1-r1.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2003 Gentoo Technologies, Inc.
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-php/mod_php/mod_php-4.3.1-r1.ebuild,v 1.9 2003/03/03 18:16:57 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-php/mod_php/mod_php-4.3.1-r1.ebuild,v 1.10 2003/03/09 02:33:19 vapier Exp $
inherit flag-o-matic
@@ -23,8 +23,10 @@ replace-flags "-march=k6*" "-march=i586"
# - rphillips
#>=dev-libs/gmp-3.1.1
-DEPEND=">=net-www/apache-1.3.26-r2
- apache2? ( >=net-www/apache-2.0.43-r1 )
+DEPEND="|| (
+ apache2? ( >=net-www/apache-2.0.43-r1 )
+ >=net-www/apache-1.3.26-r2
+ )
truetype? ( ~media-libs/freetype-1.3.1 >=media-libs/t1lib-1.3.1 )
jpeg? ( >=media-libs/jpeg-6b )
tiff? ( >=media-libs/tiff-3.5.5 )
diff --git a/dev-php/mod_php/mod_php-4.3.1.ebuild b/dev-php/mod_php/mod_php-4.3.1.ebuild
index 3e3bd8ae6f17..86e9f96e702f 100644
--- a/dev-php/mod_php/mod_php-4.3.1.ebuild
+++ b/dev-php/mod_php/mod_php-4.3.1.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2003 Gentoo Technologies, Inc.
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-php/mod_php/mod_php-4.3.1.ebuild,v 1.7 2003/03/03 18:16:57 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-php/mod_php/mod_php-4.3.1.ebuild,v 1.8 2003/03/09 02:33:19 vapier Exp $
inherit flag-o-matic
@@ -23,8 +23,10 @@ replace-flags "-march=k6*" "-march=i586"
# - rphillips
#>=dev-libs/gmp-3.1.1
-DEPEND=">=net-www/apache-1.3.26-r2
- apache2? ( >=net-www/apache-2.0.43-r1 )
+DEPEND="|| (
+ apache2? ( >=net-www/apache-2.0.43-r1 )
+ >=net-www/apache-1.3.26-r2
+ )
truetype? ( ~media-libs/freetype-1.3.1 >=media-libs/t1lib-1.3.1 )
jpeg? ( >=media-libs/jpeg-6b )
tiff? ( >=media-libs/tiff-3.5.5 )