mirror of
https://github.com/gentoo-mirror/gentoo.git
synced 2026-11-20 22:27:17 -08:00
eclass/depend.apache: drop support for EAPI 0-5
Signed-off-by: Hans de Graaff <graaff@gentoo.org>
This commit is contained in:
+12
-48
@@ -1,10 +1,10 @@
|
||||
# Copyright 1999-2021 Gentoo Authors
|
||||
# Copyright 1999-2023 Gentoo Authors
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
|
||||
# @ECLASS: depend.apache.eclass
|
||||
# @MAINTAINER:
|
||||
# apache-bugs@gentoo.org
|
||||
# @SUPPORTED_EAPIS: 0 2 3 4 5 6 7
|
||||
# @SUPPORTED_EAPIS: 6 7
|
||||
# @BLURB: Functions to allow ebuilds to depend on apache
|
||||
# @DESCRIPTION:
|
||||
# This eclass handles depending on apache in a sane way and provides information
|
||||
@@ -41,9 +41,6 @@
|
||||
# @CODE
|
||||
|
||||
case ${EAPI:-0} in
|
||||
0|2|3|4|5)
|
||||
inherit multilib
|
||||
;;
|
||||
6|7)
|
||||
;;
|
||||
*)
|
||||
@@ -78,8 +75,7 @@ esac
|
||||
# @ECLASS_VARIABLE: APACHE_BASEDIR
|
||||
# @DESCRIPTION:
|
||||
# Path to the server root directory.
|
||||
# This variable is set by the want/need_apache functions (EAPI=0 through 5)
|
||||
# or depend.apache_pkg_setup (EAPI=6 and later).
|
||||
# This variable is set by depend.apache_pkg_setup.
|
||||
|
||||
# @ECLASS_VARIABLE: APACHE_CONFDIR
|
||||
# @DESCRIPTION:
|
||||
@@ -99,8 +95,7 @@ esac
|
||||
# @ECLASS_VARIABLE: APACHE_MODULESDIR
|
||||
# @DESCRIPTION:
|
||||
# Path where we install modules.
|
||||
# This variable is set by the want/need_apache functions (EAPI=0 through 5)
|
||||
# or depend.apache_pkg_setup (EAPI=6 and later).
|
||||
# This variable is set by depend.apache_pkg_setup.
|
||||
|
||||
# @ECLASS_VARIABLE: APACHE_DEPEND
|
||||
# @DESCRIPTION:
|
||||
@@ -140,12 +135,6 @@ _init_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() {
|
||||
@@ -177,27 +166,14 @@ depend.apache_pkg_setup() {
|
||||
|
||||
local myiuse=${1:-apache2}
|
||||
|
||||
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
|
||||
else
|
||||
_init_no_apache
|
||||
fi
|
||||
fi
|
||||
;;
|
||||
esac
|
||||
if in_iuse ${myiuse}; then
|
||||
if use ${myiuse}; then
|
||||
_init_apache2
|
||||
_init_apache2_late
|
||||
else
|
||||
_init_no_apache
|
||||
fi
|
||||
fi
|
||||
}
|
||||
|
||||
# @FUNCTION: want_apache
|
||||
@@ -327,12 +303,6 @@ has_apache() {
|
||||
has_apache_threads() {
|
||||
debug-print-function $FUNCNAME $*
|
||||
|
||||
case ${EAPI:-0} in
|
||||
0|1)
|
||||
die "depend.apache.eclass: has_apache_threads is not supported for EAPI=${EAPI:-0}"
|
||||
;;
|
||||
esac
|
||||
|
||||
if ! has_version 'www-servers/apache[threads]'; then
|
||||
return
|
||||
fi
|
||||
@@ -356,12 +326,6 @@ has_apache_threads() {
|
||||
has_apache_threads_in() {
|
||||
debug-print-function $FUNCNAME $*
|
||||
|
||||
case ${EAPI:-0} in
|
||||
0|1)
|
||||
die "depend.apache.eclass: has_apache_threads_in is not supported for EAPI=${EAPI:-0}"
|
||||
;;
|
||||
esac
|
||||
|
||||
if ! has_version 'www-servers/apache[threads]'; then
|
||||
return
|
||||
fi
|
||||
|
||||
Reference in New Issue
Block a user