diff options
| author |   Andreas K. Hüttel <dilfridge@gentoo.org> | 2016-12-08 19:40:17 +0100 |
|---|---|---|
| committer | Andreas K. Hüttel <dilfridge@gentoo.org> | 2016-12-10 18:19:50 +0100 |
| commit | 89f2805fe3fc56d9d27281a90e8b95d08210941c (patch) | |
| tree | f4d9dcb0e0f05910398cd99640e233d45025a0d3 /eclass | |
| parent | depend.apache.eclass: Replace build_with_use with has_version, disallow for E... (diff) | |
| download | gentoo-89f2805fe3fc56d9d27281a90e8b95d08210941c.tar.gz gentoo-89f2805fe3fc56d9d27281a90e8b95d08210941c.tar.bz2 gentoo-89f2805fe3fc56d9d27281a90e8b95d08210941c.zip | |
depend.apache.eclass: For EAPI=6, move initialization of APACHE_BASEDIR and APACHE_MODULESDIR into pkg_setup
Diffstat (limited to 'eclass')
| -rw-r--r-- | eclass/depend.apache.eclass | 37 |
1 files changed, 25 insertions, 12 deletions
diff --git a/eclass/depend.apache.eclass b/eclass/depend.apache.eclass index f0848a63d181..881dfd5e7036 100644 --- a/eclass/depend.apache.eclass +++ b/eclass/depend.apache.eclass @@ -40,17 +40,11 @@ # } # @CODE -inherit multilib - case ${EAPI:-0} in - 0|1|2|3|4|5) + 0|2|3|4|5) + inherit multilib ;; 6) - ewarn - ewarn "EAPI=${EAPI} is not supported by depend.apache.eclass." - ewarn "This means that ${CATEGORY}/${PF} is most likely buggy." - ewarn "Please file a report on https://bugs.gentoo.org/" - ewarn ;; *) die "EAPI=${EAPI} is not supported by depend.apache.eclass" @@ -84,7 +78,8 @@ esac # @ECLASS-VARIABLE: APACHE_BASEDIR # @DESCRIPTION: # Path to the server root directory. -# This variable is set by the want/need_apache functions. +# This variable is set by the want/need_apache functions (EAPI=0 through 5) +# or depend.apache_pkg_setup (EAPI=6 and later). # @ECLASS-VARIABLE: APACHE_CONFDIR # @DESCRIPTION: @@ -104,7 +99,8 @@ esac # @ECLASS-VARIABLE: APACHE_MODULESDIR # @DESCRIPTION: # Path where we install modules. -# This variable is set by the want/need_apache functions. +# This variable is set by the want/need_apache functions (EAPI=0 through 5) +# or depend.apache_pkg_setup (EAPI=6 and later). # @ECLASS-VARIABLE: APACHE_DEPEND # @DESCRIPTION: @@ -141,10 +137,19 @@ _init_apache2() { APACHE_BIN="/usr/sbin/apache2" APACHE_CTL="/usr/sbin/apache2ctl" APACHE_INCLUDEDIR="/usr/include/apache2" - APACHE_BASEDIR="/usr/$(get_libdir)/apache2" APACHE_CONFDIR="/etc/apache2" APACHE_MODULES_CONFDIR="${APACHE_CONFDIR}/modules.d" APACHE_VHOSTS_CONFDIR="${APACHE_CONFDIR}/vhosts.d" + + case ${EAPI:-0} in + 0|2|3|4|5) + _init_apache2_late + ;; + esac +} + +_init_apache2_late() { + APACHE_BASEDIR="/usr/$(get_libdir)/apache2" APACHE_MODULESDIR="${APACHE_BASEDIR}/modules" } @@ -173,7 +178,15 @@ depend.apache_pkg_setup() { local myiuse=${1:-apache2} if has ${myiuse} ${IUSE}; then if use ${myiuse}; then - _init_apache2 + case ${EAPI:-0} in + 0|2|3|4|5) + _init_apache2 + ;; + *) + _init_apache2 + _init_apache2_late + ;; + esac else _init_no_apache fi |