diff options
| author |   Luca Longinotti <chtekk@gentoo.org> | 2007-05-12 02:54:35 +0000 |
|---|---|---|
| committer | Luca Longinotti <chtekk@gentoo.org> | 2007-05-12 02:54:35 +0000 |
| commit | d6038fa299f5714f34b6ba1f6f06de8a47f48c3b (patch) | |
| tree | 1267ce76fb2a48006578f158735ba2b45ab5ad85 /eclass | |
| parent | Stable on mips. (diff) | |
| download | gentoo-2-d6038fa299f5714f34b6ba1f6f06de8a47f48c3b.tar.gz gentoo-2-d6038fa299f5714f34b6ba1f6f06de8a47f48c3b.tar.bz2 gentoo-2-d6038fa299f5714f34b6ba1f6f06de8a47f48c3b.zip | |
Apache 1.X masking.
Diffstat (limited to 'eclass')
| -rw-r--r-- | eclass/php-ext-base-r1.eclass | 4 | ||||
| -rw-r--r-- | eclass/php-ext-base.eclass | 4 | ||||
| -rw-r--r-- | eclass/webapp-apache.eclass | 5 |
3 files changed, 6 insertions, 7 deletions
diff --git a/eclass/php-ext-base-r1.eclass b/eclass/php-ext-base-r1.eclass index 52ac269da525..3750ec1b499f 100644 --- a/eclass/php-ext-base-r1.eclass +++ b/eclass/php-ext-base-r1.eclass @@ -1,6 +1,6 @@ # Copyright 1999-2007 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/eclass/php-ext-base-r1.eclass,v 1.6 2007/03/05 01:50:47 chtekk Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/php-ext-base-r1.eclass,v 1.7 2007/05/12 02:54:35 chtekk Exp $ # # Author: Tal Peer <coredumb@gentoo.org> # Author: Stuart Herbert <stuart@gentoo.org> @@ -31,7 +31,7 @@ EXPORT_FUNCTIONS src_install php-ext-base-r1_buildinilist() { # Work out the list of <ext>.ini files to edit/add to if [[ -z "${PHPSAPILIST}" ]] ; then - PHPSAPILIST="apache1 apache2 cli cgi" + PHPSAPILIST="apache2 cli cgi" fi PHPINIFILELIST="" diff --git a/eclass/php-ext-base.eclass b/eclass/php-ext-base.eclass index 77167dfa5282..b69e9406655f 100644 --- a/eclass/php-ext-base.eclass +++ b/eclass/php-ext-base.eclass @@ -1,6 +1,6 @@ # Copyright 1999-2004 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/eclass/php-ext-base.eclass,v 1.19 2005/07/11 15:08:06 swegener Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/php-ext-base.eclass,v 1.20 2007/05/12 02:54:35 chtekk Exp $ # # Author: Tal Peer <coredumb@gentoo.org> # Author: Stuart Herbert <stuart@gentoo.org> @@ -44,7 +44,7 @@ php-ext-base_buildinilist () { # work out the list of .ini files to edit/add to if [ -z "${PHPSAPILIST}" ]; then - PHPSAPILIST="apache1 apache2 cli cgi" + PHPSAPILIST="apache2 cli cgi" fi PHPINIFILELIST= diff --git a/eclass/webapp-apache.eclass b/eclass/webapp-apache.eclass index 5c606a120d24..97d1f16e03b4 100644 --- a/eclass/webapp-apache.eclass +++ b/eclass/webapp-apache.eclass @@ -1,6 +1,6 @@ # Copyright 1999-2004 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/eclass/webapp-apache.eclass,v 1.26 2006/06/23 17:20:34 chtekk Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/webapp-apache.eclass,v 1.27 2007/05/12 02:54:35 chtekk Exp $ # # Author: Stuart Herbert <stuart@gentoo.org> # @@ -26,8 +26,7 @@ EXPORT_FUNCTIONS pkg_setup function webapp-apache-detect () { APACHEVER= - has_version '=net-www/apache-1*' && APACHEVER=1 && CONFVER= - has_version '=net-www/apache-2*' && use apache2 && APACHEVER=2 && CONFVER=2 + has_version '=net-www/apache-2*' && APACHEVER=2 && CONFVER=2 [ -z "${APACHEVER}" ] && has_version '=net-www/apache-2*' && APACHEVER=2 && CONFVER=2 if [ "${APACHEVER}+" = "+" ]; then |