[gentoo-commits] gentoo-x86 commit in eclass: depend.apache.eclass

[Benedikt Boehm (hollow)]

hollow      08/02/03 14:12:44

  Modified:             depend.apache.eclass
  Log:
  do not hardcode USE flag for optional apache support

Revision  Changes    Path
1.39                 eclass/depend.apache.eclass

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/depend.apache.eclass?rev=1.39&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/depend.apache.eclass?rev=1.39&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/depend.apache.eclass?r1=1.38&r2=1.39

Index: depend.apache.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/depend.apache.eclass,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -r1.38 -r1.39
--- depend.apache.eclass	3 Feb 2008 11:51:36 -0000	1.38
+++ depend.apache.eclass	3 Feb 2008 14:12:44 -0000	1.39
@@ -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.38 2008/02/03 11:51:36 hollow Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/depend.apache.eclass,v 1.39 2008/02/03 14:12:44 hollow Exp $
 
 # @ECLASS: depend.apache.eclass
 # @MAINTAINER: apache-devs@g.o
@@ -69,21 +69,6 @@
 # Dependencies for Apache 2.2.x
 APACHE2_2_DEPEND="=www-servers/apache-2.2*"
 
-# @ECLASS-VARIABLE: WANT_APACHE_DEPEND
-# @DESCRIPTION:
-# Dependency magic based on useflag to use the right DEPEND
-WANT_APACHE_DEPEND="apache2? ( ${APACHE_DEPEND} )"
-
-# @ECLASS-VARIABLE: WANT_APACHE2_DEPEND
-# @DESCRIPTION:
-# Dependency magic based on useflag to use the right DEPEND
-WANT_APACHE2_DEPEND="apache2? ( ${APACHE2_DEPEND} )"
-
-# @ECLASS-VARIABLE: WANT_APACHE2_2_DEPEND
-# @DESCRIPTION:
-# Dependency magic based on useflag to use the right DEPEND
-WANT_APACHE2_2_DEPEND="apache2? ( ${APACHE2_2_DEPEND} )"
-
 # ==============================================================================
 # INTERNAL FUNCTIONS
 # ==============================================================================
@@ -122,11 +107,12 @@
 want_apache2() {
 	debug-print-function $FUNCNAME $*
 
-	IUSE="${IUSE} apache2"
-	DEPEND="${DEPEND} ${WANT_APACHE2_DEPEND}"
-	RDEPEND="${RDEPEND} ${WANT_APACHE2_DEPEND}"
+	local myiuse=${1:-apache2}
+	IUSE="${IUSE} ${myiuse}"
+	DEPEND="${DEPEND} ${myiuse}? ( ${APACHE2_DEPEND} )"
+	RDEPEND="${RDEPEND} ${myiuse}? ( ${APACHE2_DEPEND} )"
 
-	if use apache2 ; then
+	if use ${myiuse} ; then
 		_init_apache2
 	else
 		_init_no_apache
@@ -140,11 +126,12 @@
 want_apache2_2() {
 	debug-print-function $FUNCNAME $*
 
-	IUSE="${IUSE} apache2"
-	DEPEND="${DEPEND} ${WANT_APACHE2_2_DEPEND}"
-	RDEPEND="${RDEPEND} ${WANT_APACHE2_2_DEPEND}"
+	local myiuse=${1:-apache2}
+	IUSE="${IUSE} ${myiuse}"
+	DEPEND="${DEPEND} ${myiuse}? ( ${APACHE2_2_DEPEND} )"
+	RDEPEND="${RDEPEND} ${myiuse}? ( ${APACHE2_2_DEPEND} )"
 
-	if use apache2 ; then
+	if use ${myiuse} ; then
 		_init_apache2
 	else
 		_init_no_apache
@@ -156,7 +143,8 @@
 # An ebuild calls this to get the dependency information for optional apache
 # support.
 want_apache() {
-	want_apache2
+	debug-print-function $FUNCNAME $*
+	want_apache2 "$@"
 }
 
 # @FUNCTION: need_apache2
@@ -190,5 +178,6 @@
 # to happen seamlessly. All an ebuild needs to do is include the line
 # need_apache somewhere.
 need_apache() {
+	debug-print-function $FUNCNAME $*
 	need_apache2
 }



-- 
gentoo-commits@l.g.o mailing list