diff options
| author |   Hans de Graaff <graaff@gentoo.org> | 2023-09-29 08:24:29 +0200 |
|---|---|---|
| committer | Hans de Graaff <graaff@gentoo.org> | 2023-10-08 12:03:22 +0200 |
| commit | 0dcaafc4c96820046d5c3afd7c3da7d148cc4e5b (patch) | |
| tree | 3f326f1bbb51ab262bb341fa008453b8edc7d555 /eclass | |
| parent | dev-lang/ruby: use dev-ruby/irb as irb provider (diff) | |
| download | gentoo-0dcaafc4c96820046d5c3afd7c3da7d148cc4e5b.tar.gz gentoo-0dcaafc4c96820046d5c3afd7c3da7d148cc4e5b.tar.bz2 gentoo-0dcaafc4c96820046d5c3afd7c3da7d148cc4e5b.zip | |
eclass/depend.apache: deprecate apache 2.2 methods
www-servers/apache-2.2 has been removed in 2019.
Signed-off-by: Hans de Graaff <graaff@gentoo.org>
Diffstat (limited to 'eclass')
| -rw-r--r-- | eclass/depend.apache.eclass | 30 |
1 files 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 |