From: Hans de Graaff <graaff@gentoo.org>
To: gentoo-dev@lists.gentoo.org
Cc: Hans de Graaff <graaff@gentoo.org>
Subject: [gentoo-dev] [PATCH 1/4] eclass/depend.apache: deprecate apache 2.2 methods
Date: Fri, 29 Sep 2023 08:40:59 +0200 [thread overview]
Message-ID: <20230929064102.27186-1-graaff@gentoo.org> (raw)
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}? ( ${APACHE2_2_DEPEND} )"
+ RDEPEND="${RDEPEND} ${myiuse}? ( ${APACHE2_2_DEPEND} )"
+ ;;
+ *)
+ errror "want-apache2_2 is no longer supported in EAPI 8"
+ ;;
+ esac
}
# @FUNCTION: want_apache2_4
@@ -263,9 +270,16 @@ need_apache2() {
need_apache2_2() {
debug-print-function $FUNCNAME $*
- DEPEND="${DEPEND} ${APACHE2_2_DEPEND}"
- RDEPEND="${RDEPEND} ${APACHE2_2_DEPEND}"
- _init_apache2
+ case ${EAPI:-0} in
+ 6|7)
+ DEPEND="${DEPEND} ${APACHE2_2_DEPEND}"
+ RDEPEND="${RDEPEND} ${APACHE2_2_DEPEND}"
+ _init_apache2
+ ;;
+ *)
+ error "need_apache2-2 is no longer supported in EAPI 8"
+ ;;
+ esac
}
# @FUNCTION: need_apache2_4
--
2.41.0
next reply other threads:[~2023-09-29 6:41 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-09-29 6:40 Hans de Graaff [this message]
-- strict thread matches above, loose matches on Subject: below --
2023-09-29 6:51 [gentoo-dev] [PATCH 1/4] eclass/depend.apache: deprecate apache 2.2 methods Hans de Graaff
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20230929064102.27186-1-graaff@gentoo.org \
--to=graaff@gentoo.org \
--cc=gentoo-dev@lists.gentoo.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox