Please review. Given that I'm only tangentially involved with Apache myself, I
would like to keep the changes to the eclass minimal...
[The last nontrivial changes to the eclass were made in 2012 and 2008.]
--
Andreas K. Huettel
Gentoo Linux developer
dilfri...@gentoo.org
http://www.akhuettel.de/
From 895b4776d7ebad2bcafb7ab0e1023c4115075dc0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andreas=20K=2E=20H=C3=BCttel?= <dilfri...@gentoo.org>
Date: Mon, 5 Dec 2016 00:11:00 +0100
Subject: [PATCH] depend.apache.eclass: Make it work with EAPI=6; see below for
details.
Starting with EAPI=6, the variables APACHE_BASEDIR and APACHE_MODULESDIR
are not exported in global scope anymore. Instead, ebuilds can use
get_apache_basedir and get_apache_modulesdir. Usage and applicable
restrictions are the same as for get_libdir.
---
eclass/depend.apache.eclass | 44 +++++++++++++++++++++++++++++++++++---------
1 file changed, 35 insertions(+), 9 deletions(-)
diff --git a/eclass/depend.apache.eclass b/eclass/depend.apache.eclass
index b69c2ec..51fdde2 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)
+ 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"
@@ -85,6 +79,8 @@ esac
# @DESCRIPTION:
# Path to the server root directory.
# This variable is set by the want/need_apache functions.
+# Only available in EAPIs 0 through 5. For later EAPIs, please
+# use get_apache_basedir.
# @ECLASS-VARIABLE: APACHE_CONFDIR
# @DESCRIPTION:
@@ -105,6 +101,8 @@ esac
# @DESCRIPTION:
# Path where we install modules.
# This variable is set by the want/need_apache functions.
+# Only available in EAPIs 0 through 5. For later EAPIs, please
+# use get_apache_modulesdir.
# @ECLASS-VARIABLE: APACHE_DEPEND
# @DESCRIPTION:
@@ -141,11 +139,16 @@ _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"
- APACHE_MODULESDIR="${APACHE_BASEDIR}/modules"
+
+ case ${EAPI:-0} in
+ 0|1|2|3|4|5)
+ APACHE_BASEDIR="/usr/$(get_libdir)/apache2"
+ APACHE_MODULESDIR="${APACHE_BASEDIR}/modules"
+ ;;
+ esac
}
_init_no_apache() {
@@ -329,4 +332,27 @@ has_apache_threads_in() {
fi
}
+# @FUNCTION: get_apache_basedir
+# @USAGE: get_apache_basedir
+# @DESCRIPTION:
+# EAPI=6 or later: prints out the apache basedir, e.g., /usr/lib64/apache2
+# Can only be called in src_* phases, and in particular NOT in global scope.
+# Replacement for the APACHE_BASEDIR variable.
+get_apache_basedir() {
+ declare -f -F get_libdir > /dev/null ||
+ die "depend.apache.eclass: get_apache_basedir can only be called in phase functions of EAPI=6 and later"
+ echo -n "/usr/$(get_libdir)/apache2"
+}
+
+# @FUNCTION: get_apache_modulesdir
+# @USAGE: get_apache_modulesdir
+# @DESCRIPTION:
+# EAPI=6 or later: prints out the apache module installation directory, e.g.,
+# /usr/lib64/apache2/modules
+# Can only be called in src_* phases, and in particular NOT in global scope.
+# Replacement for the APACHE_MODULESDIR variable.
+get_apache_modulesdir() {
+ echo -n "$(get_apache_basedir)/modules"
+}
+
EXPORT_FUNCTIONS pkg_setup
--
2.11.0.rc2
