diff options
| author |   Paul de Vrieze <pauldv@gentoo.org> | 2003-05-27 12:56:00 +0000 |
|---|---|---|
| committer | Paul de Vrieze <pauldv@gentoo.org> | 2003-05-27 12:56:00 +0000 |
| commit | f81e8789b7b0bac72b2fdaa521e1a6d4cc9ee7db (patch) | |
| tree | 3b8615485924a9e4f25fdefe66ad4675d1706b04 /dev-php | |
| parent | fixed blender license (diff) | |
| download | gentoo-2-f81e8789b7b0bac72b2fdaa521e1a6d4cc9ee7db.tar.gz gentoo-2-f81e8789b7b0bac72b2fdaa521e1a6d4cc9ee7db.tar.bz2 gentoo-2-f81e8789b7b0bac72b2fdaa521e1a6d4cc9ee7db.zip | |
Fix dependency on apache<2
Diffstat (limited to 'dev-php')
| -rw-r--r-- | dev-php/mod_php/ChangeLog | 5 | ||||
| -rw-r--r-- | dev-php/mod_php/Manifest | 14 | ||||
| -rw-r--r-- | dev-php/mod_php/mod_php-4.3.1-r3.ebuild | 8 |
3 files changed, 14 insertions, 13 deletions
diff --git a/dev-php/mod_php/ChangeLog b/dev-php/mod_php/ChangeLog index 1cfc74e2a4eb..fe5124db900d 100644 --- a/dev-php/mod_php/ChangeLog +++ b/dev-php/mod_php/ChangeLog @@ -1,9 +1,12 @@ # ChangeLog for dev-php/mod_php # Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-php/mod_php/ChangeLog,v 1.75 2003/05/26 23:35:41 robbat2 Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-php/mod_php/ChangeLog,v 1.76 2003/05/27 12:55:53 pauldv Exp $ *mod_php-4.3.1-r3 (23 Apr 2003) + 27 May 2003; Paul de Vrieze <pauldv@gentoo.org> mod_php-4.3.1-r3.ebuild: + Fix apache dependency when the apache2 useflag is not set. + 26 May 2003; Robin H. Johnson <robbat2@gentoo.org> mod_php-4.3.1-r3.ebuild: Added DB4 fix in eclass. Cleaned up the config section. Fix digest. Correctly postinst slightly with regards to conf.d/apache* directives. diff --git a/dev-php/mod_php/Manifest b/dev-php/mod_php/Manifest index 96052f01c236..4fcf885b021f 100644 --- a/dev-php/mod_php/Manifest +++ b/dev-php/mod_php/Manifest @@ -1,16 +1,16 @@ -MD5 51647abe3d6bcf314ed554d74970fed9 mod_php-4.3.1-r3.ebuild 2570 -MD5 ec77ebae880bd19afa8027c4dc90a8a2 mod_php-4.3.1.ebuild 8929 -MD5 c99a00bf82ec9a082399ab1dd931c415 mod_php-4.3.1-r2.ebuild 9241 +MD5 251daeeb712b49d70e8ceadb84ab0c5b ChangeLog 16135 MD5 6de98d80b82a71ed8845884b0bd5676e mod_php-4.2.3-r2.ebuild 8071 MD5 dfc6bd16160024127fa9b0c242fc8ab5 mod_php-4.3.0-r2.ebuild 8634 -MD5 a424b54e90f9fb3ffc1445a2162f1f56 ChangeLog 15999 MD5 c585d6d5154fe64839f25db957301433 mod_php-4.3.1-r1.ebuild 9135 -MD5 cceddd5c262e0ffef31d45b7da269851 files/mod_php.conf 148 +MD5 ec77ebae880bd19afa8027c4dc90a8a2 mod_php-4.3.1.ebuild 8929 +MD5 c99a00bf82ec9a082399ab1dd931c415 mod_php-4.3.1-r2.ebuild 9241 +MD5 31e28f7f7df06e387c40cdad216265ab mod_php-4.3.1-r3.ebuild 2589 MD5 77023a54f39bae40733118d5cabd8f7f files/70_mod_php.conf 853 -MD5 316366d60770de4c45957483cde50fe8 files/digest-mod_php-4.3.1 63 -MD5 663577b8f4b90d61f245bb6052629194 files/pear_config.diff 422 MD5 ad1869c3f2c3a60b4d7c4d26026373cf files/digest-mod_php-4.2.3-r2 63 MD5 3604218eee0ba5f7a1eac325de001eb1 files/digest-mod_php-4.3.0-r2 63 +MD5 316366d60770de4c45957483cde50fe8 files/digest-mod_php-4.3.1 63 MD5 316366d60770de4c45957483cde50fe8 files/digest-mod_php-4.3.1-r1 63 MD5 316366d60770de4c45957483cde50fe8 files/digest-mod_php-4.3.1-r2 63 MD5 975be13035769ea0b0734d0b108d9479 files/digest-mod_php-4.3.1-r3 126 +MD5 cceddd5c262e0ffef31d45b7da269851 files/mod_php.conf 148 +MD5 663577b8f4b90d61f245bb6052629194 files/pear_config.diff 422 diff --git a/dev-php/mod_php/mod_php-4.3.1-r3.ebuild b/dev-php/mod_php/mod_php-4.3.1-r3.ebuild index 631e318a68b1..6fa2c9f5a720 100644 --- a/dev-php/mod_php/mod_php-4.3.1-r3.ebuild +++ b/dev-php/mod_php/mod_php-4.3.1-r3.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-r3.ebuild,v 1.11 2003/05/26 23:35:41 robbat2 Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-php/mod_php/mod_php-4.3.1-r3.ebuild,v 1.12 2003/05/27 12:55:53 pauldv Exp $ inherit php eutils @@ -11,10 +11,8 @@ KEYWORDS="~x86 ~sparc ~ppc ~alpha ~hppa ~arm ~sparc" SLOT="0" DEPEND="${DEPEND} - || ( - apache2? ( >=net-www/apache-2.0.43-r1 ) - >=net-www/apache-1.3.26-r2 - ) " + apache2? ( >=net-www/apache-2.0.43-r1 ) + !apache2? ( !<net-www/apache-1.3.26-r2 <net-www/apache-2 )" src_compile() { #no readline on server SAPI |