diff options
| author |   Robin H. Johnson <robbat2@gentoo.org> | 2003-06-12 10:24:07 +0000 |
|---|---|---|
| committer | Robin H. Johnson <robbat2@gentoo.org> | 2003-06-12 10:24:07 +0000 |
| commit | ef9827c1282ed678858e2aa9beacd9fceba0b564 (patch) | |
| tree | d40de492626b718f78e8e6f9728fa12f9ca040ff /dev-php | |
| parent | html docs not gzipped (diff) | |
| download | gentoo-2-ef9827c1282ed678858e2aa9beacd9fceba0b564.tar.gz gentoo-2-ef9827c1282ed678858e2aa9beacd9fceba0b564.tar.bz2 gentoo-2-ef9827c1282ed678858e2aa9beacd9fceba0b564.zip | |
fix syntax errors
Diffstat (limited to 'dev-php')
| -rw-r--r-- | dev-php/mod_php/ChangeLog | 5 | ||||
| -rw-r--r-- | dev-php/mod_php/Manifest | 4 | ||||
| -rw-r--r-- | dev-php/mod_php/mod_php-4.3.2-r2.ebuild | 15 |
3 files changed, 17 insertions, 7 deletions
diff --git a/dev-php/mod_php/ChangeLog b/dev-php/mod_php/ChangeLog index 257755334a3f..745da47caa78 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.82 2003/06/10 19:58:08 robbat2 Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-php/mod_php/ChangeLog,v 1.83 2003/06/12 10:24:04 robbat2 Exp $ *mod_php-4.3.2-r2 (10 June 2003) + 12 June 2003; Robin H. Johnson <robbat2@gentoo.org> mod_php-4.3.2.ebuild: + syntax errors are bad. + 10 June 2003; Robin H. Johnson <robbat2@gentoo.org> mod_php-4.3.2.ebuild: This is an extension of the fixes in 4.3.2-r1, but I'm uncertain if some of this magic is valid, so it is in a sepearate ebulid for now. diff --git a/dev-php/mod_php/Manifest b/dev-php/mod_php/Manifest index 9ae738024b4d..e4f81f3ce73f 100644 --- a/dev-php/mod_php/Manifest +++ b/dev-php/mod_php/Manifest @@ -1,12 +1,12 @@ MD5 136c8a948544ac163e93e4c45e46092c mod_php-4.3.2.ebuild 2740 MD5 31e28f7f7df06e387c40cdad216265ab mod_php-4.3.1-r3.ebuild 2589 -MD5 1850fcf46291e3a4926495f6f2211bfe mod_php-4.3.2-r2.ebuild 3086 +MD5 3aee768c75fcedcdc9399ec3265bebd0 mod_php-4.3.2-r2.ebuild 3307 MD5 a00cd3eced04951a9aa6a5d38bd7f6b6 mod_php-4.3.1.ebuild 9225 MD5 c99a00bf82ec9a082399ab1dd931c415 mod_php-4.3.1-r2.ebuild 9241 MD5 171b138769aa006ffa4393144555cba3 mod_php-4.3.2-r1.ebuild 2676 MD5 6de98d80b82a71ed8845884b0bd5676e mod_php-4.2.3-r2.ebuild 8071 MD5 dfc6bd16160024127fa9b0c242fc8ab5 mod_php-4.3.0-r2.ebuild 8634 -MD5 43e7f8da56589b596fb11c5df79d739b ChangeLog 17684 +MD5 53cf504a1ce388a8cd583884ac247e6e ChangeLog 17786 MD5 c585d6d5154fe64839f25db957301433 mod_php-4.3.1-r1.ebuild 9135 MD5 cceddd5c262e0ffef31d45b7da269851 files/mod_php.conf 148 MD5 77023a54f39bae40733118d5cabd8f7f files/70_mod_php.conf 853 diff --git a/dev-php/mod_php/mod_php-4.3.2-r2.ebuild b/dev-php/mod_php/mod_php-4.3.2-r2.ebuild index 35bfb12f6a3f..43e452b367fc 100644 --- a/dev-php/mod_php/mod_php-4.3.2-r2.ebuild +++ b/dev-php/mod_php/mod_php-4.3.2-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.2-r2.ebuild,v 1.1 2003/06/10 19:58:08 robbat2 Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-php/mod_php/mod_php-4.3.2-r2.ebuild,v 1.2 2003/06/12 10:24:05 robbat2 Exp $ inherit php eutils @@ -25,9 +25,16 @@ has_version '=net-www/apache-2*' && HAVE_APACHE2=1 [ -n "${HAVE_APACHE1}" ] && [ -n "${HAVE_APACHE2}" ] && APACHEVER='both' case "${APACHEVER}" in - 1) break ;; - 2) break ;; - both) use apache2 && APACHEVER=2 || APACHEVER=1 ;; + 1) einfo 'Apache1 only detected' ;; + 2) einfo 'Apache2 only detected';; + both) + if [ "`use apache2`" ]; then + einfo "Multiple Apache versions detected, using Apache2 (USE=apache2)" + APACHEVER=2 + else + einfo 'Multiple Apache versions detected, using Apache1 (USE=-apache2)' + APACHEVER=1 + fi ;; *) MSG="Unknown Apache version!"; eerror $MSG ; die $MSG ;; esac |