diff options
| author |   David Seifert <soap@gentoo.org> | 2024-10-08 17:31:03 +0200 |
|---|---|---|
| committer | David Seifert <soap@gentoo.org> | 2024-10-08 17:31:03 +0200 |
| commit | a441b7c8135279fe40b9f87ee20525333c349c4e (patch) | |
| tree | ec2da92e2dc9cdb9b084cafb48301f10a4bdc619 /eclass/depend.apache.eclass | |
| parent | check-reqs.eclass: drop support for EAPI 6 (diff) | |
| download | gentoo-a441b7c8135279fe40b9f87ee20525333c349c4e.tar.gz gentoo-a441b7c8135279fe40b9f87ee20525333c349c4e.tar.bz2 gentoo-a441b7c8135279fe40b9f87ee20525333c349c4e.zip | |
depend.apache.eclass: drop support for EAPI 6
Signed-off-by: David Seifert <soap@gentoo.org>
Diffstat (limited to 'eclass/depend.apache.eclass')
| -rw-r--r-- | eclass/depend.apache.eclass | 19 |
1 files changed, 10 insertions, 9 deletions
diff --git a/eclass/depend.apache.eclass b/eclass/depend.apache.eclass index 60926c298f04..7492a78209e7 100644 --- a/eclass/depend.apache.eclass +++ b/eclass/depend.apache.eclass @@ -4,7 +4,7 @@ # @ECLASS: depend.apache.eclass # @MAINTAINER: # apache-bugs@gentoo.org -# @SUPPORTED_EAPIS: 6 7 8 +# @SUPPORTED_EAPIS: 7 8 # @BLURB: Functions to allow ebuilds to depend on apache # @DESCRIPTION: # This eclass handles depending on apache in a sane way and provides information @@ -40,11 +40,10 @@ # } # @CODE +if [[ -z ${_DEPEND_APACHE_ECLASS} ]]; then +_DEPEND_APACHE_ECLASS=1 + case ${EAPI} in - 6) - ewarn "${CATEGORY}/${PF}: ebuild uses ${ECLASS} with deprecated EAPI ${EAPI}!" - ewarn "${CATEGORY}/${PF}: Support will be removed on 2024-10-08. Please port to newer EAPI." - ;; 7|8) ;; *) die "${ECLASS}: EAPI ${EAPI:-0} not supported" ;; esac @@ -216,8 +215,8 @@ want_apache2() { want_apache2_2() { debug-print-function $FUNCNAME $* - case ${EAPI:-0} in - 6|7) + case ${EAPI} in + 7) local myiuse=${1:-apache2} IUSE="${IUSE} ${myiuse}" DEPEND="${DEPEND} ${myiuse}? ( ${APACHE2_2_DEPEND} )" @@ -271,8 +270,8 @@ need_apache2() { need_apache2_2() { debug-print-function $FUNCNAME $* - case ${EAPI:-0} in - 6|7) + case ${EAPI} in + 7) DEPEND="${DEPEND} ${APACHE2_2_DEPEND}" RDEPEND="${RDEPEND} ${APACHE2_2_DEPEND}" _init_apache2 @@ -357,4 +356,6 @@ has_apache_threads_in() { fi } +fi + EXPORT_FUNCTIONS pkg_setup |