[gentoo-dev] [PATCH 1/4] eclass/depend.apache: deprecate apache 2.2 met
From
Hans de Graaff@21:1/5 to
All on Fri Sep 29 08:50:01 2023
www-servers/apache-2.2 has been removed in 2019.
---
eclass/depend.apache.eclass | 30 ++++++++++++++++++++++--------
1 file changed, 22 insertions(+), 8 deletions(-)
diff --git a/eclass/depend.apache.eclass b/eclass/depend.apache.eclass
index 4dc3f68daabc..4d1ca573611b 100644
--- a/eclass/depend.apache.eclass
+++ b/eclass/depend.apache.eclass
@@ -109,7 +109,7 @@ APACHE2_DEPEND="=www-servers/apache-2*"
# @ECLASS_VARIABLE: APACHE2_2_DEPEND
# @DESCRIPTION:
-# Dependencies for Apache 2.2.x
+# Dependencies for Apache 2.2.x. Deprecated and removed in EAPI 8.
APACHE2_2_DEPEND="=www-servers/apache-2.2*"
# @ECLASS_VARIABLE: APACHE2_4_DEPEND
@@ -215,10 +215,17 @@ want_apache2() {
want_apache2_2() {
debug-print-function $FUNCNAME $*
- local myiuse=${1:-apache2}
- IUSE="${IUSE} ${myiuse}"
- DEPEND="${DEPEND} ${myiuse}? ( ${APACHE2_2_DEPEND} )"
- RDEPEND="${RDEPEND} ${myiuse}? ( ${APACHE2_2_DEPEND} )"
+ case ${EAPI:-0} in
+ 6|7)
+ local myiuse=${1:-apache2}
+ IUSE="${IUSE} ${myiuse}"
+ DEPEND="${DEPEND} ${myiuse}? ( ${APA