depend.apache.eclass: Restructure pkg_setup so in_iuse is used from E…

…API=6 on
johu · Dec 10, 2016 · eebd014 · eebd014
1 parent 3037a56
commit eebd014
Showing 1 changed file with 19 additions and 12 deletions.
diff --git 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