depend.apache.eclass: Restructure pkg_setup so in_iuse is used from EAPI=6 on

diff --git a/eclass/depend.apache.eclass b/eclass/depend.apache.eclass
index 26dd98fd117d750bc51cb9ba769c7913587d1e5e..ba08318c9db1bdbac1c9e675396fa22828506c78 100644 (file)
--- a/eclass/depend.apache.eclass
+++ b/eclass/depend.apache.eclass
@@ -176,21 +176,28 @@ depend.apache_pkg_setup() {
        fi
 
        local myiuse=${1:-apache2}
-       if has ${myiuse} ${IUSE}; then
-               if use ${myiuse}; then
-                       case ${EAPI:-0} in
-                               0|2|3|4|5)
+
+       case ${EAPI:-0} in
+               0|2|3|4|5)
+                       if has ${myiuse} ${IUSE}; then
+                               if use ${myiuse}; then
                                        _init_apache2
-                                       ;;
-                               *)
+                               else
+                                       _init_no_apache
+                               fi
+                       fi
+                       ;;
+               *)
+                       if in_iuse ${myiuse}; then
+                               if use ${myiuse}; then
                                        _init_apache2
                                        _init_apache2_late
-                                       ;;
-                       esac
-               else
-                       _init_no_apache
-               fi
-       fi
+                               else
+                                       _init_no_apache
+                               fi
+                       fi
+                       ;;
+       esac
 }
 
 # @FUNCTION: want_apache