diff options
author | Christian Heim <phreak@gentoo.org> | 2007-07-29 16:37:20 +0000 |
---|---|---|
committer | Christian Heim <phreak@gentoo.org> | 2007-07-29 16:37:20 +0000 |
commit | 3cbf86a9c7a9991bc9f4fb1021d8f2dfda35e9bb (patch) | |
tree | 4b99f3d07901e5c87c953c302a82684a17433dbc /eclass | |
parent | Add USE flags for www-servers/apache. (diff) | |
download | historical-3cbf86a9c7a9991bc9f4fb1021d8f2dfda35e9bb.tar.gz historical-3cbf86a9c7a9991bc9f4fb1021d8f2dfda35e9bb.tar.bz2 historical-3cbf86a9c7a9991bc9f4fb1021d8f2dfda35e9bb.zip |
Move net-www/apache to www-servers/apache (#78622).
Diffstat (limited to 'eclass')
-rw-r--r-- | eclass/depend.apache.eclass | 10 | ||||
-rw-r--r-- | eclass/webapp-apache.eclass | 8 |
2 files changed, 9 insertions, 9 deletions
diff --git a/eclass/depend.apache.eclass b/eclass/depend.apache.eclass index ac0a78a4a463..0549a09d991d 100644 --- a/eclass/depend.apache.eclass +++ b/eclass/depend.apache.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/depend.apache.eclass,v 1.32 2007/05/13 20:11:37 chtekk Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/depend.apache.eclass,v 1.33 2007/07/29 16:36:23 phreak Exp $ inherit multilib @@ -91,10 +91,10 @@ APACHE2_MODULESDIR="${APACHE2_BASEDIR}/modules" ## ## Dependencies for Apache 1.x and Apache 2.x #### -APACHE1_DEPEND="=net-www/apache-1*" -APACHE2_DEPEND="=net-www/apache-2*" -APACHE2_0_DEPEND="=net-www/apache-2.0*" -APACHE2_2_DEPEND="=net-www/apache-2.2*" +APACHE1_DEPEND="=www-servers/apache-1*" +APACHE2_DEPEND="=www-servers/apache-2*" +APACHE2_0_DEPEND="=www-servers/apache-2.0*" +APACHE2_2_DEPEND="=www-servers/apache-2.2*" #### ## NEED_APACHE_DEPEND diff --git a/eclass/webapp-apache.eclass b/eclass/webapp-apache.eclass index 3cf8200a1b3b..0638453df891 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.28 2007/05/30 15:50:05 cardoe Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/webapp-apache.eclass,v 1.29 2007/07/29 16:37:20 phreak Exp $ # # Author: Stuart Herbert <stuart@gentoo.org> # @@ -12,7 +12,7 @@ # webapp-config from GLEP11 are released. IUSE="apache2" -DEPEND="${DEPEND} net-www/apache" +DEPEND="${DEPEND} www-servers/apache" EXPORT_FUNCTIONS pkg_setup @@ -26,8 +26,8 @@ EXPORT_FUNCTIONS pkg_setup function webapp-apache-detect () { APACHEVER= - has_version '=net-www/apache-2*' && APACHEVER=2 && CONFVER=2 - [ -z "${APACHEVER}" ] && has_version '=net-www/apache-2*' && APACHEVER=2 && CONFVER=2 + has_version '=www-servers/apache-2*' && APACHEVER=2 && CONFVER=2 + [ -z "${APACHEVER}" ] && has_version '=www-servers/apache-2*' && APACHEVER=2 && CONFVER=2 if [ "${APACHEVER}+" = "+" ]; then # no apache version detected |