diff options
| author |   Andreas K. Hüttel <dilfridge@gentoo.org> | 2016-12-08 21:03:07 +0100 |
|---|---|---|
| committer | Andreas K. Hüttel <dilfridge@gentoo.org> | 2016-12-10 18:19:57 +0100 |
| commit | eebd0149cd5390b23c0079c446adfab2a74f5a06 (patch) | |
| tree | 5741fe4ea11a404e1f31703f5116eb499560c6f5 /eclass | |
| parent | depend.apache.eclass: Add missing function want_apache2_4 (diff) | |
| download | gentoo-eebd0149cd5390b23c0079c446adfab2a74f5a06.tar.gz gentoo-eebd0149cd5390b23c0079c446adfab2a74f5a06.tar.bz2 gentoo-eebd0149cd5390b23c0079c446adfab2a74f5a06.zip | |
depend.apache.eclass: Restructure pkg_setup so in_iuse is used from EAPI=6 on
Diffstat (limited to 'eclass')
| -rw-r--r-- | eclass/depend.apache.eclass | 31 |
1 files changed, 19 insertions, 12 deletions
diff --git a/eclass/depend.apache.eclass b/eclass/depend.apache.eclass index 26dd98fd117d..ba08318c9db1 100644 --- 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 |