summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLuca Longinotti <chtekk@gentoo.org>2007-05-12 02:54:35 +0000
committerLuca Longinotti <chtekk@gentoo.org>2007-05-12 02:54:35 +0000
commitbb02a7f0eb1541a6ad491d0b4dfa7758efa8a70f (patch)
tree20c3ee315ab56d0df769ff19294bf4ad2747f805 /eclass/webapp-apache.eclass
parentStable on mips. (diff)
downloadhistorical-bb02a7f0eb1541a6ad491d0b4dfa7758efa8a70f.tar.gz
historical-bb02a7f0eb1541a6ad491d0b4dfa7758efa8a70f.tar.bz2
historical-bb02a7f0eb1541a6ad491d0b4dfa7758efa8a70f.zip
Apache 1.X masking.
Diffstat (limited to 'eclass/webapp-apache.eclass')
-rw-r--r--eclass/webapp-apache.eclass5
1 files changed, 2 insertions, 3 deletions
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